commit bdfd57e5a3a21ac340016a70ea425e4223f23b08
author Yi Kong <yikong@google.com> Wed Jul 25 13:26:10 2018 -0700
committer Yi Kong <yikong@google.com> Wed Jul 25 13:26:10 2018 -0700
tree baab5276b89048e9f327b93bc4a5de07325d8287
parent 50fdf5a544b2f475082978df035e137223e3d454

Modernize codebase by replacing NULL with nullptr

Fixes -Wzero-as-null-pointer-constant warning.

Test: m
Bug: 68236239
Change-Id: I226a0599db4f7c3557e55cade7869d00bd314949

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 5ab5e72..5606d4d 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -99,7 +99,7 @@
             netIdString,
             (char *) "-m",
             fwmarkString,
-            NULL
+            nullptr
         };
 
         if (execv(kClatdPath, args)) {
@@ -127,7 +127,7 @@
     ALOGD("Stopping clatd pid=%d on %s", pid, interface);
 
     kill(pid, SIGTERM);
-    waitpid(pid, NULL, 0);
+    waitpid(pid, nullptr, 0);
     mClatdPids.erase(interface);
 
     ALOGD("clatd on %s stopped", interface);
@@ -141,7 +141,7 @@
     if (pid == 0) {
         return false;
     }
-    waitpid_status = waitpid(pid, NULL, WNOHANG);
+    waitpid_status = waitpid(pid, nullptr, WNOHANG);
     if (waitpid_status != 0) {
         mClatdPids.erase(interface);  // child exited, don't call waitpid on it again
     }