commit bdfd57e5a3a21ac340016a70ea425e4223f23b08
author Yi Kong <yikong@google.com> Wed Jul 25 13:26:10 2018 -0700
committer Yi Kong <yikong@google.com> Wed Jul 25 13:26:10 2018 -0700
tree baab5276b89048e9f327b93bc4a5de07325d8287
parent 50fdf5a544b2f475082978df035e137223e3d454

Modernize codebase by replacing NULL with nullptr

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

Test: m
Bug: 68236239
Change-Id: I226a0599db4f7c3557e55cade7869d00bd314949

server/ResolverController.cpp

diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 24f26bb..c6ac659 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -63,7 +63,7 @@
 std::string addrToString(const sockaddr_storage* addr) {
     char out[INET6_ADDRSTRLEN] = {0};
     getnameinfo((const sockaddr*)addr, sizeof(sockaddr_storage), out,
-            INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST);
+            INET6_ADDRSTRLEN, nullptr, 0, NI_NUMERICHOST);
     return std::string(out);
 }
 
@@ -402,7 +402,7 @@
 }
 
 int ResolverController::clearDnsServers(unsigned netId) {
-    _resolv_set_nameservers_for_net(netId, NULL, 0, "", NULL);
+    _resolv_set_nameservers_for_net(netId, nullptr, 0, "", nullptr);
     if (DBG) {
         ALOGD("clearDnsServers netId = %u\n", netId);
     }