src: fix conflicts between clang-format and cpplint

joyeecheung · joyeecheung · commit 189cd5068bee · 2018-08-01T18:01:05.000+08:00
diff --git a/src/node.cc b/src/node.cc
@@ -310,9 +310,14 @@ class NodeTraceStateObserver
     auto trace_process = tracing::TracedValue::Create();
     trace_process->BeginDictionary("versions");
 
+    // clang-format off
     const char http_parser_version[] =
-        NODE_STRINGIFY(HTTP_PARSER_VERSION_MAJOR) "." NODE_STRINGIFY(
-            HTTP_PARSER_VERSION_MINOR) "." NODE_STRINGIFY(HTTP_PARSER_VERSION_PATCH);
+        NODE_STRINGIFY(HTTP_PARSER_VERSION_MAJOR)
+        "."
+        NODE_STRINGIFY(HTTP_PARSER_VERSION_MINOR)
+        "."
+        NODE_STRINGIFY(HTTP_PARSER_VERSION_PATCH);
+    // clang-format on
 
     const char node_napi_version[] = NODE_STRINGIFY(NAPI_VERSION);
     const char node_modules_version[] = NODE_STRINGIFY(NODE_MODULE_VERSION);
@@ -2008,10 +2013,14 @@ void SetupProcessObject(Environment* env,
   // process.versions
   Local<Object> versions = Object::New(env->isolate());
   READONLY_PROPERTY(process, "versions", versions);
-
+  // clang-format off
   const char http_parser_version[] =
-      NODE_STRINGIFY(HTTP_PARSER_VERSION_MAJOR) "." NODE_STRINGIFY(
-          HTTP_PARSER_VERSION_MINOR) "." NODE_STRINGIFY(HTTP_PARSER_VERSION_PATCH);
+      NODE_STRINGIFY(HTTP_PARSER_VERSION_MAJOR)
+      "."
+      NODE_STRINGIFY(HTTP_PARSER_VERSION_MINOR)
+      "."
+      NODE_STRINGIFY(HTTP_PARSER_VERSION_PATCH);
+  // clang-format on
   READONLY_PROPERTY(versions,
                     "http_parser",
                     FIXED_ONE_BYTE_STRING(env->isolate(), http_parser_version));
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
@@ -161,7 +161,7 @@ int NodeBIO::Gets(BIO* bio, char* out, int size) {
   return i;
 }
 
-long NodeBIO::Ctrl(BIO* bio,
+long NodeBIO::Ctrl(BIO* bio,  // NOLINT(runtime/int)
                    int cmd,
                    long num,  // NOLINT(runtime/int)
                    void* ptr) {
diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h
@@ -115,7 +115,7 @@ class NodeBIO : public MemoryRetainer {
   static int Write(BIO* bio, const char* data, int len);
   static int Puts(BIO* bio, const char* str);
   static int Gets(BIO* bio, char* out, int size);
-  static long Ctrl(BIO* bio,
+  static long Ctrl(BIO* bio,  // NOLINT(runtime/int)
                    int cmd,
                    long num,  // NOLINT(runtime/int)
                    void* ptr);
diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h
@@ -95,7 +95,7 @@ inline void StreamResource::RemoveStreamListener(StreamListener* listener) {
   // Remove from the linked list.
   for (current = listener_, previous = nullptr;
        /* No loop condition because we want a crash if listener is not found */
-       ;
+       ;  // NOLINT(whitespace/semicolon)
        previous = current, current = current->previous_listener_) {
     CHECK_NOT_NULL(current);
     if (current == listener) {
diff --git a/test/addons-napi/test_make_callback_recurse/binding.cc b/test/addons-napi/test_make_callback_recurse/binding.cc
@@ -40,14 +40,12 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) {
 napi_value Init(napi_env env, napi_value exports) {
   napi_value fn;
   NAPI_CALL(env,
-            napi_create_function(
-                // NOLINTNEXTLINE (readability/null_usage)
-                env,
-                NULL,
-                NAPI_AUTO_LENGTH,
-                MakeCallback,
-                NULL,
-                &fn));
+            napi_create_function(env,
+                                 NULL,  // NOLINT (readability/null_usage)
+                                 NAPI_AUTO_LENGTH,
+                                 MakeCallback,
+                                 NULL,  // NOLINT (readability/null_usage)
+                                 &fn));
   NAPI_CALL(env, napi_set_named_property(env, exports, "makeCallback", fn));
   return exports;
 }
diff --git a/test/addons/openssl-client-cert-engine/testengine.cc b/test/addons/openssl-client-cert-engine/testengine.cc
@@ -44,7 +44,9 @@ int EngineLoadSSLClientCert(ENGINE* engine,
                             STACK_OF(X509_NAME) * ca_dn,
                             X509** ppcert,
                             EVP_PKEY** ppkey,
-                            STACK_OF(X509) * *pother,
+                            // clang-format off
+                            STACK_OF(X509)** pother,
+                            // clang-format on
                             UI_METHOD* ui_method,
                             void* callback_data) {
   if (ppcert != nullptr) {

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ int NodeBIO::Gets(BIO* bio, char* out, int size) {`
`161`	`161`	`return i;`
`162`	`162`	`}`
`163`	`163`
`164`		`-long NodeBIO::Ctrl(BIO* bio,`
	`164`	`+long NodeBIO::Ctrl(BIO* bio, // NOLINT(runtime/int)`
`165`	`165`	`int cmd,`
`166`	`166`	`long num, // NOLINT(runtime/int)`
`167`	`167`	`void* ptr) {`