commit 88b591f24cb3f94f982d7024c2e8ed25c2cc26a2
author Alex Vakulenko <avakulenko@chromium.org> Thu Aug 28 16:48:57 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Sep 01 11:05:16 2014 +0000
tree d49741d0b0926c4c387e9d618b990ae89e6d2f8e
parent f3e2801f18bae14e41099e007de7c9a019735556

update_engine: Replace NULL with nullptr

Replaced the usage of NULL with nullptr. This also makes it possible to
use standard gtest macros to compare pointers in Update Manager's unit tests.
So, there is no need in custom UMTEST_... macros which are replaced with the
gtest macros (see change in update_engine/update_manager/umtest_utils.h):

UMTEST_ASSERT_NULL(p)      => ASSERT_EQ(nullptr, p)
UMTEST_ASSERT_NOT_NULL(p)  => ASSERT_NE(nullptr, p)
UMTEST_EXPECT_NULL(p)      => EXPECT_EQ(nullptr, p)
UMTEST_EXPECT_NOT_NULL(p)  => EXPECT_NE(nullptr, p)

BUG=None
TEST=FEATURES=test emerge-link update_engine
     USE="clang asan" FEATURES=test emerge-link update_engine

Change-Id: I77a42a1e9ce992bb2f9f263db5cf75fe6110a4ec
Reviewed-on: https://chromium-review.googlesource.com/215136
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

subprocess.cc

diff --git a/subprocess.cc b/subprocess.cc
index aab71b5..e2ab793 100644
--- a/subprocess.cc
+++ b/subprocess.cc
@@ -65,7 +65,7 @@
                                  buf,
                                  arraysize(buf),
                                  &bytes_read,
-                                 NULL) == G_IO_STATUS_NORMAL &&
+                                 nullptr) == G_IO_STATUS_NORMAL &&
          bytes_read > 0) {
     stdout->append(buf, bytes_read);
   }
@@ -76,7 +76,7 @@
 void FreeArgv(char** argv) {
   for (int i = 0; argv[i]; i++) {
     free(argv[i]);
-    argv[i] = NULL;
+    argv[i] = nullptr;
   }
 }
 
@@ -86,7 +86,7 @@
 }
 
 // Note: Caller responsible for free()ing the returned value!
-// Will return NULL on failure and free any allocated memory.
+// Will return null on failure and free any allocated memory.
 char** ArgPointer() {
   const char* keys[] = {"LD_LIBRARY_PATH", "PATH"};
   char** ret = new char*[arraysize(keys) + 1];
@@ -98,12 +98,12 @@
       if (!ret[pointer]) {
         FreeArgv(ret);
         delete [] ret;
-        return NULL;
+        return nullptr;
       }
       ++pointer;
     }
   }
-  ret[pointer] = NULL;
+  ret[pointer] = nullptr;
   return ret;
 }
 
@@ -131,15 +131,15 @@
   for (unsigned int i = 0; i < cmd.size(); i++) {
     argv[i] = strdup(cmd[i].c_str());
     if (!argv[i]) {
-      FreeArgvInError(argv.get());  // NULL in argv[i] terminates argv.
+      FreeArgvInError(argv.get());  // null in argv[i] terminates argv.
       return 0;
     }
   }
-  argv[cmd.size()] = NULL;
+  argv[cmd.size()] = nullptr;
 
   char** argp = ArgPointer();
   if (!argp) {
-    FreeArgvInError(argv.get());  // NULL in argv[i] terminates argv.
+    FreeArgvInError(argv.get());  // null in argv[i] terminates argv.
     return 0;
   }
   ScopedFreeArgPointer argp_free(argp);
@@ -150,16 +150,16 @@
   gint stdout_fd = -1;
   GError* error = nullptr;
   bool success = g_spawn_async_with_pipes(
-      NULL,  // working directory
+      nullptr,  // working directory
       argv.get(),
       argp,
       G_SPAWN_DO_NOT_REAP_CHILD,  // flags
       GRedirectStderrToStdout,  // child setup function
-      NULL,  // child setup data pointer
+      nullptr,  // child setup data pointer
       &child_pid,
-      NULL,
+      nullptr,
       &stdout_fd,
-      NULL,
+      nullptr,
       &error);
   FreeArgv(argv.get());
   if (!success) {
@@ -172,9 +172,9 @@
 
   // Capture the subprocess output.
   record->gioout = g_io_channel_unix_new(stdout_fd);
-  g_io_channel_set_encoding(record->gioout, NULL, NULL);
+  g_io_channel_set_encoding(record->gioout, nullptr, nullptr);
   LOG_IF(WARNING,
-         g_io_channel_set_flags(record->gioout, G_IO_FLAG_NONBLOCK, NULL) !=
+         g_io_channel_set_flags(record->gioout, G_IO_FLAG_NONBLOCK, nullptr) !=
          G_IO_STATUS_NORMAL) << "Unable to set non-blocking I/O mode.";
   record->gioout_tag = g_io_add_watch(
       record->gioout,
@@ -185,7 +185,7 @@
 }
 
 void Subprocess::CancelExec(uint32_t tag) {
-  subprocess_records_[tag]->callback = NULL;
+  subprocess_records_[tag]->callback = nullptr;
 }
 
 bool Subprocess::SynchronousExecFlags(const vector<string>& cmd,
@@ -195,35 +195,35 @@
   if (stdout) {
     *stdout = "";
   }
-  GError* err = NULL;
+  GError* err = nullptr;
   scoped_ptr<char*[]> argv(new char*[cmd.size() + 1]);
   for (unsigned int i = 0; i < cmd.size(); i++) {
     argv[i] = strdup(cmd[i].c_str());
     if (!argv[i]) {
-      FreeArgvInError(argv.get());  // NULL in argv[i] terminates argv.
+      FreeArgvInError(argv.get());  // null in argv[i] terminates argv.
       return false;
     }
   }
-  argv[cmd.size()] = NULL;
+  argv[cmd.size()] = nullptr;
 
   char** argp = ArgPointer();
   if (!argp) {
-    FreeArgvInError(argv.get());  // NULL in argv[i] terminates argv.
+    FreeArgvInError(argv.get());  // null in argv[i] terminates argv.
     return false;
   }
   ScopedFreeArgPointer argp_free(argp);
 
   char* child_stdout;
   bool success = g_spawn_sync(
-      NULL,  // working directory
+      nullptr,  // working directory
       argv.get(),
       argp,
       static_cast<GSpawnFlags>(G_SPAWN_STDERR_TO_DEV_NULL |
                                G_SPAWN_SEARCH_PATH | flags),  // flags
       GRedirectStderrToStdout,  // child setup function
-      NULL,  // data for child setup function
+      nullptr,  // data for child setup function
       &child_stdout,
-      NULL,
+      nullptr,
       return_code,
       &err);
   FreeArgv(argv.get());
@@ -258,6 +258,6 @@
   return false;
 }
 
-Subprocess* Subprocess::subprocess_singleton_ = NULL;
+Subprocess* Subprocess::subprocess_singleton_ = nullptr;
 
 }  // namespace chromeos_update_engine