summaryrefslogtreecommitdiff
path: root/cmds/cmd/cmd.cpp
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2018-07-20 13:39:55 -0700
committer Yi Kong <yikong@google.com> 2018-07-20 15:37:19 -0700
commitc67f9a4cf0d7894f7b49f70806ac323630ba178e (patch)
tree3559ef658988a3eb6e14442dd38ed56390b7b355 /cmds/cmd/cmd.cpp
parent2d38d8e7fe9b4edf8f8d8f62780b44e405ae1cf0 (diff)
[cmds] Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning. Test: m Bug: 68236239 Change-Id: I73a0a82e3e32001f8ffb0880250c7023dd8290d3
Diffstat (limited to 'cmds/cmd/cmd.cpp')
-rw-r--r--cmds/cmd/cmd.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index 423853175b..0616adda61 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -103,12 +103,12 @@ public:
}
if (is_selinux_enabled() && seLinuxContext.size() > 0) {
String8 seLinuxContext8(seLinuxContext);
- security_context_t tmp = NULL;
+ security_context_t tmp = nullptr;
getfilecon(fullPath.string(), &tmp);
Unique_SecurityContext context(tmp);
if (checkWrite) {
int accessGranted = selinux_check_access(seLinuxContext8.string(), context.get(),
- "file", "write", NULL);
+ "file", "write", nullptr);
if (accessGranted != 0) {
#if DEBUG
ALOGD("openFile: failed selinux write check!");
@@ -122,7 +122,7 @@ public:
}
if (checkRead) {
int accessGranted = selinux_check_access(seLinuxContext8.string(), context.get(),
- "file", "read", NULL);
+ "file", "read", nullptr);
if (accessGranted != 0) {
#if DEBUG
ALOGD("openFile: failed selinux read check!");
@@ -174,7 +174,7 @@ int main(int argc, char* const argv[])
#endif
sp<IServiceManager> sm = defaultServiceManager();
fflush(stdout);
- if (sm == NULL) {
+ if (sm == nullptr) {
ALOGW("Unable to get default service manager!");
aerr << "cmd: Unable to get default service manager!" << endl;
return 20;
@@ -192,7 +192,7 @@ int main(int argc, char* const argv[])
for (size_t i=0; i<services.size(); i++) {
sp<IBinder> service = sm->checkService(services[i]);
- if (service != NULL) {
+ if (service != nullptr) {
aout << " " << services[i] << endl;
}
}
@@ -205,7 +205,7 @@ int main(int argc, char* const argv[])
}
String16 cmd = String16(argv[1]);
sp<IBinder> service = sm->checkService(cmd);
- if (service == NULL) {
+ if (service == nullptr) {
ALOGW("Can't find service %s", argv[1]);
aerr << "cmd: Can't find service: " << argv[1] << endl;
return 20;