From a36040d51c5f413a8987a508a60527e897531ece Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 19 Apr 2019 10:25:45 -0700 Subject: [PATCH] Clang format --- .../resolver/dns/c_ares/dns_resolver_ares.cc | 2 +- .../dns/c_ares/grpc_ares_ev_driver_libuv.cc | 22 +++++++++---------- .../dns/c_ares/grpc_ares_wrapper_libuv.cc | 6 ++--- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index ee7929b8d39..ec662b1416d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -435,7 +435,7 @@ static grpc_address_resolver_vtable ares_resolver = { static bool should_use_ares(const char* resolver_env) { return resolver_env != nullptr && gpr_stricmp(resolver_env, "ares") == 0; } -#else /* GRPC_UV */ +#else /* GRPC_UV */ static bool should_use_ares(const char* resolver_env) { return resolver_env == nullptr || strlen(resolver_env) == 0 || gpr_stricmp(resolver_env, "ares") == 0; diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc index fd09d899187..6993edf8a01 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc @@ -36,22 +36,18 @@ namespace grpc_core { void ares_uv_poll_cb(uv_poll_t* handle, int status, int events); -void ares_uv_poll_close_cb(uv_handle_t *handle) { - Delete(handle); -} +void ares_uv_poll_close_cb(uv_handle_t* handle) { Delete(handle); } class GrpcPolledFdLibuv : public GrpcPolledFd { public: - GrpcPolledFdLibuv(ares_socket_t as): as_(as) { + GrpcPolledFdLibuv(ares_socket_t as) : as_(as) { gpr_asprintf(&name_, "c-ares socket: %" PRIdPTR, (intptr_t)as); handle_ = New(); uv_poll_init_socket(uv_default_loop(), handle_, as); handle_->data = this; } - ~GrpcPolledFdLibuv() { - gpr_free(name_); - } + ~GrpcPolledFdLibuv() { gpr_free(name_); } void RegisterForOnReadableLocked(grpc_closure* read_closure) override { GPR_ASSERT(read_closure_ == nullptr); @@ -94,12 +90,14 @@ class GrpcPolledFdLibuv : public GrpcPolledFd { void ares_uv_poll_cb(uv_poll_t* handle, int status, int events) { grpc_core::ExecCtx exec_ctx; - GrpcPolledFdLibuv* polled_fd = reinterpret_cast(handle->data); - grpc_error *error = GRPC_ERROR_NONE; + GrpcPolledFdLibuv* polled_fd = + reinterpret_cast(handle->data); + grpc_error* error = GRPC_ERROR_NONE; if (status < 0) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("cares polling error"); - error = grpc_error_set_str(error, GRPC_ERROR_STR_OS_ERROR, - grpc_slice_from_static_string(uv_strerror(status))); + error = + grpc_error_set_str(error, GRPC_ERROR_STR_OS_ERROR, + grpc_slice_from_static_string(uv_strerror(status))); } if ((events & UV_READABLE) && polled_fd->read_closure_) { GRPC_CLOSURE_SCHED(polled_fd->read_closure_, error); @@ -129,6 +127,6 @@ UniquePtr NewGrpcPolledFdFactory(grpc_combiner* combiner) { return UniquePtr(New()); } -} // namespace grpc_core +} // namespace grpc_core #endif /* GRPC_ARES == 1 && defined(GRPC_UV) */ \ No newline at end of file diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc index eb8d7e5e900..08f3d9ce30d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc @@ -29,11 +29,11 @@ #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" -bool grpc_ares_query_ipv6() { +bool grpc_ares_query_ipv6() { /* The libuv grpc code currently does not have the code to probe for this, - * so we assume for nowthat IPv6 is always available in contexts where this + * so we assume for now that IPv6 is always available in contexts where this * code will be used. */ - return true; + return true; } /* The following two functions were copied entirely from the Windows file. This