n-api,test: make methods static

PR-URL: #20243 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
nodejs · May 4, 2018 · b239591 · b239591
1 parent d4b19cf
commit b239591
Show file tree

Hide file tree

Showing 28 changed files with 139 additions and 137 deletions.
diff --git a/test/addons-napi/1_hello_world/binding.c b/test/addons-napi/1_hello_world/binding.c
@@ -2,7 +2,7 @@
 #include "../common.h"
 #include <string.h>
 
-napi_value Method(napi_env env, napi_callback_info info) {
+static napi_value Method(napi_env env, napi_callback_info info) {
  napi_value world;
  const char* str = "world";
  size_t str_len = strlen(str);

diff --git a/test/addons-napi/2_function_arguments/binding.c b/test/addons-napi/2_function_arguments/binding.c
@@ -1,7 +1,7 @@
 #include <node_api.h>
 #include "../common.h"
 
-napi_value Add(napi_env env, napi_callback_info info) {
+static napi_value Add(napi_env env, napi_callback_info info) {
  size_t argc = 2;
  napi_value args[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) {
  return sum;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_property_descriptor desc = DECLARE_NAPI_PROPERTY("add", Add);
  NAPI_CALL(env, napi_define_properties(env, exports, 1, &desc));
  return exports;

diff --git a/test/addons-napi/3_callbacks/binding.c b/test/addons-napi/3_callbacks/binding.c
@@ -2,7 +2,7 @@
 #include "../common.h"
 #include <string.h>
 
-napi_value RunCallback(napi_env env, napi_callback_info info) {
+static napi_value RunCallback(napi_env env, napi_callback_info info) {
  size_t argc = 2;
  napi_value args[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) {
  return NULL;
 }
 
-napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
+static napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
  size_t argc = 2;
  napi_value args[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) {
  return NULL;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_property_descriptor desc[2] = {
  DECLARE_NAPI_PROPERTY("RunCallback", RunCallback),
  DECLARE_NAPI_PROPERTY("RunCallbackWithRecv", RunCallbackWithRecv),

diff --git a/test/addons-napi/4_object_factory/binding.c b/test/addons-napi/4_object_factory/binding.c
@@ -1,7 +1,7 @@
 #include <node_api.h>
 #include "../common.h"
 
-napi_value CreateObject(napi_env env, napi_callback_info info) {
+static napi_value CreateObject(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return obj;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  NAPI_CALL(env,
  napi_create_function(env, "exports", -1, CreateObject, NULL, &exports));
  return exports;

diff --git a/test/addons-napi/5_function_factory/binding.c b/test/addons-napi/5_function_factory/binding.c
@@ -1,20 +1,20 @@
 #include <node_api.h>
 #include "../common.h"
 
-napi_value MyFunction(napi_env env, napi_callback_info info) {
+static napi_value MyFunction(napi_env env, napi_callback_info info) {
  napi_value str;
  NAPI_CALL(env, napi_create_string_utf8(env, "hello world", -1, &str));
  return str;
 }
 
-napi_value CreateFunction(napi_env env, napi_callback_info info) {
+static napi_value CreateFunction(napi_env env, napi_callback_info info) {
  napi_value fn;
  NAPI_CALL(env,
  napi_create_function(env, "theFunction", -1, MyFunction, NULL, &fn));
  return fn;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  NAPI_CALL(env,
  napi_create_function(env, "exports", -1, CreateFunction, NULL, &exports));
  return exports;

diff --git a/test/addons-napi/test_array/test_array.c b/test/addons-napi/test_array/test_array.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "../common.h"
 
-napi_value TestGetElement(napi_env env, napi_callback_info info) {
+static napi_value TestGetElement(napi_env env, napi_callback_info info) {
  size_t argc = 2;
  napi_value args[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) {
  return ret;
 }
 
-napi_value TestHasElement(napi_env env, napi_callback_info info) {
+static napi_value TestHasElement(napi_env env, napi_callback_info info) {
  size_t argc = 2;
  napi_value args[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) {
  return ret;
 }
 
-napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
+static napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
  size_t argc = 2;
  napi_value args[2];
 
@@ -119,7 +119,7 @@ napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
  return ret;
 }
 
-napi_value New(napi_env env, napi_callback_info info) {
+static napi_value New(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return ret;
 }
 
-napi_value NewWithLength(napi_env env, napi_callback_info info) {
+static napi_value NewWithLength(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return ret;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_property_descriptor descriptors[] = {
  DECLARE_NAPI_PROPERTY("TestGetElement", TestGetElement),
  DECLARE_NAPI_PROPERTY("TestHasElement", TestHasElement),

diff --git a/test/addons-napi/test_buffer/test_buffer.c b/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_value newBuffer(napi_env env, napi_callback_info info) {
+static napi_value newBuffer(napi_env env, napi_callback_info info) {
  napi_value theBuffer;
  char* theCopy;
  const unsigned int kBufferSize = sizeof(theText);
@@ -37,7 +37,7 @@ napi_value newBuffer(napi_env env, napi_callback_info info) {
  return theBuffer;
 }
 
-napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
+static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
  napi_value theBuffer;
  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) {
  return theBuffer;
 }
 
-napi_value getDeleterCallCount(napi_env env, napi_callback_info info) {
+static napi_value getDeleterCallCount(napi_env env, napi_callback_info info) {
  napi_value callCount;
  NAPI_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
  return callCount;
 }
 
-napi_value copyBuffer(napi_env env, napi_callback_info info) {
+static napi_value copyBuffer(napi_env env, napi_callback_info info) {
  napi_value theBuffer;
  NAPI_CALL(env, napi_create_buffer_copy(
  env, sizeof(theText), theText, NULL, &theBuffer));
  return theBuffer;
 }
 
-napi_value bufferHasInstance(napi_env env, napi_callback_info info) {
+static napi_value bufferHasInstance(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return returnValue;
 }
 
-napi_value bufferInfo(napi_env env, napi_callback_info info) {
+static napi_value bufferInfo(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return returnValue;
 }
 
-napi_value staticBuffer(napi_env env, napi_callback_info info) {
+static napi_value staticBuffer(napi_env env, napi_callback_info info) {
  napi_value theBuffer;
  NAPI_CALL(
  env,
@@ -119,7 +119,7 @@ napi_value staticBuffer(napi_env env, napi_callback_info info) {
  return theBuffer;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_value theValue;
 
  NAPI_CALL(env,

diff --git a/test/addons-napi/test_constructor/test_constructor.c b/test/addons-napi/test_constructor/test_constructor.c
@@ -4,7 +4,7 @@
 static double value_ = 1;
 static double static_value_ = 10;
 
-napi_value GetValue(napi_env env, napi_callback_info info) {
+static napi_value GetValue(napi_env env, napi_callback_info info) {
  size_t argc = 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) {
  return number;
 }
 
-napi_value SetValue(napi_env env, napi_callback_info info) {
+static napi_value SetValue(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return NULL;
 }
 
-napi_value Echo(napi_env env, napi_callback_info info) {
+static napi_value Echo(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return args[0];
 }
 
-napi_value New(napi_env env, napi_callback_info info) {
+static napi_value New(napi_env env, napi_callback_info info) {
  napi_value _this;
  NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
 
  return _this;
 }
 
-napi_value GetStaticValue(napi_env env, napi_callback_info info) {
+static napi_value GetStaticValue(napi_env env, napi_callback_info info) {
  size_t argc = 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_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_value number;
  NAPI_CALL(env, napi_create_double(env, value_, &number));
 

diff --git a/test/addons-napi/test_constructor/test_constructor_name.c b/test/addons-napi/test_constructor/test_constructor_name.c
@@ -3,14 +3,14 @@
 
 napi_ref constructor_;
 
-napi_value New(napi_env env, napi_callback_info info) {
+static napi_value New(napi_env env, napi_callback_info info) {
  napi_value _this;
  NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
 
  return _this;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_value cons;
  NAPI_CALL(env, napi_define_class(
  env, "MyObject_Extra", 8, New, NULL, 0, NULL, &cons));

diff --git a/test/addons-napi/test_conversions/test_conversions.c b/test/addons-napi/test_conversions/test_conversions.c
@@ -1,7 +1,7 @@
 #include <node_api.h>
 #include "../common.h"
 
-napi_value AsBool(napi_env env, napi_callback_info info) {
+static napi_value AsBool(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value AsInt32(napi_env env, napi_callback_info info) {
+static napi_value AsInt32(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value AsUInt32(napi_env env, napi_callback_info info) {
+static napi_value AsUInt32(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value AsInt64(napi_env env, napi_callback_info info) {
+static napi_value AsInt64(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value AsDouble(napi_env env, napi_callback_info info) {
+static napi_value AsDouble(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value AsString(napi_env env, napi_callback_info info) {
+static napi_value AsString(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value ToBool(napi_env env, napi_callback_info info) {
+static napi_value ToBool(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value ToNumber(napi_env env, napi_callback_info info) {
+static napi_value ToNumber(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value ToObject(napi_env env, napi_callback_info info) {
+static napi_value ToObject(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value ToString(napi_env env, napi_callback_info info) {
+static napi_value ToString(napi_env env, napi_callback_info info) {
  size_t argc = 1;
  napi_value args[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) {
  return output;
 }
 
-napi_value Init(napi_env env, napi_value exports) {
+static napi_value Init(napi_env env, napi_value exports) {
  napi_property_descriptor descriptors[] = {
  DECLARE_NAPI_PROPERTY("asBool", AsBool),
  DECLARE_NAPI_PROPERTY("asInt32", AsInt32),