src,tools: remove null sentinel from source array

PR-URL: #5418 Reviewed-By: Trevor Norris <[email protected]>
nodejs · May 18, 2016 · e0eebf4 · e0eebf4
1 parent 8f18414
commit e0eebf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/src/node_javascript.cc b/src/node_javascript.cc
@@ -4,11 +4,6 @@
 #include "env.h"
 #include "env-inl.h"
 
-#include <string.h>
-#if !defined(_MSC_VER)
-#include <strings.h>
-#endif
-
 namespace node {
 
 using v8::HandleScope;
@@ -26,13 +21,13 @@ Local<String> MainSource(Environment* env) {
 void DefineJavaScript(Environment* env, Local<Object> target) {
   HandleScope scope(env->isolate());
 
-  for (int i = 0; natives[i].name; i++) {
-    if (natives[i].source != node_native) {
-      Local<String> name = String::NewFromUtf8(env->isolate(), natives[i].name);
+  for (auto native : natives) {
+    if (native.source != node_native) {
+      Local<String> name = String::NewFromUtf8(env->isolate(), native.name);
       Local<String> source =
           String::NewFromUtf8(
-              env->isolate(), reinterpret_cast<const char*>(natives[i].source),
-              NewStringType::kNormal, natives[i].source_len).ToLocalChecked();
+              env->isolate(), reinterpret_cast<const char*>(native.source),
+              NewStringType::kNormal, native.source_len).ToLocalChecked();
       target->Set(name, source);
     }
   }

diff --git a/tools/js2c.py b/tools/js2c.py
@@ -207,13 +207,7 @@ def ReadMacros(lines):
   size_t source_len;
 };
 
-static const struct _native natives[] = {
-
-%(native_lines)s\
-
-  { NULL, NULL, 0 } /* sentinel */
-
-};
+static const struct _native natives[] = { %(native_lines)s };
 
 }
 #endif