Remove unnecessary codes

3 files changed, 7 insertions, 10 deletions

diff --git a/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c b/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c
index dfc256c679..6cb75d683e 100644
--- a/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c
+++ b/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c
@@ -266,9 +266,7 @@ static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
 static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
   dns_resolver *r = (dns_resolver *)gr;
   gpr_mu_destroy(&r->mu);
-#ifndef GRPC_NATIVE_ADDRESS_RESOLVE
   grpc_ares_cleanup();
-#endif
   if (r->resolved_config) {
     grpc_client_config_unref(exec_ctx, r->resolved_config);
   }
@@ -291,9 +289,7 @@ static grpc_resolver *dns_create(grpc_resolver_args *args,
     return NULL;
   }
 
-#ifndef GRPC_NATIVE_ADDRESS_RESOLVE
   error = grpc_ares_init();
-#endif
   if (error != GRPC_ERROR_NONE) {
     GRPC_LOG_IF_ERROR("ares_library_init() failed", error);
     return NULL;
diff --git a/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c b/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c
index c918777cef..188fc5f95f 100644
--- a/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c
+++ b/src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c
@@ -90,6 +90,7 @@ static fd_pair *get_fd(fd_pair **head, int fd) {
   fd_pair dummy_head;
   fd_pair *node;
   fd_pair *ret;
+
   dummy_head.next = *head;
   node = &dummy_head;
   while (node->next != NULL) {
@@ -106,6 +107,7 @@ static fd_pair *get_fd(fd_pair **head, int fd) {
 static void driver_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
   grpc_ares_ev_driver *d = arg;
   size_t i;
+
   if (error == GRPC_ERROR_NONE) {
     for (i = 0; i < ARES_GETSOCK_MAXNUM; i++) {
       ares_process_fd(
@@ -132,15 +134,15 @@ void grpc_ares_notify_on_event(grpc_exec_ctx *exec_ctx,
         ares_getsock(ev_driver->channel, ev_driver->socks, ARES_GETSOCK_MAXNUM);
     grpc_closure_init(&ev_driver->driver_closure, driver_cb, ev_driver);
     for (i = 0; i < ARES_GETSOCK_MAXNUM; i++) {
-      char *final_name;
-      gpr_asprintf(&final_name, "ares_ev_driver-%" PRIuPTR, i);
+      char *fd_name;
+      gpr_asprintf(&fd_name, "ares_ev_driver-%" PRIuPTR, i);
 
       if (ARES_GETSOCK_READABLE(ev_driver->bitmask, i) ||
           ARES_GETSOCK_WRITABLE(ev_driver->bitmask, i)) {
         fd_pair *fdp = get_fd(&ev_driver->fds, ev_driver->socks[i]);
         if (!fdp) {
           fdp = gpr_malloc(sizeof(fd_pair));
-          fdp->grpc_fd = grpc_fd_create(ev_driver->socks[i], final_name);
+          fdp->grpc_fd = grpc_fd_create(ev_driver->socks[i], fd_name);
           fdp->fd = ev_driver->socks[i];
           grpc_pollset_set_add_fd(exec_ctx, ev_driver->pollset_set,
                                   fdp->grpc_fd);
@@ -157,13 +159,13 @@ void grpc_ares_notify_on_event(grpc_exec_ctx *exec_ctx,
                                   &ev_driver->driver_closure);
         }
       }
-      gpr_free(final_name);
+      gpr_free(fd_name);
     }
   }
 
   while (ev_driver->fds != NULL) {
     fd_pair *cur;
-    // int fd;s
+
     cur = ev_driver->fds;
     ev_driver->fds = ev_driver->fds->next;
     grpc_pollset_set_del_fd(exec_ctx, ev_driver->pollset_set, cur->grpc_fd);
diff --git a/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c b/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c
index 7769b132bf..71acf12b83 100644
--- a/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c
+++ b/src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c
@@ -187,7 +187,6 @@ static void request_resolving_address(grpc_exec_ctx *exec_ctx, void *arg,
     ares_gethostbyname(*channel, r->host, AF_INET6, on_done_cb, r);
   }
   ares_gethostbyname(*channel, r->host, AF_INET, on_done_cb, r);
-  // grpc_ares_gethostbyname(r->ev_driver, r->host, on_dones_cb, r);
   grpc_ares_notify_on_event(exec_ctx, ev_driver);
 }