summaryrefslogtreecommitdiffstats
path: root/adb/client/commandline.cpp
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2018-07-13 18:15:16 -0700
committerYi Kong <yikong@google.com>2018-07-13 18:21:00 -0700
commitaed415cc475fbe8f5aae400e0fb6b3a028f717d2 (patch)
tree10e7f3a725e4c458cd26ad1a38f7f7997df4dff4 /adb/client/commandline.cpp
parentdc8483cc04ea9d2a716a4ba0916eb3941b54156c (diff)
downloadsystem_core-aed415cc475fbe8f5aae400e0fb6b3a028f717d2.tar.gz
system_core-aed415cc475fbe8f5aae400e0fb6b3a028f717d2.tar.bz2
system_core-aed415cc475fbe8f5aae400e0fb6b3a028f717d2.zip
[adb] Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning. Test: m Bug: 68236239 Change-Id: Ia8c4deacafed2f3b7dbc3d4c3c77c6c632e3de81
Diffstat (limited to 'adb/client/commandline.cpp')
-rw-r--r--adb/client/commandline.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index e07dba7cf..80d0dd3d1 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -885,7 +885,7 @@ static int adb_sideload_host(const char* filename) {
return 0;
}
- int block = strtol(buf, NULL, 10);
+ int block = strtol(buf, nullptr, 10);
size_t offset = block * SIDELOAD_HOST_BLOCK_SIZE;
if (offset >= static_cast<size_t>(sb.st_size)) {
@@ -968,7 +968,7 @@ static int ppp(int argc, const char** argv) {
//argv[2] and beyond become ppp_args[1] and beyond
ppp_args[i - 1] = argv[i];
}
- ppp_args[i-1] = NULL;
+ ppp_args[i-1] = nullptr;
// child side
@@ -1174,7 +1174,7 @@ static int backup(int argc, const char** argv) {
argv[i++] = argv[j++];
}
argc -= 2;
- argv[argc] = NULL;
+ argv[argc] = nullptr;
}
}
@@ -1969,7 +1969,7 @@ static int install_multiple_app(int argc, const char** argv) {
char* end = strrchr(buf, ']');
if (start && end) {
*end = '\0';
- session_id = strtol(start + 1, NULL, 10);
+ session_id = strtol(start + 1, nullptr, 10);
}
}
if (session_id < 0) {