resolv: dead code removal
- hostalias() and res_hostalias(): these were no-ops
- res_opt(), res_querydomain(), p_option(), p_query(),
res_isourserver(), res_nisourserver(): had no callers
- res_ourserver_p(): made local to res_data.cpp
- res_send_setqhook(): unused, DnsProxyListener sets the qhook directly
in android_net_context, which is then copied to res_state by
res_setnetcontext(). We can further simplify it later on.
Test: atest netd_integration_test
Change-Id: I70f72202e5b940986cac67dc99ab9461af882187
diff --git a/resolv/res_send.cpp b/resolv/res_send.cpp
index 30304f2..34a6e18 100644
--- a/resolv/res_send.cpp
+++ b/resolv/res_send.cpp
@@ -266,8 +266,6 @@
}
/* BIONIC-END */
-/* Public. */
-
/* int
* res_isourserver(ina)
* looks up "ina" in _res.ns_addr_list[]
@@ -277,9 +275,9 @@
* author:
* paul vixie, 29may94
*/
-int res_ourserver_p(const res_state statp, const struct sockaddr* sa) {
- const struct sockaddr_in *inp, *srv;
- const struct sockaddr_in6 *in6p, *srv6;
+static int res_ourserver_p(const res_state statp, const sockaddr* sa) {
+ const sockaddr_in *inp, *srv;
+ const sockaddr_in6 *in6p, *srv6;
int ns;
switch (sa->sa_family) {
@@ -290,7 +288,7 @@
if (srv->sin_family == inp->sin_family && srv->sin_port == inp->sin_port &&
(srv->sin_addr.s_addr == INADDR_ANY ||
srv->sin_addr.s_addr == inp->sin_addr.s_addr))
- return (1);
+ return 1;
}
break;
case AF_INET6:
@@ -304,13 +302,13 @@
#endif
(IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||
IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr, &in6p->sin6_addr)))
- return (1);
+ return 1;
}
break;
default:
break;
}
- return (0);
+ return 0;
}
/* int