src: make FIXED_ONE_BYTE_STRING an inline fn

addaleax · targos · commit 0c3242862a22 · 2018-09-10T18:23:44.000+02:00
This prevents accidental usage on non-fixed strings. PR-URL: #22725 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Minwoo Jung <minwoo@nodesource.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -2173,11 +2173,11 @@ static napi_status set_error_code(napi_env env,
       }
     }
     name_string = v8::String::Concat(
-        isolate, name_string, FIXED_ONE_BYTE_STRING(isolate, " ["));
+        isolate, name_string, node::FIXED_ONE_BYTE_STRING(isolate, " ["));
     name_string =
         v8::String::Concat(isolate, name_string, code_value.As<v8::String>());
     name_string = v8::String::Concat(
-        isolate, name_string, FIXED_ONE_BYTE_STRING(isolate, "]"));
+        isolate, name_string, node::FIXED_ONE_BYTE_STRING(isolate, "]"));
 
     set_maybe = err_object->Set(context, name_key, name_string);
     RETURN_STATUS_IF_FALSE(env,
diff --git a/src/util.h b/src/util.h
@@ -89,9 +89,6 @@ NO_RETURN void Abort();
 NO_RETURN void Assert(const char* const (*args)[4]);
 void DumpBacktrace(FILE* fp);
 
-#define FIXED_ONE_BYTE_STRING(isolate, string)                                \
-  (node::OneByteString((isolate), (string), sizeof(string) - 1))
-
 #define DISALLOW_COPY_AND_ASSIGN(TypeName)                                    \
   void operator=(const TypeName&) = delete;                                   \
   void operator=(TypeName&&) = delete;                                        \
@@ -248,6 +245,15 @@ inline v8::Local<v8::String> OneByteString(v8::Isolate* isolate,
                                            const unsigned char* data,
                                            int length = -1);
 
+// Used to be a macro, hence the uppercase name.
+template <int N>
+inline v8::Local<v8::String> FIXED_ONE_BYTE_STRING(
+    v8::Isolate* isolate,
+    const char(&data)[N]) {
+  return OneByteString(isolate, data, N - 1);
+}
+
+
 // Swaps bytes in place. nbytes is the number of bytes to swap and must be a
 // multiple of the word size (checked by function).
 inline void SwapBytes16(char* data, size_t nbytes);

Original file line number	Diff line number	Diff line change
`@@ -2173,11 +2173,11 @@ static napi_status set_error_code(napi_env env,`
`2173`	`2173`	`}`
`2174`	`2174`	`}`
`2175`	`2175`	`name_string = v8::String::Concat(`
`2176`		`- isolate, name_string, FIXED_ONE_BYTE_STRING(isolate, " ["));`
	`2176`	`+ isolate, name_string, node::FIXED_ONE_BYTE_STRING(isolate, " ["));`
`2177`	`2177`	`name_string =`
`2178`	`2178`	`v8::String::Concat(isolate, name_string, code_value.As<v8::String>());`
`2179`	`2179`	`name_string = v8::String::Concat(`
`2180`		`- isolate, name_string, FIXED_ONE_BYTE_STRING(isolate, "]"));`
	`2180`	`+ isolate, name_string, node::FIXED_ONE_BYTE_STRING(isolate, "]"));`
`2181`	`2181`
`2182`	`2182`	`set_maybe = err_object->Set(context, name_key, name_string);`
`2183`	`2183`	`RETURN_STATUS_IF_FALSE(env,`