diff options
author | 2016-11-30 15:51:19 -0800 | |
---|---|---|
committer | 2016-11-30 15:51:19 -0800 | |
commit | 19d7bab431d08ae721ffd651926e05320371fff5 (patch) | |
tree | cac779dbdc18bc8b3cd0cc0564ce4feab0fc5a28 /src/core | |
parent | 3d803237dc1047bd58b0d288478d9d7cf7b9666a (diff) |
Address review comments
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ext/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c | 6 | ||||
-rw-r--r-- | src/core/ext/resolver/dns/c_ares/grpc_ares_wrapper.c | 2 |
2 files changed, 3 insertions, 5 deletions
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 301f52d62f..4f7485c5f5 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 @@ -123,16 +123,14 @@ static void fd_node_destroy(grpc_exec_ctx *exec_ctx, fd_node *fdn) { grpc_error *grpc_ares_ev_driver_create(grpc_ares_ev_driver **ev_driver, grpc_pollset_set *pollset_set) { - int status; - grpc_error *err = GRPC_ERROR_NONE; *ev_driver = gpr_malloc(sizeof(grpc_ares_ev_driver)); - status = ares_init(&(*ev_driver)->channel); + int status = ares_init(&(*ev_driver)->channel); gpr_log(GPR_DEBUG, "grpc_ares_ev_driver_create"); if (status != ARES_SUCCESS) { char *err_msg; gpr_asprintf(&err_msg, "Failed to init ares channel. C-ares error: %s", ares_strerror(status)); - err = GRPC_ERROR_CREATE(err_msg); + grpc_error *err = GRPC_ERROR_CREATE(err_msg); gpr_free(err_msg); gpr_free(*ev_driver); return err; 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 c210c40f09..a9e94a509d 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 @@ -125,12 +125,12 @@ static void grpc_ares_request_unref(grpc_exec_ctx *exec_ctx, static void on_done_cb(void *arg, int status, int timeouts, struct hostent *hostent) { grpc_ares_request *r = (grpc_ares_request *)arg; - grpc_resolved_addresses **addresses = r->addrs_out; gpr_mu_lock(&r->mu); if (status == ARES_SUCCESS) { GRPC_ERROR_UNREF(r->error); r->error = GRPC_ERROR_NONE; r->success = true; + grpc_resolved_addresses **addresses = r->addrs_out; if (*addresses == NULL) { *addresses = gpr_malloc(sizeof(grpc_resolved_addresses)); (*addresses)->naddrs = 0; |