n-api,test: make methods static

PR-URL: #20243
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

Author: Gabriel Schulhof

test/addons-napi/1_hello_world/binding.c

@@ -2,7 +2,7 @@
 #include"../common.h"
 #include<string.h>
 
-napi_valueMethod(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueMethod(napi_envenv, napi_callback_infoinfo) {
 napi_valueworld;
 constchar*str="world";
 size_tstr_len=strlen(str);

test/addons-napi/2_function_arguments/binding.c

@@ -1,7 +1,7 @@
 #include<node_api.h>
 #include"../common.h"
 
-napi_valueAdd(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAdd(napi_envenv, napi_callback_infoinfo) {
 size_targc=2;
 napi_valueargs[2];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -29,7 +29,7 @@ napi_value Add(napi_env env, napi_callback_info info) {
 returnsum;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_property_descriptordesc=DECLARE_NAPI_PROPERTY("add", Add);
 NAPI_CALL(env, napi_define_properties(env, exports, 1, &desc));
 returnexports;

test/addons-napi/3_callbacks/binding.c

@@ -2,7 +2,7 @@
 #include"../common.h"
 #include<string.h>
 
-napi_valueRunCallback(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueRunCallback(napi_envenv, napi_callback_infoinfo) {
 size_targc=2;
 napi_valueargs[2];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -34,7 +34,7 @@ napi_value RunCallback(napi_env env, napi_callback_info info) {
 returnNULL;
 }
 
-napi_valueRunCallbackWithRecv(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueRunCallbackWithRecv(napi_envenv, napi_callback_infoinfo) {
 size_targc=2;
 napi_valueargs[2];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -45,7 +45,7 @@ napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
 returnNULL;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_property_descriptordesc[2] = {
 DECLARE_NAPI_PROPERTY("RunCallback", RunCallback),
 DECLARE_NAPI_PROPERTY("RunCallbackWithRecv", RunCallbackWithRecv),

test/addons-napi/4_object_factory/binding.c

@@ -1,7 +1,7 @@
 #include<node_api.h>
 #include"../common.h"
 
-napi_valueCreateObject(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueCreateObject(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -14,7 +14,7 @@ napi_value CreateObject(napi_env env, napi_callback_info info) {
 returnobj;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 NAPI_CALL(env,
 napi_create_function(env, "exports", -1, CreateObject, NULL, &exports));
 returnexports;

test/addons-napi/5_function_factory/binding.c

@@ -1,20 +1,20 @@
 #include<node_api.h>
 #include"../common.h"
 
-napi_valueMyFunction(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueMyFunction(napi_envenv, napi_callback_infoinfo) {
 napi_valuestr;
 NAPI_CALL(env, napi_create_string_utf8(env, "hello world", -1, &str));
 returnstr;
 }
 
-napi_valueCreateFunction(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueCreateFunction(napi_envenv, napi_callback_infoinfo) {
 napi_valuefn;
 NAPI_CALL(env,
 napi_create_function(env, "theFunction", -1, MyFunction, NULL, &fn));
 returnfn;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 NAPI_CALL(env,
 napi_create_function(env, "exports", -1, CreateFunction, NULL, &exports));
 returnexports;

test/addons-napi/test_array/test_array.c

@@ -2,7 +2,7 @@
 #include<string.h>
 #include"../common.h"
 
-napi_valueTestGetElement(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueTestGetElement(napi_envenv, napi_callback_infoinfo) {
 size_targc=2;
 napi_valueargs[2];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -45,7 +45,7 @@ napi_value TestGetElement(napi_env env, napi_callback_info info) {
 returnret;
 }
 
-napi_valueTestHasElement(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueTestHasElement(napi_envenv, napi_callback_infoinfo) {
 size_targc=2;
 napi_valueargs[2];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -84,7 +84,7 @@ napi_value TestHasElement(napi_env env, napi_callback_info info) {
 returnret;
 }
 
-napi_valueTestDeleteElement(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueTestDeleteElement(napi_envenv, napi_callback_infoinfo) {
 size_targc=2;
 napi_valueargs[2];
 
@@ -119,7 +119,7 @@ napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
 returnret;
 }
 
-napi_valueNew(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueNew(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -147,7 +147,7 @@ napi_value New(napi_env env, napi_callback_info info) {
 returnret;
 }
 
-napi_valueNewWithLength(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueNewWithLength(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -169,7 +169,7 @@ napi_value NewWithLength(napi_env env, napi_callback_info info) {
 returnret;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_property_descriptordescriptors[] = {
 DECLARE_NAPI_PROPERTY("TestGetElement", TestGetElement),
 DECLARE_NAPI_PROPERTY("TestHasElement", TestHasElement),

test/addons-napi/test_buffer/test_buffer.c

@@ -20,7 +20,7 @@ static void noopDeleter(napi_env env, void* data, void* finalize_hint) {
 deleterCallCount++;
 }
 
-napi_valuenewBuffer(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuenewBuffer(napi_envenv, napi_callback_infoinfo) {
 napi_valuetheBuffer;
 char*theCopy;
 constunsigned intkBufferSize=sizeof(theText);
@@ -37,7 +37,7 @@ napi_value newBuffer(napi_env env, napi_callback_info info) {
 returntheBuffer;
 }
 
-napi_valuenewExternalBuffer(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuenewExternalBuffer(napi_envenv, napi_callback_infoinfo) {
 napi_valuetheBuffer;
 char*theCopy=strdup(theText);
 NAPI_ASSERT(env, theCopy, "Failed to copy static text for newExternalBuffer");
@@ -53,20 +53,20 @@ napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
 returntheBuffer;
 }
 
-napi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuegetDeleterCallCount(napi_envenv, napi_callback_infoinfo) {
 napi_valuecallCount;
 NAPI_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
 returncallCount;
 }
 
-napi_valuecopyBuffer(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuecopyBuffer(napi_envenv, napi_callback_infoinfo) {
 napi_valuetheBuffer;
 NAPI_CALL(env, napi_create_buffer_copy(
 env, sizeof(theText), theText, NULL, &theBuffer));
 returntheBuffer;
 }
 
-napi_valuebufferHasInstance(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuebufferHasInstance(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -85,7 +85,7 @@ napi_value bufferHasInstance(napi_env env, napi_callback_info info) {
 returnreturnValue;
 }
 
-napi_valuebufferInfo(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuebufferInfo(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -106,7 +106,7 @@ napi_value bufferInfo(napi_env env, napi_callback_info info) {
 returnreturnValue;
 }
 
-napi_valuestaticBuffer(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valuestaticBuffer(napi_envenv, napi_callback_infoinfo) {
 napi_valuetheBuffer;
 NAPI_CALL(
 env,
@@ -119,7 +119,7 @@ napi_value staticBuffer(napi_env env, napi_callback_info info) {
 returntheBuffer;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_valuetheValue;
 
 NAPI_CALL(env,

test/addons-napi/test_constructor/test_constructor.c

@@ -4,7 +4,7 @@
 staticdoublevalue_=1;
 staticdoublestatic_value_=10;
 
-napi_valueGetValue(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueGetValue(napi_envenv, napi_callback_infoinfo) {
 size_targc=0;
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, NULL, NULL, NULL));
 
@@ -16,7 +16,7 @@ napi_value GetValue(napi_env env, napi_callback_info info) {
 returnnumber;
 }
 
-napi_valueSetValue(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueSetValue(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -28,7 +28,7 @@ napi_value SetValue(napi_env env, napi_callback_info info) {
 returnNULL;
 }
 
-napi_valueEcho(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueEcho(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -38,14 +38,14 @@ napi_value Echo(napi_env env, napi_callback_info info) {
 returnargs[0];
 }
 
-napi_valueNew(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueNew(napi_envenv, napi_callback_infoinfo) {
 napi_value_this;
 NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
 
 return_this;
 }
 
-napi_valueGetStaticValue(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueGetStaticValue(napi_envenv, napi_callback_infoinfo) {
 size_targc=0;
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, NULL, NULL, NULL));
 
@@ -58,7 +58,7 @@ napi_value GetStaticValue(napi_env env, napi_callback_info info) {
 }
 
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_valuenumber;
 NAPI_CALL(env, napi_create_double(env, value_, &number));
 

test/addons-napi/test_constructor/test_constructor_name.c

@@ -3,14 +3,14 @@
 
 napi_refconstructor_;
 
-napi_valueNew(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueNew(napi_envenv, napi_callback_infoinfo) {
 napi_value_this;
 NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
 
 return_this;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_valuecons;
 NAPI_CALL(env, napi_define_class(
 env, "MyObject_Extra", 8, New, NULL, 0, NULL, &cons));

test/addons-napi/test_conversions/test_conversions.c

@@ -1,7 +1,7 @@
 #include<node_api.h>
 #include"../common.h"
 
-napi_valueAsBool(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAsBool(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -15,7 +15,7 @@ napi_value AsBool(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueAsInt32(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAsInt32(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -29,7 +29,7 @@ napi_value AsInt32(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueAsUInt32(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAsUInt32(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -43,7 +43,7 @@ napi_value AsUInt32(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueAsInt64(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAsInt64(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -57,7 +57,7 @@ napi_value AsInt64(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueAsDouble(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAsDouble(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -71,7 +71,7 @@ napi_value AsDouble(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueAsString(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueAsString(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -87,7 +87,7 @@ napi_value AsString(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueToBool(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueToBool(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -98,7 +98,7 @@ napi_value ToBool(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueToNumber(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueToNumber(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -109,7 +109,7 @@ napi_value ToNumber(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueToObject(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueToObject(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -120,7 +120,7 @@ napi_value ToObject(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueToString(napi_envenv, napi_callback_infoinfo) {
+staticnapi_valueToString(napi_envenv, napi_callback_infoinfo) {
 size_targc=1;
 napi_valueargs[1];
 NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -131,7 +131,7 @@ napi_value ToString(napi_env env, napi_callback_info info) {
 returnoutput;
 }
 
-napi_valueInit(napi_envenv, napi_valueexports) {
+staticnapi_valueInit(napi_envenv, napi_valueexports) {
 napi_property_descriptordescriptors[] = {
 DECLARE_NAPI_PROPERTY("asBool", AsBool),
 DECLARE_NAPI_PROPERTY("asInt32", AsInt32),