Resolve final comments

pull/18809/head
murgatroid99 6 years ago
parent e457584c05
commit 9f3c78177f
  1. 6
      src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
  2. 4
      src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv_windows.cc

@ -77,7 +77,7 @@ class GrpcPolledFdLibuv : public GrpcPolledFd {
return false;
}
void ShutdownInternal(grpc_error* error) {
void ShutdownInternalLocked(grpc_error* error) {
uv_poll_stop(handle_);
uv_close(reinterpret_cast<uv_handle_t*>(handle_), ares_uv_poll_close_cb);
if (read_closure_ != nullptr) {
@ -91,9 +91,9 @@ class GrpcPolledFdLibuv : public GrpcPolledFd {
void ShutdownLocked(grpc_error* error) override {
if (grpc_core::ExecCtx::Get() == nullptr) {
grpc_core::ExecCtx exec_ctx;
ShutdownInternal(error);
ShutdownInternalLocked(error);
} else {
ShutdownInternal(error);
ShutdownInternalLocked(error);
}
}

@ -37,7 +37,7 @@ bool inner_maybe_resolve_localhost_manually_locked(
gpr_split_host_port(name, host, port);
if (*host == nullptr) {
gpr_log(GPR_ERROR,
"Failed to parse %s into host:port during Windows localhost "
"Failed to parse %s into host:port during manual localhost "
"resolution check.",
name);
return false;
@ -45,7 +45,7 @@ bool inner_maybe_resolve_localhost_manually_locked(
if (*port == nullptr) {
if (default_port == nullptr) {
gpr_log(GPR_ERROR,
"No port or default port for %s during Windows localhost "
"No port or default port for %s during manual localhost "
"resolution check.",
name);
return false;

Loading…
Cancel
Save