nodejs · tniessen · Nov 2, 2021
diff --git a/src/allocated_buffer.h b/src/allocated_buffer.h
@@ -68,6 +68,6 @@ struct AllocatedBuffer {

 }  // namespace node

-#endif  // NODE_WANT_INTERNALS
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

 #endif  // SRC_ALLOCATED_BUFFER_H_
diff --git a/src/api/exceptions.cc b/src/api/exceptions.cc
@@ -237,7 +237,7 @@ Local<Value> WinapiErrnoException(Isolate* isolate,

  return e;
 }
-#endif
+#endif  // _WIN32

 // Implement the legacy name exposed in node.h. This has not been in fact
 // fatal any more, as the user can handle the exception in the

diff --git a/src/crypto/crypto_tls.cc b/src/crypto/crypto_tls.cc
@@ -1474,7 +1474,7 @@ unsigned int TLSWrap::PskClientCallback(
  return psk_buf.length();
 }

-#endif
+#endif  // ifndef OPENSSL_NO_PSK

 void TLSWrap::GetWriteQueueSize(const FunctionCallbackInfo<Value>& info) {
  TLSWrap* wrap;

diff --git a/src/node.cc b/src/node.cc
@@ -953,7 +953,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
  }
 # endif

-#endif
+#endif  // defined(NODE_HAVE_I18N_SUPPORT)

  NativeModuleEnv::InitializeCodeCache();

@@ -1084,7 +1084,7 @@ InitializationResult InitializeOncePerProcess(
        return result;
      }
    }
-#else
+#else  // OPENSSL_VERSION_MAJOR < 3
    if (FIPS_mode()) {
      OPENSSL_init();
    }

diff --git a/src/node_internals.h b/src/node_internals.h
@@ -283,7 +283,7 @@ class ThreadPoolWork {

 #if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__)
 #define NODE_IMPLEMENTS_POSIX_CREDENTIALS 1
-#endif  // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__)
+#endif  // defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__)

 namespace credentials {
 bool SafeGetenv(const char* key, std::string* text, Environment* env = nullptr);

diff --git a/src/node_native_module.cc b/src/node_native_module.cc
@@ -90,7 +90,7 @@ void NativeModuleLoader::InitializeModuleCategories() {

 #if !NODE_USE_V8_PLATFORM || !defined(NODE_HAVE_I18N_SUPPORT)
      "trace_events",
-#endif  // !NODE_USE_V8_PLATFORM
+#endif  // !NODE_USE_V8_PLATFORM || !defined(NODE_HAVE_I18N_SUPPORT)

 #if !HAVE_OPENSSL
      "crypto",

diff --git a/src/node_options.cc b/src/node_options.cc
@@ -83,7 +83,8 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
    if ((secure_heap_min & (secure_heap_min - 1)) != 0)
      errors->push_back("--secure-heap-min must be a power of 2");
  }
-#endif
+#endif  // HAVE_OPENSSL
+
  if (use_largepages != "off" &&
      use_largepages != "on" &&
      use_largepages != "silent") {
@@ -816,7 +817,7 @@ PerProcessOptionsParser::PerProcessOptionsParser(
            "minimum allocation size from the OpenSSL secure heap",
            &PerProcessOptions::secure_heap_min,
            kAllowedInEnvironment);
-#endif
+#endif  // HAVE_OPENSSL
 #if OPENSSL_VERSION_MAJOR >= 3
  AddOption("--openssl-legacy-provider",
            "enable OpenSSL 3.0 legacy provider",

diff --git a/src/node_report.cc b/src/node_report.cc
@@ -687,7 +687,7 @@ static void PrintResourceUsage(JSONWriter* writer) {
    writer->json_objectend();
    writer->json_objectend();
  }
-#endif
+#endif  // RUSAGE_THREAD
 }

 // Report operating system information.

diff --git a/src/node_sockaddr-inl.h b/src/node_sockaddr-inl.h
@@ -262,5 +262,5 @@ v8::MaybeLocal<v8::Value> SocketAddressBlockList::Rule::ToV8String(
 }
 }  // namespace node

-#endif  // NODE_WANT_INTERNALS
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 #endif  // SRC_NODE_SOCKADDR_INL_H_
diff --git a/src/node_sockaddr.h b/src/node_sockaddr.h
@@ -400,6 +400,6 @@ class SocketAddressBlockListWrap : public BaseObject {

 }  // namespace node

-#endif  // NOE_WANT_INTERNALS
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

 #endif  // SRC_NODE_SOCKADDR_H_
diff --git a/src/node_url.cc b/src/node_url.cc
@@ -331,7 +331,7 @@ bool ToASCII(const std::string& input, std::string* output) {
  output->assign(*buf, buf.length());
  return true;
 }
-#else
+#else  // !defined(NODE_HAVE_I18N_SUPPORT)
 // Intentional non-ops if ICU is not present.
 bool ToUnicode(const std::string& input, std::string* output) {
  *output = input;
@@ -342,7 +342,7 @@ bool ToASCII(const std::string& input, std::string* output) {
  *output = input;
  return true;
 }
-#endif
+#endif  // !defined(NODE_HAVE_I18N_SUPPORT)

 #define NS_IN6ADDRSZ 16


diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -497,7 +497,7 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
        return;
      }
    }
-#endif
+#endif  // NODE_WITHOUT_NODE_OPTIONS
  }

  if (args[2]->IsArray()) {

diff --git a/src/stream_pipe.h b/src/stream_pipe.h
@@ -72,6 +72,6 @@ class StreamPipe : public AsyncWrap {

 }  // namespace node

-#endif
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

 #endif  // SRC_STREAM_PIPE_H_