commit 34de3ba1ffb594b35935fdd110dce1af3f5f4503
author Bernie Innocenti <codewiz@google.com> Tue Feb 19 18:08:36 2019 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Feb 21 06:15:00 2019 +0000
tree bab1829a6177cf84a94c5c6c666b9142d61db11c
parent 111c1ba88139c3647de0148f62a46fcd0cda3740

Rename struct __res_params to res_params

The double-underscore prefixes are a leftover from when this code lived
in bionic. Now we're slowly getting rid of them...

Also cleanup transitive includes a bit.

Test: atest resolv_integration_test resolv_unit_test
Change-Id: I65ed8aed273be4af37a982a167f364a1f33f9a36

server/ResolverController.cpp

diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 0e9fc7d..c8bf967 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -119,7 +119,8 @@
 }  // namespace
 
 int ResolverController::setDnsServers(unsigned netId, const char* searchDomains,
-        const char** servers, int numservers, const __res_params* params) {
+                                      const char** servers, int numservers,
+                                      const res_params* params) {
     if (DBG) {
         ALOGD("setDnsServers netId = %u, numservers = %d", netId, numservers);
     }
@@ -139,7 +140,7 @@
 }
 
 int ResolverController::getDnsInfo(unsigned netId, std::vector<std::string>* servers,
-                                   std::vector<std::string>* domains, __res_params* params,
+                                   std::vector<std::string>* domains, res_params* params,
                                    std::vector<android::net::ResolverStats>* stats,
                                    std::vector<int32_t>* wait_for_pending_req_timeout_count) {
     using android::net::ResolverStats;
@@ -160,7 +161,7 @@
     res_stats res_stats[MAXNS];
     servers->clear();
     domains->clear();
-    *params = __res_params{};
+    *params = res_params{};
     stats->clear();
     int res_wait_for_pending_req_timeout_count;
     int revision_id = RESOLV_STUB.android_net_res_stats_get_info_for_net(
@@ -274,7 +275,7 @@
         }
     }
 
-    __res_params res_params = {};
+    res_params res_params = {};
     res_params.sample_validity = params[INetd::RESOLVER_PARAMS_SAMPLE_VALIDITY];
     res_params.success_threshold = params[INetd::RESOLVER_PARAMS_SUCCESS_THRESHOLD];
     res_params.min_samples = params[INetd::RESOLVER_PARAMS_MIN_SAMPLES];
@@ -319,7 +320,7 @@
                                         std::vector<int32_t>* wait_for_pending_req_timeout_count) {
     using android::net::ResolverStats;
     using android::net::INetd;
-    __res_params res_params;
+    res_params res_params;
     std::vector<ResolverStats> res_stats;
     int ret = getDnsInfo(netId, servers, domains, &res_params, &res_stats,
                          wait_for_pending_req_timeout_count);
@@ -382,7 +383,7 @@
     using android::net::ResolverStats;
     std::vector<std::string> servers;
     std::vector<std::string> domains;
-    __res_params params = {};
+    res_params params = {};
     std::vector<ResolverStats> stats;
     std::vector<int32_t> wait_for_pending_req_timeout_count(1, 0);
     time_t now = time(nullptr);