diff options
| author | Yi Kong <yikong@google.com> | 2018-07-25 13:26:10 -0700 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2018-07-25 13:26:10 -0700 |
| commit | bdfd57e5a3a21ac340016a70ea425e4223f23b08 (patch) | |
| tree | baab5276b89048e9f327b93bc4a5de07325d8287 /server/TetherController.cpp | |
| parent | 50fdf5a544b2f475082978df035e137223e3d454 (diff) | |
Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: I226a0599db4f7c3557e55cade7869d00bd314949
Diffstat (limited to 'server/TetherController.cpp')
| -rw-r--r-- | server/TetherController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/TetherController.cpp b/server/TetherController.cpp index dbda38a5..857ac993 100644 --- a/server/TetherController.cpp +++ b/server/TetherController.cpp @@ -286,7 +286,7 @@ int TetherController::stopTethering() { ALOGD("Stopping tethering services"); kill(mDaemonPid, SIGTERM); - waitpid(mDaemonPid, NULL, 0); + waitpid(mDaemonPid, nullptr, 0); mDaemonPid = 0; close(mDaemonFd); mDaemonFd = -1; @@ -320,7 +320,7 @@ int TetherController::setDnsForwarders(unsigned netId, char **servers, int numSe ALOGD("setDnsForwarders(0x%x %d = '%s')", fwmark.intValue, i, servers[i]); addrinfo *res, hints = { .ai_flags = AI_NUMERICHOST }; - int ret = getaddrinfo(servers[i], NULL, &hints, &res); + int ret = getaddrinfo(servers[i], nullptr, &hints, &res); freeaddrinfo(res); if (ret) { ALOGE("Failed to parse DNS server '%s'", servers[i]); |