commit 954cf64098907f1dfba4f064a24ca6de09a8e611
author Yi Kong <yikong@google.com> Tue Jul 17 16:16:24 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Oct 26 17:19:18 2018 -0700
tree 8dc38a7d74201bc6088063aee863a70351df63f4
parent 8bae3798cb56789e8297ba0b43979014d00b05ba

[installd] Modernize codebase by replacing NULL with nullptr

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

Test: m
Bug: 68236239

(cherry picked from commit e7bf377d62141c27508b28513e2091a826ad7b15)

Merged-In: I9dc0c1020993ec3c7e95ab552f7620ea2badf742
Change-Id: I1937de4d243e213c36f6f9c3e67380f019c6e61c

cmds/installd/installd.cpp

diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp
index 95ed2ff..673ff0d 100644
--- a/cmds/installd/installd.cpp
+++ b/cmds/installd/installd.cpp
@@ -107,7 +107,7 @@
         DIR *dir;
         struct dirent *dirent;
         dir = opendir("/data/user");
-        if (dir != NULL) {
+        if (dir != nullptr) {
             while ((dirent = readdir(dir))) {
                 const char *name = dirent->d_name;
 
@@ -146,10 +146,10 @@
             closedir(dir);
 
             if (access(keychain_added_dir, F_OK) == 0) {
-                delete_dir_contents(keychain_added_dir, 1, 0);
+                delete_dir_contents(keychain_added_dir, 1, nullptr);
             }
             if (access(keychain_removed_dir, F_OK) == 0) {
-                delete_dir_contents(keychain_removed_dir, 1, 0);
+                delete_dir_contents(keychain_removed_dir, 1, nullptr);
             }
         }