diff options
author | Yash Tibrewal <yashkt@google.com> | 2018-05-08 15:14:08 -0700 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2018-05-08 15:14:08 -0700 |
commit | 2bb5bf208e422cf425ba12059698c6feacb449e6 (patch) | |
tree | 33543df7bdcfc3707d7a58638b6f95f8668d6864 /src/core/ext/filters/client_channel/resolver | |
parent | 7f51ba8372b05d92e0ee1af91e9591ac28915d80 (diff) |
Remove GPR_UNLIKELY that are not in the call path
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver')
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc | 5 | ||||
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc | 2 |
2 files changed, 3 insertions, 4 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 1b4767b47f..c3c62b60bf 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 @@ -225,15 +225,14 @@ bool ValueInJsonArray(grpc_json* array, const char* value) { char* ChooseServiceConfig(char* service_config_choice_json) { grpc_json* choices_json = grpc_json_parse_string(service_config_choice_json); - if (GPR_UNLIKELY(choices_json == nullptr || - choices_json->type != GRPC_JSON_ARRAY)) { + if (choices_json == nullptr || choices_json->type != GRPC_JSON_ARRAY) { gpr_log(GPR_ERROR, "cannot parse service config JSON string"); return nullptr; } char* service_config = nullptr; for (grpc_json* choice = choices_json->child; choice != nullptr; choice = choice->next) { - if (GPR_UNLIKELY(choice->type != GRPC_JSON_OBJECT)) { + if (choice->type != GRPC_JSON_OBJECT) { gpr_log(GPR_ERROR, "cannot parse service config JSON string"); break; } diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index 8f6132a726..f74ac5aebe 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -123,7 +123,7 @@ void DoNothing(void* ignored) {} OrphanablePtr<Resolver> CreateSockaddrResolver( const ResolverArgs& args, bool parse(const grpc_uri* uri, grpc_resolved_address* dst)) { - if (GPR_UNLIKELY(0 != strcmp(args.uri->authority, ""))) { + if (0 != strcmp(args.uri->authority, "")) { gpr_log(GPR_ERROR, "authority-based URIs not supported by the %s scheme", args.uri->scheme); return OrphanablePtr<Resolver>(nullptr); |