commit 262d798b380a59ef691ede4c6a32aa71ff191295
author Ben Chan <benchan@chromium.org> Thu Sep 18 08:05:20 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Sep 19 02:59:36 2014 +0000
tree 25f4b00ae454c203cacc89a60a6eac89c27f2514
parent 732bd3bb856fe07d15cbbc1770a21dfe6b30ef9a

crash-reporter: Replace NULL with nullptr.

BUG=None
TEST=`FEATURES=test emerge-$BOARD crash-reporter`

Change-Id: If0804613ee0385752d01f7bbe01902ffef53bd94
Reviewed-on: https://chromium-review.googlesource.com/218870
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

crash_reporter/crash_collector.cc

diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc
index fcb0845..825ed08 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -88,8 +88,8 @@
 void CrashCollector::Initialize(
     CrashCollector::CountCrashFunction count_crash_function,
     CrashCollector::IsFeedbackAllowedFunction is_feedback_allowed_function) {
-  CHECK(count_crash_function != NULL);
-  CHECK(is_feedback_allowed_function != NULL);
+  CHECK(count_crash_function);
+  CHECK(is_feedback_allowed_function);
 
   count_crash_function_ = count_crash_function;
   is_feedback_allowed_function_ = is_feedback_allowed_function;
@@ -156,7 +156,7 @@
 }
 
 GHashTable *CrashCollector::GetActiveUserSessions() {
-  GHashTable *active_sessions = NULL;
+  GHashTable *active_sessions = nullptr;
 
   chromeos::dbus::BusConnection dbus = chromeos::dbus::GetSystemBusConnection();
   if (!dbus.HasConnection()) {
@@ -174,7 +174,7 @@
   }
 
   // Request all the active sessions.
-  GError *gerror = NULL;
+  GError *gerror = nullptr;
   if (!dbus_g_proxy_call(proxy.gproxy(),
                          login_manager::kSessionManagerRetrieveActiveSessions,
                          &gerror, G_TYPE_INVALID,
@@ -243,10 +243,10 @@
                                          gid_t *gid) {
   char storage[256];
   struct passwd passwd_storage;
-  struct passwd *passwd_result = NULL;
+  struct passwd *passwd_result = nullptr;
 
   if (getpwnam_r(name.c_str(), &passwd_storage, storage, sizeof(storage),
-                 &passwd_result) != 0 || passwd_result == NULL) {
+                 &passwd_result) != 0 || passwd_result == nullptr) {
     LOG(ERROR) << "Cannot find user named " << name;
     return false;
   }
@@ -262,7 +262,7 @@
   uid_t default_user_id;
   gid_t default_user_group;
 
-  if (out_of_capacity != NULL) *out_of_capacity = false;
+  if (out_of_capacity) *out_of_capacity = false;
 
   // For testing.
   if (!forced_crash_directory_.empty()) {
@@ -308,7 +308,7 @@
   }
 
   if (!CheckHasCapacity(*crash_directory)) {
-    if (out_of_capacity != NULL) *out_of_capacity = true;
+    if (out_of_capacity) *out_of_capacity = true;
     return false;
   }
 
@@ -386,7 +386,7 @@
   struct dirent* ent;
   bool full = false;
   std::set<std::string> basenames;
-  while (readdir_r(dir, &ent_buf, &ent) == 0 && ent != NULL) {
+  while (readdir_r(dir, &ent_buf, &ent) == 0 && ent) {
     if ((strcmp(ent->d_name, ".") == 0) ||
         (strcmp(ent->d_name, "..") == 0))
       continue;