1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

n-api: re-write test_make_callback

Browse Source 
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.

PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Gabriel Schulhof 2018-03-19 11:59:41 -04:00
parent 9b34ea6161
commit be470943fb
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/addons-napi/test_make_callback/binding.cc → test/addons-napi/test_make_callback/binding.c
View File

@ -1,13 +1,13 @@
#include <node_api.h> #include <node_api.h>
#include "../common.h" #include "../common.h"
#include <vector>
namespace { #define MAX_ARGUMENTS 10
static
napi_value MakeCallback(napi_env env, napi_callback_info info) { napi_value MakeCallback(napi_env env, napi_callback_info info) {
const int kMaxArgs = 10; size_t argc = MAX_ARGUMENTS;
size_t argc = kMaxArgs; size_t n;
napi_value args[kMaxArgs]; napi_value args[MAX_ARGUMENTS];
// NOLINTNEXTLINE (readability/null_usage) // NOLINTNEXTLINE (readability/null_usage)
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL)); NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@ -16,9 +16,9 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) {
napi_value recv = args[0]; napi_value recv = args[0];
napi_value func = args[1]; napi_value func = args[1];
std::vector<napi_value> argv; napi_value argv[MAX_ARGUMENTS - 2];
for (size_t n = 2; n < argc; n += 1) { for (n = 2; n < argc; n += 1) {
argv.push_back(args[n]); argv[n - 2] = args[n];
} }
napi_valuetype func_type; napi_valuetype func_type;
@ -35,7 +35,7 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) {
napi_value result; napi_value result;
if (func_type == napi_function) { if (func_type == napi_function) {
NAPI_CALL(env, napi_make_callback( NAPI_CALL(env, napi_make_callback(
env, context, recv, func, argv.size(), argv.data(), &result)); env, context, recv, func, argc - 2, argv, &result));
} else { } else {
NAPI_ASSERT(env, false, "Unexpected argument type"); NAPI_ASSERT(env, false, "Unexpected argument type");
} }
@ -45,6 +45,7 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) {
return result; return result;
} }
static
napi_value Init(napi_env env, napi_value exports) { napi_value Init(napi_env env, napi_value exports) {
napi_value fn; napi_value fn;
NAPI_CALL(env, napi_create_function( NAPI_CALL(env, napi_create_function(
@ -54,6 +55,4 @@ napi_value Init(napi_env env, napi_value exports) {
return exports; return exports;
} }
} // anonymous namespace
NAPI_MODULE(NODE_GYP_MODULE_NAME, Init) NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)

2
test/addons-napi/test_make_callback/binding.gyp
View File

@ -3,7 +3,7 @@
{ {
'target_name': 'binding', 'target_name': 'binding',
'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
'sources': [ 'binding.cc' ] 'sources': [ 'binding.c' ]
} }
] ]
} }