Commit 24b8bb6
n-api: re-write test_make_callback
This re-writes the test in C by dropping std::vector<napi_value> in
favour of a C99 variable length array, and by dropping the anonymous
namespace in favour of static function declarations.
Backport-PR-URL: #19265
PR-URL: #19448
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>1 parent 3a6b7e6 commit 24b8bb6
2 files changed
Lines changed: 11 additions & 12 deletions
Lines changed: 10 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,13 +1,13 @@ | |||
| 1 | 1 | #include <node_api.h> | |
| 2 | 2 | #include "../common.h" | |
| 3 | - #include <vector> | ||
| 4 | 3 | ||
| 5 | - namespace { | ||
| 4 | + #define MAX_ARGUMENTS 10 | ||
| 6 | 5 | ||
| 6 | + static | ||
| 7 | 7 | napi_value MakeCallback(napi_env env, napi_callback_info info) { | |
| 8 | - const int kMaxArgs = 10; | ||
| 9 | - size_t argc = kMaxArgs; | ||
| 10 | - napi_value args[kMaxArgs]; | ||
| 8 | + size_t argc = MAX_ARGUMENTS; | ||
| 9 | + size_t n; | ||
| 10 | + napi_value args[MAX_ARGUMENTS]; | ||
| 11 | 11 | // NOLINTNEXTLINE (readability/null_usage) | |
| 12 | 12 | NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL)); | |
| 13 | 13 | ||
@@ -16,9 +16,9 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) { | |||
| 16 | 16 | napi_value recv = args[0]; | |
| 17 | 17 | napi_value func = args[1]; | |
| 18 | 18 | ||
| 19 | - std::vector<napi_value> argv; | ||
| 20 | - for (size_t n = 2; n < argc; n += 1) { | ||
| 21 | - argv.push_back(args[n]); | ||
| 19 | + napi_value argv[MAX_ARGUMENTS - 2]; | ||
| 20 | + for (n = 2; n < argc; n += 1) { | ||
| 21 | + argv[n - 2] = args[n]; | ||
| 22 | 22 | } | |
| 23 | 23 | ||
| 24 | 24 | napi_valuetype func_type; | |
@@ -35,7 +35,7 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) { | |||
| 35 | 35 | napi_value result; | |
| 36 | 36 | if (func_type == napi_function) { | |
| 37 | 37 | NAPI_CALL(env, napi_make_callback( | |
| 38 | - env, context, recv, func, argv.size(), argv.data(), &result)); | ||
| 38 | + env, context, recv, func, argc - 2, argv, &result)); | ||
| 39 | 39 | } else { | |
| 40 | 40 | NAPI_ASSERT(env, false, "Unexpected argument type"); | |
| 41 | 41 | } | |
@@ -45,6 +45,7 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) { | |||
| 45 | 45 | return result; | |
| 46 | 46 | } | |
| 47 | 47 | ||
| 48 | + static | ||
| 48 | 49 | napi_value Init(napi_env env, napi_value exports) { | |
| 49 | 50 | napi_value fn; | |
| 50 | 51 | NAPI_CALL(env, napi_create_function( | |
@@ -54,6 +55,4 @@ napi_value Init(napi_env env, napi_value exports) { | |||
| 54 | 55 | return exports; | |
| 55 | 56 | } | |
| 56 | 57 | ||
| 57 | - } // namespace | ||
| 58 | - | ||
| 59 | 58 | NAPI_MODULE(NODE_GYP_MODULE_NAME, Init) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,7 +3,7 @@ | |||
| 3 | 3 | { | |
| 4 | 4 | 'target_name': 'binding', | |
| 5 | 5 | 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], | |
| 6 | - 'sources': [ 'binding.cc' ] | ||
| 6 | + 'sources': [ 'binding.c' ] | ||
| 7 | 7 | } | |
| 8 | 8 | ] | |
| 9 | 9 | } | |
0 commit comments