Merge master

1 files changed, 13 insertions, 13 deletions

diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc
index 5a525bb813..3f8451de6b 100644
--- a/src/core/ext/filters/client_channel/resolver_registry.cc
+++ b/src/core/ext/filters/client_channel/resolver_registry.cc
@@ -78,7 +78,7 @@ static grpc_resolver_factory* lookup_factory(const char* name) {
       return g_all_of_the_resolvers[i];
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 grpc_resolver_factory* grpc_resolver_factory_lookup(const char* name) {
@@ -88,24 +88,24 @@ grpc_resolver_factory* grpc_resolver_factory_lookup(const char* name) {
 }
 
 static grpc_resolver_factory* lookup_factory_by_uri(grpc_uri* uri) {
-  if (!uri) return NULL;
+  if (!uri) return nullptr;
   return lookup_factory(uri->scheme);
 }
 
 static grpc_resolver_factory* resolve_factory(const char* target,
                                               grpc_uri** uri,
                                               char** canonical_target) {
-  grpc_resolver_factory* factory = NULL;
+  grpc_resolver_factory* factory = nullptr;
 
-  GPR_ASSERT(uri != NULL);
+  GPR_ASSERT(uri != nullptr);
   *uri = grpc_uri_parse(target, 1);
   factory = lookup_factory_by_uri(*uri);
-  if (factory == NULL) {
+  if (factory == nullptr) {
     grpc_uri_destroy(*uri);
     gpr_asprintf(canonical_target, "%s%s", g_default_resolver_prefix, target);
     *uri = grpc_uri_parse(*canonical_target, 1);
     factory = lookup_factory_by_uri(*uri);
-    if (factory == NULL) {
+    if (factory == nullptr) {
       grpc_uri_destroy(grpc_uri_parse(target, 0));
       grpc_uri_destroy(grpc_uri_parse(*canonical_target, 0));
       gpr_log(GPR_ERROR, "don't know how to resolve '%s' or '%s'", target,
@@ -119,8 +119,8 @@ grpc_resolver* grpc_resolver_create(const char* target,
                                     const grpc_channel_args* args,
                                     grpc_pollset_set* pollset_set,
                                     grpc_combiner* combiner) {
-  grpc_uri* uri = NULL;
-  char* canonical_target = NULL;
+  grpc_uri* uri = nullptr;
+  char* canonical_target = nullptr;
   grpc_resolver_factory* factory =
       resolve_factory(target, &uri, &canonical_target);
   grpc_resolver* resolver;
@@ -137,8 +137,8 @@ grpc_resolver* grpc_resolver_create(const char* target,
 }
 
 char* grpc_get_default_authority(const char* target) {
-  grpc_uri* uri = NULL;
-  char* canonical_target = NULL;
+  grpc_uri* uri = nullptr;
+  char* canonical_target = nullptr;
   grpc_resolver_factory* factory =
       resolve_factory(target, &uri, &canonical_target);
   char* authority = grpc_resolver_factory_get_default_authority(factory, uri);
@@ -148,9 +148,9 @@ char* grpc_get_default_authority(const char* target) {
 }
 
 char* grpc_resolver_factory_add_default_prefix_if_needed(const char* target) {
-  grpc_uri* uri = NULL;
-  char* canonical_target = NULL;
+  grpc_uri* uri = nullptr;
+  char* canonical_target = nullptr;
   resolve_factory(target, &uri, &canonical_target);
   grpc_uri_destroy(uri);
-  return canonical_target == NULL ? gpr_strdup(target) : canonical_target;
+  return canonical_target == nullptr ? gpr_strdup(target) : canonical_target;
 }