indent pass to get logical source lines on one physical line

6 files changed, 741 insertions, 612 deletions

diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c
index 73723350cb..10d6cfa13e 100644
--- a/src/core/client_config/resolvers/dns_resolver.c
+++ b/src/core/client_config/resolvers/dns_resolver.c
@@ -44,7 +44,8 @@
 #include "src/core/iomgr/resolve_address.h"
 #include "src/core/support/string.h"
 
-typedef struct {
+typedef struct
+{
   /** base class: must be first */
   grpc_resolver base;
   /** refcount */
@@ -74,162 +75,175 @@ typedef struct {
   grpc_client_config *resolved_config;
 } dns_resolver;
 
-static void dns_destroy(grpc_resolver *r, grpc_closure_list *closure_list);
+static void dns_destroy (grpc_resolver * r, grpc_closure_list * closure_list);
 
-static void dns_start_resolving_locked(dns_resolver *r);
-static void dns_maybe_finish_next_locked(dns_resolver *r,
-                                         grpc_closure_list *closure_list);
+static void dns_start_resolving_locked (dns_resolver * r);
+static void dns_maybe_finish_next_locked (dns_resolver * r, grpc_closure_list * closure_list);
 
-static void dns_shutdown(grpc_resolver *r, grpc_closure_list *closure_list);
-static void dns_channel_saw_error(grpc_resolver *r,
-                                  struct sockaddr *failing_address,
-                                  int failing_address_len,
-                                  grpc_closure_list *closure_list);
-static void dns_next(grpc_resolver *r, grpc_client_config **target_config,
-                     grpc_closure *on_complete,
-                     grpc_closure_list *closure_list);
+static void dns_shutdown (grpc_resolver * r, grpc_closure_list * closure_list);
+static void dns_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list);
+static void dns_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list);
 
 static const grpc_resolver_vtable dns_resolver_vtable = {
-    dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next};
+  dns_destroy, dns_shutdown, dns_channel_saw_error, dns_next
+};
 
-static void dns_shutdown(grpc_resolver *resolver,
-                         grpc_closure_list *closure_list) {
-  dns_resolver *r = (dns_resolver *)resolver;
-  gpr_mu_lock(&r->mu);
-  if (r->next_completion != NULL) {
-    *r->target_config = NULL;
-    grpc_closure_list_add(closure_list, r->next_completion, 1);
-    r->next_completion = NULL;
-  }
-  gpr_mu_unlock(&r->mu);
+static void
+dns_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list)
+{
+  dns_resolver *r = (dns_resolver *) resolver;
+  gpr_mu_lock (&r->mu);
+  if (r->next_completion != NULL)
+    {
+      *r->target_config = NULL;
+      grpc_closure_list_add (closure_list, r->next_completion, 1);
+      r->next_completion = NULL;
+    }
+  gpr_mu_unlock (&r->mu);
 }
 
-static void dns_channel_saw_error(grpc_resolver *resolver, struct sockaddr *sa,
-                                  int len, grpc_closure_list *closure_list) {
-  dns_resolver *r = (dns_resolver *)resolver;
-  gpr_mu_lock(&r->mu);
-  if (!r->resolving) {
-    dns_start_resolving_locked(r);
-  }
-  gpr_mu_unlock(&r->mu);
+static void
+dns_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, grpc_closure_list * closure_list)
+{
+  dns_resolver *r = (dns_resolver *) resolver;
+  gpr_mu_lock (&r->mu);
+  if (!r->resolving)
+    {
+      dns_start_resolving_locked (r);
+    }
+  gpr_mu_unlock (&r->mu);
 }
 
-static void dns_next(grpc_resolver *resolver,
-                     grpc_client_config **target_config,
-                     grpc_closure *on_complete,
-                     grpc_closure_list *closure_list) {
-  dns_resolver *r = (dns_resolver *)resolver;
-  gpr_mu_lock(&r->mu);
-  GPR_ASSERT(!r->next_completion);
+static void
+dns_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list)
+{
+  dns_resolver *r = (dns_resolver *) resolver;
+  gpr_mu_lock (&r->mu);
+  GPR_ASSERT (!r->next_completion);
   r->next_completion = on_complete;
   r->target_config = target_config;
-  if (r->resolved_version == 0 && !r->resolving) {
-    dns_start_resolving_locked(r);
-  } else {
-    dns_maybe_finish_next_locked(r, closure_list);
-  }
-  gpr_mu_unlock(&r->mu);
+  if (r->resolved_version == 0 && !r->resolving)
+    {
+      dns_start_resolving_locked (r);
+    }
+  else
+    {
+      dns_maybe_finish_next_locked (r, closure_list);
+    }
+  gpr_mu_unlock (&r->mu);
 }
 
-static void dns_on_resolved(void *arg, grpc_resolved_addresses *addresses,
-                            grpc_closure_list *closure_list) {
+static void
+dns_on_resolved (void *arg, grpc_resolved_addresses * addresses, grpc_closure_list * closure_list)
+{
   dns_resolver *r = arg;
   grpc_client_config *config = NULL;
   grpc_subchannel **subchannels;
   grpc_subchannel_args args;
   grpc_lb_policy *lb_policy;
   size_t i;
-  if (addresses) {
-    grpc_lb_policy_args lb_policy_args;
-    config = grpc_client_config_create();
-    subchannels = gpr_malloc(sizeof(grpc_subchannel *) * addresses->naddrs);
-    for (i = 0; i < addresses->naddrs; i++) {
-      memset(&args, 0, sizeof(args));
-      args.addr = (struct sockaddr *)(addresses->addrs[i].addr);
-      args.addr_len = (size_t)addresses->addrs[i].len;
-      subchannels[i] = grpc_subchannel_factory_create_subchannel(
-          r->subchannel_factory, &args, closure_list);
+  if (addresses)
+    {
+      grpc_lb_policy_args lb_policy_args;
+      config = grpc_client_config_create ();
+      subchannels = gpr_malloc (sizeof (grpc_subchannel *) * addresses->naddrs);
+      for (i = 0; i < addresses->naddrs; i++)
+	{
+	  memset (&args, 0, sizeof (args));
+	  args.addr = (struct sockaddr *) (addresses->addrs[i].addr);
+	  args.addr_len = (size_t) addresses->addrs[i].len;
+	  subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list);
+	}
+      memset (&lb_policy_args, 0, sizeof (lb_policy_args));
+      lb_policy_args.subchannels = subchannels;
+      lb_policy_args.num_subchannels = addresses->naddrs;
+      lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args);
+      grpc_client_config_set_lb_policy (config, lb_policy);
+      GRPC_LB_POLICY_UNREF (lb_policy, "construction", closure_list);
+      grpc_resolved_addresses_destroy (addresses);
+      gpr_free (subchannels);
     }
-    memset(&lb_policy_args, 0, sizeof(lb_policy_args));
-    lb_policy_args.subchannels = subchannels;
-    lb_policy_args.num_subchannels = addresses->naddrs;
-    lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args);
-    grpc_client_config_set_lb_policy(config, lb_policy);
-    GRPC_LB_POLICY_UNREF(lb_policy, "construction", closure_list);
-    grpc_resolved_addresses_destroy(addresses);
-    gpr_free(subchannels);
-  }
-  gpr_mu_lock(&r->mu);
-  GPR_ASSERT(r->resolving);
+  gpr_mu_lock (&r->mu);
+  GPR_ASSERT (r->resolving);
   r->resolving = 0;
-  if (r->resolved_config) {
-    grpc_client_config_unref(r->resolved_config, closure_list);
-  }
+  if (r->resolved_config)
+    {
+      grpc_client_config_unref (r->resolved_config, closure_list);
+    }
   r->resolved_config = config;
   r->resolved_version++;
-  dns_maybe_finish_next_locked(r, closure_list);
-  gpr_mu_unlock(&r->mu);
+  dns_maybe_finish_next_locked (r, closure_list);
+  gpr_mu_unlock (&r->mu);
 
-  GRPC_RESOLVER_UNREF(&r->base, "dns-resolving", closure_list);
+  GRPC_RESOLVER_UNREF (&r->base, "dns-resolving", closure_list);
 }
 
-static void dns_start_resolving_locked(dns_resolver *r) {
-  GRPC_RESOLVER_REF(&r->base, "dns-resolving");
-  GPR_ASSERT(!r->resolving);
+static void
+dns_start_resolving_locked (dns_resolver * r)
+{
+  GRPC_RESOLVER_REF (&r->base, "dns-resolving");
+  GPR_ASSERT (!r->resolving);
   r->resolving = 1;
-  grpc_resolve_address(r->name, r->default_port, dns_on_resolved, r);
+  grpc_resolve_address (r->name, r->default_port, dns_on_resolved, r);
 }
 
-static void dns_maybe_finish_next_locked(dns_resolver *r,
-                                         grpc_closure_list *closure_list) {
-  if (r->next_completion != NULL &&
-      r->resolved_version != r->published_version) {
-    *r->target_config = r->resolved_config;
-    if (r->resolved_config) {
-      grpc_client_config_ref(r->resolved_config);
+static void
+dns_maybe_finish_next_locked (dns_resolver * r, grpc_closure_list * closure_list)
+{
+  if (r->next_completion != NULL && r->resolved_version != r->published_version)
+    {
+      *r->target_config = r->resolved_config;
+      if (r->resolved_config)
+	{
+	  grpc_client_config_ref (r->resolved_config);
+	}
+      grpc_closure_list_add (closure_list, r->next_completion, 1);
+      r->next_completion = NULL;
+      r->published_version = r->resolved_version;
     }
-    grpc_closure_list_add(closure_list, r->next_completion, 1);
-    r->next_completion = NULL;
-    r->published_version = r->resolved_version;
-  }
 }
 
-static void dns_destroy(grpc_resolver *gr, grpc_closure_list *closure_list) {
-  dns_resolver *r = (dns_resolver *)gr;
-  gpr_mu_destroy(&r->mu);
-  if (r->resolved_config) {
-    grpc_client_config_unref(r->resolved_config, closure_list);
-  }
-  grpc_subchannel_factory_unref(r->subchannel_factory, closure_list);
-  gpr_free(r->name);
-  gpr_free(r->default_port);
-  gpr_free(r->lb_policy_name);
-  gpr_free(r);
+static void
+dns_destroy (grpc_resolver * gr, grpc_closure_list * closure_list)
+{
+  dns_resolver *r = (dns_resolver *) gr;
+  gpr_mu_destroy (&r->mu);
+  if (r->resolved_config)
+    {
+      grpc_client_config_unref (r->resolved_config, closure_list);
+    }
+  grpc_subchannel_factory_unref (r->subchannel_factory, closure_list);
+  gpr_free (r->name);
+  gpr_free (r->default_port);
+  gpr_free (r->lb_policy_name);
+  gpr_free (r);
 }
 
-static grpc_resolver *dns_create(grpc_resolver_args *args,
-                                 const char *default_port,
-                                 const char *lb_policy_name) {
+static grpc_resolver *
+dns_create (grpc_resolver_args * args, const char *default_port, const char *lb_policy_name)
+{
   dns_resolver *r;
   const char *path = args->uri->path;
 
-  if (0 != strcmp(args->uri->authority, "")) {
-    gpr_log(GPR_ERROR, "authority based dns uri's not supported");
-    return NULL;
-  }
+  if (0 != strcmp (args->uri->authority, ""))
+    {
+      gpr_log (GPR_ERROR, "authority based dns uri's not supported");
+      return NULL;
+    }
 
-  if (path[0] == '/') ++path;
+  if (path[0] == '/')
+    ++path;
 
-  r = gpr_malloc(sizeof(dns_resolver));
-  memset(r, 0, sizeof(*r));
-  gpr_ref_init(&r->refs, 1);
-  gpr_mu_init(&r->mu);
-  grpc_resolver_init(&r->base, &dns_resolver_vtable);
-  r->name = gpr_strdup(path);
-  r->default_port = gpr_strdup(default_port);
+  r = gpr_malloc (sizeof (dns_resolver));
+  memset (r, 0, sizeof (*r));
+  gpr_ref_init (&r->refs, 1);
+  gpr_mu_init (&r->mu);
+  grpc_resolver_init (&r->base, &dns_resolver_vtable);
+  r->name = gpr_strdup (path);
+  r->default_port = gpr_strdup (default_port);
   r->subchannel_factory = args->subchannel_factory;
-  grpc_subchannel_factory_ref(r->subchannel_factory);
-  r->lb_policy_name = gpr_strdup(lb_policy_name);
+  grpc_subchannel_factory_ref (r->subchannel_factory);
+  r->lb_policy_name = gpr_strdup (lb_policy_name);
   return &r->base;
 }
 
@@ -237,27 +251,39 @@ static grpc_resolver *dns_create(grpc_resolver_args *args,
  * FACTORY
  */
 
-static void dns_factory_ref(grpc_resolver_factory *factory) {}
+static void
+dns_factory_ref (grpc_resolver_factory * factory)
+{
+}
 
-static void dns_factory_unref(grpc_resolver_factory *factory) {}
+static void
+dns_factory_unref (grpc_resolver_factory * factory)
+{
+}
 
-static grpc_resolver *dns_factory_create_resolver(
-    grpc_resolver_factory *factory, grpc_resolver_args *args) {
-  return dns_create(args, "https", "pick_first");
+static grpc_resolver *
+dns_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args)
+{
+  return dns_create (args, "https", "pick_first");
 }
 
-char *dns_factory_get_default_host_name(grpc_resolver_factory *factory,
-                                        grpc_uri *uri) {
+char *
+dns_factory_get_default_host_name (grpc_resolver_factory * factory, grpc_uri * uri)
+{
   const char *path = uri->path;
-  if (path[0] == '/') ++path;
-  return gpr_strdup(path);
+  if (path[0] == '/')
+    ++path;
+  return gpr_strdup (path);
 }
 
 static const grpc_resolver_factory_vtable dns_factory_vtable = {
-    dns_factory_ref, dns_factory_unref, dns_factory_create_resolver,
-    dns_factory_get_default_host_name, "dns"};
-static grpc_resolver_factory dns_resolver_factory = {&dns_factory_vtable};
+  dns_factory_ref, dns_factory_unref, dns_factory_create_resolver,
+  dns_factory_get_default_host_name, "dns"
+};
+static grpc_resolver_factory dns_resolver_factory = { &dns_factory_vtable };
 
-grpc_resolver_factory *grpc_dns_resolver_factory_create() {
+grpc_resolver_factory *
+grpc_dns_resolver_factory_create ()
+{
   return &dns_resolver_factory;
 }
diff --git a/src/core/client_config/resolvers/dns_resolver.h b/src/core/client_config/resolvers/dns_resolver.h
index a3ef3161a6..bb43499149 100644
--- a/src/core/client_config/resolvers/dns_resolver.h
+++ b/src/core/client_config/resolvers/dns_resolver.h
@@ -37,6 +37,6 @@
 #include "src/core/client_config/resolver_factory.h"
 
 /** Create a dns resolver factory */
-grpc_resolver_factory *grpc_dns_resolver_factory_create(void);
+grpc_resolver_factory *grpc_dns_resolver_factory_create (void);
 
 #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_DNS_RESOLVER_H */
diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c
index 378813f45b..5358caf3bd 100644
--- a/src/core/client_config/resolvers/sockaddr_resolver.c
+++ b/src/core/client_config/resolvers/sockaddr_resolver.c
@@ -49,7 +49,8 @@
 #include "src/core/iomgr/resolve_address.h"
 #include "src/core/support/string.h"
 
-typedef struct {
+typedef struct
+{
   /** base class: must be first */
   grpc_resolver base;
   /** refcount */
@@ -76,285 +77,314 @@ typedef struct {
   grpc_client_config **target_config;
 } sockaddr_resolver;
 
-static void sockaddr_destroy(grpc_resolver *r, grpc_closure_list *closure_list);
+static void sockaddr_destroy (grpc_resolver * r, grpc_closure_list * closure_list);
 
-static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r,
-                                              grpc_closure_list *closure_list);
+static void sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * closure_list);
 
-static void sockaddr_shutdown(grpc_resolver *r,
-                              grpc_closure_list *closure_list);
-static void sockaddr_channel_saw_error(grpc_resolver *r,
-                                       struct sockaddr *failing_address,
-                                       int failing_address_len,
-                                       grpc_closure_list *closure_list);
-static void sockaddr_next(grpc_resolver *r, grpc_client_config **target_config,
-                          grpc_closure *on_complete,
-                          grpc_closure_list *closure_list);
+static void sockaddr_shutdown (grpc_resolver * r, grpc_closure_list * closure_list);
+static void sockaddr_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len, grpc_closure_list * closure_list);
+static void sockaddr_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list);
 
 static const grpc_resolver_vtable sockaddr_resolver_vtable = {
-    sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error,
-    sockaddr_next};
-
-static void sockaddr_shutdown(grpc_resolver *resolver,
-                              grpc_closure_list *closure_list) {
-  sockaddr_resolver *r = (sockaddr_resolver *)resolver;
-  gpr_mu_lock(&r->mu);
-  if (r->next_completion != NULL) {
-    *r->target_config = NULL;
-    grpc_closure_list_add(closure_list, r->next_completion, 1);
-    r->next_completion = NULL;
-  }
-  gpr_mu_unlock(&r->mu);
+  sockaddr_destroy, sockaddr_shutdown, sockaddr_channel_saw_error,
+  sockaddr_next
+};
+
+static void
+sockaddr_shutdown (grpc_resolver * resolver, grpc_closure_list * closure_list)
+{
+  sockaddr_resolver *r = (sockaddr_resolver *) resolver;
+  gpr_mu_lock (&r->mu);
+  if (r->next_completion != NULL)
+    {
+      *r->target_config = NULL;
+      grpc_closure_list_add (closure_list, r->next_completion, 1);
+      r->next_completion = NULL;
+    }
+  gpr_mu_unlock (&r->mu);
+}
+
+static void
+sockaddr_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len, grpc_closure_list * closure_list)
+{
 }
 
-static void sockaddr_channel_saw_error(grpc_resolver *resolver,
-                                       struct sockaddr *sa, int len,
-                                       grpc_closure_list *closure_list) {}
-
-static void sockaddr_next(grpc_resolver *resolver,
-                          grpc_client_config **target_config,
-                          grpc_closure *on_complete,
-                          grpc_closure_list *closure_list) {
-  sockaddr_resolver *r = (sockaddr_resolver *)resolver;
-  gpr_mu_lock(&r->mu);
-  GPR_ASSERT(!r->next_completion);
+static void
+sockaddr_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete, grpc_closure_list * closure_list)
+{
+  sockaddr_resolver *r = (sockaddr_resolver *) resolver;
+  gpr_mu_lock (&r->mu);
+  GPR_ASSERT (!r->next_completion);
   r->next_completion = on_complete;
   r->target_config = target_config;
-  sockaddr_maybe_finish_next_locked(r, closure_list);
-  gpr_mu_unlock(&r->mu);
+  sockaddr_maybe_finish_next_locked (r, closure_list);
+  gpr_mu_unlock (&r->mu);
 }
 
-static void sockaddr_maybe_finish_next_locked(sockaddr_resolver *r,
-                                              grpc_closure_list *closure_list) {
+static void
+sockaddr_maybe_finish_next_locked (sockaddr_resolver * r, grpc_closure_list * closure_list)
+{
   grpc_client_config *cfg;
   grpc_lb_policy *lb_policy;
   grpc_lb_policy_args lb_policy_args;
   grpc_subchannel **subchannels;
   grpc_subchannel_args args;
 
-  if (r->next_completion != NULL && !r->published) {
-    size_t i;
-    cfg = grpc_client_config_create();
-    subchannels = gpr_malloc(sizeof(grpc_subchannel *) * r->num_addrs);
-    for (i = 0; i < r->num_addrs; i++) {
-      memset(&args, 0, sizeof(args));
-      args.addr = (struct sockaddr *)&r->addrs[i];
-      args.addr_len = r->addrs_len[i];
-      subchannels[i] = grpc_subchannel_factory_create_subchannel(
-          r->subchannel_factory, &args, closure_list);
+  if (r->next_completion != NULL && !r->published)
+    {
+      size_t i;
+      cfg = grpc_client_config_create ();
+      subchannels = gpr_malloc (sizeof (grpc_subchannel *) * r->num_addrs);
+      for (i = 0; i < r->num_addrs; i++)
+	{
+	  memset (&args, 0, sizeof (args));
+	  args.addr = (struct sockaddr *) &r->addrs[i];
+	  args.addr_len = r->addrs_len[i];
+	  subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list);
+	}
+      memset (&lb_policy_args, 0, sizeof (lb_policy_args));
+      lb_policy_args.subchannels = subchannels;
+      lb_policy_args.num_subchannels = r->num_addrs;
+      lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args);
+      gpr_free (subchannels);
+      grpc_client_config_set_lb_policy (cfg, lb_policy);
+      GRPC_LB_POLICY_UNREF (lb_policy, "sockaddr", closure_list);
+      r->published = 1;
+      *r->target_config = cfg;
+      grpc_closure_list_add (closure_list, r->next_completion, 1);
+      r->next_completion = NULL;
     }
-    memset(&lb_policy_args, 0, sizeof(lb_policy_args));
-    lb_policy_args.subchannels = subchannels;
-    lb_policy_args.num_subchannels = r->num_addrs;
-    lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args);
-    gpr_free(subchannels);
-    grpc_client_config_set_lb_policy(cfg, lb_policy);
-    GRPC_LB_POLICY_UNREF(lb_policy, "sockaddr", closure_list);
-    r->published = 1;
-    *r->target_config = cfg;
-    grpc_closure_list_add(closure_list, r->next_completion, 1);
-    r->next_completion = NULL;
-  }
 }
 
-static void sockaddr_destroy(grpc_resolver *gr,
-                             grpc_closure_list *closure_list) {
-  sockaddr_resolver *r = (sockaddr_resolver *)gr;
-  gpr_mu_destroy(&r->mu);
-  grpc_subchannel_factory_unref(r->subchannel_factory, closure_list);
-  gpr_free(r->addrs);
-  gpr_free(r->addrs_len);
-  gpr_free(r->lb_policy_name);
-  gpr_free(r);
+static void
+sockaddr_destroy (grpc_resolver * gr, grpc_closure_list * closure_list)
+{
+  sockaddr_resolver *r = (sockaddr_resolver *) gr;
+  gpr_mu_destroy (&r->mu);
+  grpc_subchannel_factory_unref (r->subchannel_factory, closure_list);
+  gpr_free (r->addrs);
+  gpr_free (r->addrs_len);
+  gpr_free (r->lb_policy_name);
+  gpr_free (r);
 }
 
 #ifdef GPR_POSIX_SOCKET
-static int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr,
-                      size_t *len) {
-  struct sockaddr_un *un = (struct sockaddr_un *)addr;
+static int
+parse_unix (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len)
+{
+  struct sockaddr_un *un = (struct sockaddr_un *) addr;
 
   un->sun_family = AF_UNIX;
-  strcpy(un->sun_path, uri->path);
-  *len = strlen(un->sun_path) + sizeof(un->sun_family) + 1;
+  strcpy (un->sun_path, uri->path);
+  *len = strlen (un->sun_path) + sizeof (un->sun_family) + 1;
 
   return 1;
 }
 
-static char *unix_get_default_authority(grpc_resolver_factory *factory,
-                                        grpc_uri *uri) {
-  return gpr_strdup("localhost");
+static char *
+unix_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri)
+{
+  return gpr_strdup ("localhost");
 }
 #endif
 
-static char *ip_get_default_authority(grpc_uri *uri) {
+static char *
+ip_get_default_authority (grpc_uri * uri)
+{
   const char *path = uri->path;
-  if (path[0] == '/') ++path;
-  return gpr_strdup(path);
+  if (path[0] == '/')
+    ++path;
+  return gpr_strdup (path);
 }
 
-static char *ipv4_get_default_authority(grpc_resolver_factory *factory,
-                                        grpc_uri *uri) {
-  return ip_get_default_authority(uri);
+static char *
+ipv4_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri)
+{
+  return ip_get_default_authority (uri);
 }
 
-static char *ipv6_get_default_authority(grpc_resolver_factory *factory,
-                                        grpc_uri *uri) {
-  return ip_get_default_authority(uri);
+static char *
+ipv6_get_default_authority (grpc_resolver_factory * factory, grpc_uri * uri)
+{
+  return ip_get_default_authority (uri);
 }
 
-static int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr,
-                      size_t *len) {
+static int
+parse_ipv4 (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len)
+{
   const char *host_port = uri->path;
   char *host;
   char *port;
   int port_num;
   int result = 0;
-  struct sockaddr_in *in = (struct sockaddr_in *)addr;
+  struct sockaddr_in *in = (struct sockaddr_in *) addr;
 
-  if (*host_port == '/') ++host_port;
-  if (!gpr_split_host_port(host_port, &host, &port)) {
-    return 0;
-  }
+  if (*host_port == '/')
+    ++host_port;
+  if (!gpr_split_host_port (host_port, &host, &port))
+    {
+      return 0;
+    }
 
-  memset(in, 0, sizeof(*in));
-  *len = sizeof(*in);
+  memset (in, 0, sizeof (*in));
+  *len = sizeof (*in);
   in->sin_family = AF_INET;
-  if (inet_pton(AF_INET, host, &in->sin_addr) == 0) {
-    gpr_log(GPR_ERROR, "invalid ipv4 address: '%s'", host);
-    goto done;
-  }
+  if (inet_pton (AF_INET, host, &in->sin_addr) == 0)
+    {
+      gpr_log (GPR_ERROR, "invalid ipv4 address: '%s'", host);
+      goto done;
+    }
 
-  if (port != NULL) {
-    if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 ||
-        port_num > 65535) {
-      gpr_log(GPR_ERROR, "invalid ipv4 port: '%s'", port);
+  if (port != NULL)
+    {
+      if (sscanf (port, "%d", &port_num) != 1 || port_num < 0 || port_num > 65535)
+	{
+	  gpr_log (GPR_ERROR, "invalid ipv4 port: '%s'", port);
+	  goto done;
+	}
+      in->sin_port = htons ((gpr_uint16) port_num);
+    }
+  else
+    {
+      gpr_log (GPR_ERROR, "no port given for ipv4 scheme");
       goto done;
     }
-    in->sin_port = htons((gpr_uint16)port_num);
-  } else {
-    gpr_log(GPR_ERROR, "no port given for ipv4 scheme");
-    goto done;
-  }
 
   result = 1;
 done:
-  gpr_free(host);
-  gpr_free(port);
+  gpr_free (host);
+  gpr_free (port);
   return result;
 }
 
-static int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr,
-                      size_t *len) {
+static int
+parse_ipv6 (grpc_uri * uri, struct sockaddr_storage *addr, size_t * len)
+{
   const char *host_port = uri->path;
   char *host;
   char *port;
   int port_num;
   int result = 0;
-  struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
+  struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) addr;
 
-  if (*host_port == '/') ++host_port;
-  if (!gpr_split_host_port(host_port, &host, &port)) {
-    return 0;
-  }
+  if (*host_port == '/')
+    ++host_port;
+  if (!gpr_split_host_port (host_port, &host, &port))
+    {
+      return 0;
+    }
 
-  memset(in6, 0, sizeof(*in6));
-  *len = sizeof(*in6);
+  memset (in6, 0, sizeof (*in6));
+  *len = sizeof (*in6);
   in6->sin6_family = AF_INET6;
-  if (inet_pton(AF_INET6, host, &in6->sin6_addr) == 0) {
-    gpr_log(GPR_ERROR, "invalid ipv6 address: '%s'", host);
-    goto done;
-  }
+  if (inet_pton (AF_INET6, host, &in6->sin6_addr) == 0)
+    {
+      gpr_log (GPR_ERROR, "invalid ipv6 address: '%s'", host);
+      goto done;
+    }
 
-  if (port != NULL) {
-    if (sscanf(port, "%d", &port_num) != 1 || port_num < 0 ||
-        port_num > 65535) {
-      gpr_log(GPR_ERROR, "invalid ipv6 port: '%s'", port);
+  if (port != NULL)
+    {
+      if (sscanf (port, "%d", &port_num) != 1 || port_num < 0 || port_num > 65535)
+	{
+	  gpr_log (GPR_ERROR, "invalid ipv6 port: '%s'", port);
+	  goto done;
+	}
+      in6->sin6_port = htons ((gpr_uint16) port_num);
+    }
+  else
+    {
+      gpr_log (GPR_ERROR, "no port given for ipv6 scheme");
       goto done;
     }
-    in6->sin6_port = htons((gpr_uint16)port_num);
-  } else {
-    gpr_log(GPR_ERROR, "no port given for ipv6 scheme");
-    goto done;
-  }
 
   result = 1;
 done:
-  gpr_free(host);
-  gpr_free(port);
+  gpr_free (host);
+  gpr_free (port);
   return result;
 }
 
-static void do_nothing(void *ignored) {}
-static grpc_resolver *sockaddr_create(
-    grpc_resolver_args *args, const char *default_lb_policy_name,
-    int parse(grpc_uri *uri, struct sockaddr_storage *dst, size_t *len)) {
+static void
+do_nothing (void *ignored)
+{
+}
+
+static grpc_resolver *
+sockaddr_create (grpc_resolver_args * args, const char *default_lb_policy_name, int parse (grpc_uri * uri, struct sockaddr_storage *dst, size_t * len))
+{
   size_t i;
-  int errors_found = 0; /* GPR_FALSE */
+  int errors_found = 0;		/* GPR_FALSE */
   sockaddr_resolver *r;
   gpr_slice path_slice;
   gpr_slice_buffer path_parts;
 
-  if (0 != strcmp(args->uri->authority, "")) {
-    gpr_log(GPR_ERROR, "authority based uri's not supported by the %s scheme",
-            args->uri->scheme);
-    return NULL;
-  }
+  if (0 != strcmp (args->uri->authority, ""))
+    {
+      gpr_log (GPR_ERROR, "authority based uri's not supported by the %s scheme", args->uri->scheme);
+      return NULL;
+    }
 
-  r = gpr_malloc(sizeof(sockaddr_resolver));
-  memset(r, 0, sizeof(*r));
+  r = gpr_malloc (sizeof (sockaddr_resolver));
+  memset (r, 0, sizeof (*r));
 
   r->lb_policy_name = NULL;
-  if (0 != strcmp(args->uri->query, "")) {
-    gpr_slice query_slice;
-    gpr_slice_buffer query_parts;
-
-    query_slice =
-        gpr_slice_new(args->uri->query, strlen(args->uri->query), do_nothing);
-    gpr_slice_buffer_init(&query_parts);
-    gpr_slice_split(query_slice, "=", &query_parts);
-    GPR_ASSERT(query_parts.count == 2);
-    if (0 == gpr_slice_str_cmp(query_parts.slices[0], "lb_policy")) {
-      r->lb_policy_name = gpr_dump_slice(query_parts.slices[1], GPR_DUMP_ASCII);
+  if (0 != strcmp (args->uri->query, ""))
+    {
+      gpr_slice query_slice;
+      gpr_slice_buffer query_parts;
+
+      query_slice = gpr_slice_new (args->uri->query, strlen (args->uri->query), do_nothing);
+      gpr_slice_buffer_init (&query_parts);
+      gpr_slice_split (query_slice, "=", &query_parts);
+      GPR_ASSERT (query_parts.count == 2);
+      if (0 == gpr_slice_str_cmp (query_parts.slices[0], "lb_policy"))
+	{
+	  r->lb_policy_name = gpr_dump_slice (query_parts.slices[1], GPR_DUMP_ASCII);
+	}
+      gpr_slice_buffer_destroy (&query_parts);
+      gpr_slice_unref (query_slice);
+    }
+  if (r->lb_policy_name == NULL)
+    {
+      r->lb_policy_name = gpr_strdup (default_lb_policy_name);
     }
-    gpr_slice_buffer_destroy(&query_parts);
-    gpr_slice_unref(query_slice);
-  }
-  if (r->lb_policy_name == NULL) {
-    r->lb_policy_name = gpr_strdup(default_lb_policy_name);
-  }
 
-  path_slice =
-      gpr_slice_new(args->uri->path, strlen(args->uri->path), do_nothing);
-  gpr_slice_buffer_init(&path_parts);
+  path_slice = gpr_slice_new (args->uri->path, strlen (args->uri->path), do_nothing);
+  gpr_slice_buffer_init (&path_parts);
 
-  gpr_slice_split(path_slice, ",", &path_parts);
+  gpr_slice_split (path_slice, ",", &path_parts);
   r->num_addrs = path_parts.count;
-  r->addrs = gpr_malloc(sizeof(struct sockaddr_storage) * r->num_addrs);
-  r->addrs_len = gpr_malloc(sizeof(*r->addrs_len) * r->num_addrs);
-
-  for (i = 0; i < r->num_addrs; i++) {
-    grpc_uri ith_uri = *args->uri;
-    char *part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII);
-    ith_uri.path = part_str;
-    if (!parse(&ith_uri, &r->addrs[i], &r->addrs_len[i])) {
-      errors_found = 1; /* GPR_TRUE */
+  r->addrs = gpr_malloc (sizeof (struct sockaddr_storage) * r->num_addrs);
+  r->addrs_len = gpr_malloc (sizeof (*r->addrs_len) * r->num_addrs);
+
+  for (i = 0; i < r->num_addrs; i++)
+    {
+      grpc_uri ith_uri = *args->uri;
+      char *part_str = gpr_dump_slice (path_parts.slices[i], GPR_DUMP_ASCII);
+      ith_uri.path = part_str;
+      if (!parse (&ith_uri, &r->addrs[i], &r->addrs_len[i]))
+	{
+	  errors_found = 1;	/* GPR_TRUE */
+	}
+      gpr_free (part_str);
+      if (errors_found)
+	break;
     }
-    gpr_free(part_str);
-    if (errors_found) break;
-  }
 
-  gpr_slice_buffer_destroy(&path_parts);
-  gpr_slice_unref(path_slice);
-  if (errors_found) {
-    gpr_free(r);
-    return NULL;
-  }
+  gpr_slice_buffer_destroy (&path_parts);
+  gpr_slice_unref (path_slice);
+  if (errors_found)
+    {
+      gpr_free (r);
+      return NULL;
+    }
 
-  gpr_ref_init(&r->refs, 1);
-  gpr_mu_init(&r->mu);
-  grpc_resolver_init(&r->base, &sockaddr_resolver_vtable);
+  gpr_ref_init (&r->refs, 1);
+  gpr_mu_init (&r->mu);
+  grpc_resolver_init (&r->base, &sockaddr_resolver_vtable);
   r->subchannel_factory = args->subchannel_factory;
-  grpc_subchannel_factory_ref(r->subchannel_factory);
+  grpc_subchannel_factory_ref (r->subchannel_factory);
 
   return &r->base;
 }
@@ -363,9 +393,15 @@ static grpc_resolver *sockaddr_create(
  * FACTORY
  */
 
-static void sockaddr_factory_ref(grpc_resolver_factory *factory) {}
+static void
+sockaddr_factory_ref (grpc_resolver_factory * factory)
+{
+}
 
-static void sockaddr_factory_unref(grpc_resolver_factory *factory) {}
+static void
+sockaddr_factory_unref (grpc_resolver_factory * factory)
+{
+}
 
 #define DECL_FACTORY(name)                                                  \
   static grpc_resolver *name##_factory_create_resolver(                     \
@@ -382,7 +418,6 @@ static void sockaddr_factory_unref(grpc_resolver_factory *factory) {}
   }
 
 #ifdef GPR_POSIX_SOCKET
-DECL_FACTORY(unix)
+DECL_FACTORY (unix)
 #endif
-DECL_FACTORY(ipv4)
-DECL_FACTORY(ipv6)
+  DECL_FACTORY (ipv4) DECL_FACTORY (ipv6)
diff --git a/src/core/client_config/resolvers/sockaddr_resolver.h b/src/core/client_config/resolvers/sockaddr_resolver.h
index 1b7a18f9c2..c778812e49 100644
--- a/src/core/client_config/resolvers/sockaddr_resolver.h
+++ b/src/core/client_config/resolvers/sockaddr_resolver.h
@@ -38,13 +38,13 @@
 
 #include "src/core/client_config/resolver_factory.h"
 
-grpc_resolver_factory *grpc_ipv4_resolver_factory_create(void);
+grpc_resolver_factory *grpc_ipv4_resolver_factory_create (void);
 
-grpc_resolver_factory *grpc_ipv6_resolver_factory_create(void);
+grpc_resolver_factory *grpc_ipv6_resolver_factory_create (void);
 
 #ifdef GPR_POSIX_SOCKET
 /** Create a unix resolver factory */
-grpc_resolver_factory *grpc_unix_resolver_factory_create(void);
+grpc_resolver_factory *grpc_unix_resolver_factory_create (void);
 #endif
 
 #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_UNIX_RESOLVER_H */
diff --git a/src/core/client_config/resolvers/zookeeper_resolver.c b/src/core/client_config/resolvers/zookeeper_resolver.c
index db2bf7552f..3e2040c412 100644
--- a/src/core/client_config/resolvers/zookeeper_resolver.c
+++ b/src/core/client_config/resolvers/zookeeper_resolver.c
@@ -50,7 +50,8 @@
 /** Zookeeper session expiration time in milliseconds */
 #define GRPC_ZOOKEEPER_SESSION_TIMEOUT 15000
 
-typedef struct {
+typedef struct
+{
   /** base class: must be first */
   grpc_resolver base;
   /** refcount */
@@ -87,101 +88,119 @@ typedef struct {
   int resolved_num;
 } zookeeper_resolver;
 
-static void zookeeper_destroy(grpc_resolver *r);
+static void zookeeper_destroy (grpc_resolver * r);
 
-static void zookeeper_start_resolving_locked(zookeeper_resolver *r);
-static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r)
-    GRPC_MUST_USE_RESULT;
+static void zookeeper_start_resolving_locked (zookeeper_resolver * r);
+static grpc_closure *
+zookeeper_maybe_finish_next_locked (zookeeper_resolver * r)
+  GRPC_MUST_USE_RESULT;
 
-static void zookeeper_shutdown(grpc_resolver *r);
-static void zookeeper_channel_saw_error(grpc_resolver *r,
-                                        struct sockaddr *failing_address,
-                                        int failing_address_len);
-static void zookeeper_next(grpc_resolver *r, grpc_client_config **target_config,
-                           grpc_closure *on_complete);
+     static void zookeeper_shutdown (grpc_resolver * r);
+     static void zookeeper_channel_saw_error (grpc_resolver * r, struct sockaddr *failing_address, int failing_address_len);
+     static void zookeeper_next (grpc_resolver * r, grpc_client_config ** target_config, grpc_closure * on_complete);
 
-static const grpc_resolver_vtable zookeeper_resolver_vtable = {
-    zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error,
-    zookeeper_next};
+     static const grpc_resolver_vtable zookeeper_resolver_vtable = {
+       zookeeper_destroy, zookeeper_shutdown, zookeeper_channel_saw_error,
+       zookeeper_next
+     };
 
-static void zookeeper_shutdown(grpc_resolver *resolver) {
-  zookeeper_resolver *r = (zookeeper_resolver *)resolver;
+static void
+zookeeper_shutdown (grpc_resolver * resolver)
+{
+  zookeeper_resolver *r = (zookeeper_resolver *) resolver;
   grpc_closure *call = NULL;
-  gpr_mu_lock(&r->mu);
-  if (r->next_completion != NULL) {
-    *r->target_config = NULL;
-    call = r->next_completion;
-    r->next_completion = NULL;
-  }
-  zookeeper_close(r->zookeeper_handle);
-  gpr_mu_unlock(&r->mu);
-  if (call != NULL) {
-    call->cb(call->cb_arg, 1);
-  }
+  gpr_mu_lock (&r->mu);
+  if (r->next_completion != NULL)
+    {
+      *r->target_config = NULL;
+      call = r->next_completion;
+      r->next_completion = NULL;
+    }
+  zookeeper_close (r->zookeeper_handle);
+  gpr_mu_unlock (&r->mu);
+  if (call != NULL)
+    {
+      call->cb (call->cb_arg, 1);
+    }
 }
 
-static void zookeeper_channel_saw_error(grpc_resolver *resolver,
-                                        struct sockaddr *sa, int len) {
-  zookeeper_resolver *r = (zookeeper_resolver *)resolver;
-  gpr_mu_lock(&r->mu);
-  if (r->resolving == 0) {
-    zookeeper_start_resolving_locked(r);
-  }
-  gpr_mu_unlock(&r->mu);
+static void
+zookeeper_channel_saw_error (grpc_resolver * resolver, struct sockaddr *sa, int len)
+{
+  zookeeper_resolver *r = (zookeeper_resolver *) resolver;
+  gpr_mu_lock (&r->mu);
+  if (r->resolving == 0)
+    {
+      zookeeper_start_resolving_locked (r);
+    }
+  gpr_mu_unlock (&r->mu);
 }
 
-static void zookeeper_next(grpc_resolver *resolver,
-                           grpc_client_config **target_config,
-                           grpc_closure *on_complete) {
-  zookeeper_resolver *r = (zookeeper_resolver *)resolver;
+static void
+zookeeper_next (grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete)
+{
+  zookeeper_resolver *r = (zookeeper_resolver *) resolver;
   grpc_closure *call;
-  gpr_mu_lock(&r->mu);
-  GPR_ASSERT(r->next_completion == NULL);
+  gpr_mu_lock (&r->mu);
+  GPR_ASSERT (r->next_completion == NULL);
   r->next_completion = on_complete;
   r->target_config = target_config;
-  if (r->resolved_version == 0 && r->resolving == 0) {
-    zookeeper_start_resolving_locked(r);
-  } else {
-    call = zookeeper_maybe_finish_next_locked(r);
-  }
-  gpr_mu_unlock(&r->mu);
-  if (call) call->cb(call->cb_arg, 1);
+  if (r->resolved_version == 0 && r->resolving == 0)
+    {
+      zookeeper_start_resolving_locked (r);
+    }
+  else
+    {
+      call = zookeeper_maybe_finish_next_locked (r);
+    }
+  gpr_mu_unlock (&r->mu);
+  if (call)
+    call->cb (call->cb_arg, 1);
 }
 
 /** Zookeeper global watcher for connection management
     TODO: better connection management besides logs */
-static void zookeeper_global_watcher(zhandle_t *zookeeper_handle, int type,
-                                     int state, const char *path,
-                                     void *watcher_ctx) {
-  if (type == ZOO_SESSION_EVENT) {
-    if (state == ZOO_EXPIRED_SESSION_STATE) {
-      gpr_log(GPR_ERROR, "Zookeeper session expired");
-    } else if (state == ZOO_AUTH_FAILED_STATE) {
-      gpr_log(GPR_ERROR, "Zookeeper authentication failed");
+static void
+zookeeper_global_watcher (zhandle_t * zookeeper_handle, int type, int state, const char *path, void *watcher_ctx)
+{
+  if (type == ZOO_SESSION_EVENT)
+    {
+      if (state == ZOO_EXPIRED_SESSION_STATE)
+	{
+	  gpr_log (GPR_ERROR, "Zookeeper session expired");
+	}
+      else if (state == ZOO_AUTH_FAILED_STATE)
+	{
+	  gpr_log (GPR_ERROR, "Zookeeper authentication failed");
+	}
     }
-  }
 }
 
 /** Zookeeper watcher triggered by changes to watched nodes
     Once triggered, it tries to resolve again to get updated addresses */
-static void zookeeper_watcher(zhandle_t *zookeeper_handle, int type, int state,
-                              const char *path, void *watcher_ctx) {
-  if (watcher_ctx != NULL) {
-    zookeeper_resolver *r = (zookeeper_resolver *)watcher_ctx;
-    if (state == ZOO_CONNECTED_STATE) {
-      gpr_mu_lock(&r->mu);
-      if (r->resolving == 0) {
-        zookeeper_start_resolving_locked(r);
-      }
-      gpr_mu_unlock(&r->mu);
+static void
+zookeeper_watcher (zhandle_t * zookeeper_handle, int type, int state, const char *path, void *watcher_ctx)
+{
+  if (watcher_ctx != NULL)
+    {
+      zookeeper_resolver *r = (zookeeper_resolver *) watcher_ctx;
+      if (state == ZOO_CONNECTED_STATE)
+	{
+	  gpr_mu_lock (&r->mu);
+	  if (r->resolving == 0)
+	    {
+	      zookeeper_start_resolving_locked (r);
+	    }
+	  gpr_mu_unlock (&r->mu);
+	}
     }
-  }
 }
 
 /** Callback function after getting all resolved addresses
     Creates a subchannel for each address */
-static void zookeeper_on_resolved(void *arg,
-                                  grpc_resolved_addresses *addresses) {
+static void
+zookeeper_on_resolved (void *arg, grpc_resolved_addresses * addresses)
+{
   zookeeper_resolver *r = arg;
   grpc_client_config *config = NULL;
   grpc_subchannel **subchannels;
@@ -189,74 +208,77 @@ static void zookeeper_on_resolved(void *arg,
   grpc_lb_policy *lb_policy;
   grpc_closure *call;
   size_t i;
-  if (addresses != NULL) {
-    grpc_lb_policy_args lb_policy_args;
-    config = grpc_client_config_create();
-    subchannels = gpr_malloc(sizeof(grpc_subchannel *) * addresses->naddrs);
-    for (i = 0; i < addresses->naddrs; i++) {
-      memset(&args, 0, sizeof(args));
-      args.addr = (struct sockaddr *)(addresses->addrs[i].addr);
-      args.addr_len = addresses->addrs[i].len;
-      subchannels[i] = grpc_subchannel_factory_create_subchannel(
-          r->subchannel_factory, &args);
+  if (addresses != NULL)
+    {
+      grpc_lb_policy_args lb_policy_args;
+      config = grpc_client_config_create ();
+      subchannels = gpr_malloc (sizeof (grpc_subchannel *) * addresses->naddrs);
+      for (i = 0; i < addresses->naddrs; i++)
+	{
+	  memset (&args, 0, sizeof (args));
+	  args.addr = (struct sockaddr *) (addresses->addrs[i].addr);
+	  args.addr_len = addresses->addrs[i].len;
+	  subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args);
+	}
+      lb_policy_args.subchannels = subchannels;
+      lb_policy_args.num_subchannels = addresses->naddrs;
+      lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args);
+      grpc_client_config_set_lb_policy (config, lb_policy);
+      GRPC_LB_POLICY_UNREF (lb_policy, "construction");
+      grpc_resolved_addresses_destroy (addresses);
+      gpr_free (subchannels);
     }
-    lb_policy_args.subchannels = subchannels;
-    lb_policy_args.num_subchannels = addresses->naddrs;
-    lb_policy = grpc_lb_policy_create(r->lb_policy_name, &lb_policy_args);
-    grpc_client_config_set_lb_policy(config, lb_policy);
-    GRPC_LB_POLICY_UNREF(lb_policy, "construction");
-    grpc_resolved_addresses_destroy(addresses);
-    gpr_free(subchannels);
-  }
-  gpr_mu_lock(&r->mu);
-  GPR_ASSERT(r->resolving == 1);
+  gpr_mu_lock (&r->mu);
+  GPR_ASSERT (r->resolving == 1);
   r->resolving = 0;
-  if (r->resolved_config != NULL) {
-    grpc_client_config_unref(r->resolved_config);
-  }
+  if (r->resolved_config != NULL)
+    {
+      grpc_client_config_unref (r->resolved_config);
+    }
   r->resolved_config = config;
   r->resolved_version++;
-  call = zookeeper_maybe_finish_next_locked(r);
-  gpr_mu_unlock(&r->mu);
+  call = zookeeper_maybe_finish_next_locked (r);
+  gpr_mu_unlock (&r->mu);
 
-  if (call) call->cb(call->cb_arg, 1);
+  if (call)
+    call->cb (call->cb_arg, 1);
 
-  GRPC_RESOLVER_UNREF(&r->base, "zookeeper-resolving");
+  GRPC_RESOLVER_UNREF (&r->base, "zookeeper-resolving");
 }
 
 /** Callback function for each DNS resolved address */
-static void zookeeper_dns_resolved(void *arg,
-                                   grpc_resolved_addresses *addresses) {
+static void
+zookeeper_dns_resolved (void *arg, grpc_resolved_addresses * addresses)
+{
   size_t i;
   zookeeper_resolver *r = arg;
   int resolve_done = 0;
 
-  gpr_mu_lock(&r->mu);
+  gpr_mu_lock (&r->mu);
   r->resolved_num++;
-  r->resolved_addrs->addrs =
-      gpr_realloc(r->resolved_addrs->addrs,
-                  sizeof(grpc_resolved_address) *
-                      (r->resolved_addrs->naddrs + addresses->naddrs));
-  for (i = 0; i < addresses->naddrs; i++) {
-    memcpy(r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].addr,
-           addresses->addrs[i].addr, addresses->addrs[i].len);
-    r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].len =
-        addresses->addrs[i].len;
-  }
+  r->resolved_addrs->addrs = gpr_realloc (r->resolved_addrs->addrs, sizeof (grpc_resolved_address) * (r->resolved_addrs->naddrs + addresses->naddrs));
+  for (i = 0; i < addresses->naddrs; i++)
+    {
+      memcpy (r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].addr, addresses->addrs[i].addr, addresses->addrs[i].len);
+      r->resolved_addrs->addrs[i + r->resolved_addrs->naddrs].len = addresses->addrs[i].len;
+    }
 
   r->resolved_addrs->naddrs += addresses->naddrs;
-  grpc_resolved_addresses_destroy(addresses);
+  grpc_resolved_addresses_destroy (addresses);
 
   /** Wait for all addresses to be resolved */
   resolve_done = (r->resolved_num == r->resolved_total);
-  gpr_mu_unlock(&r->mu);
-  if (resolve_done) {
-    zookeeper_on_resolved(r, r->resolved_addrs);
-  }
+  gpr_mu_unlock (&r->mu);
+  if (resolve_done)
+    {
+      zookeeper_on_resolved (r, r->resolved_addrs);
+    }
 }
 
 /** Parses JSON format address of a zookeeper node */
-static char *zookeeper_parse_address(const char *value, size_t value_len) {
+static char *
+zookeeper_parse_address (const char *value, size_t value_len)
+{
   grpc_json *json;
   grpc_json *cur;
   const char *host;
@@ -264,255 +286,301 @@ static char *zookeeper_parse_address(const char *value, size_t value_len) {
   char *buffer;
   char *address = NULL;
 
-  buffer = gpr_malloc(value_len);
-  memcpy(buffer, value, value_len);
-  json = grpc_json_parse_string_with_len(buffer, value_len);
-  if (json != NULL) {
-    host = NULL;
-    port = NULL;
-    for (cur = json->child; cur != NULL; cur = cur->next) {
-      if (!strcmp(cur->key, "host")) {
-        host = cur->value;
-        if (port != NULL) {
-          break;
-        }
-      } else if (!strcmp(cur->key, "port")) {
-        port = cur->value;
-        if (host != NULL) {
-          break;
-        }
-      }
-    }
-    if (host != NULL && port != NULL) {
-      gpr_asprintf(&address, "%s:%s", host, port);
+  buffer = gpr_malloc (value_len);
+  memcpy (buffer, value, value_len);
+  json = grpc_json_parse_string_with_len (buffer, value_len);
+  if (json != NULL)
+    {
+      host = NULL;
+      port = NULL;
+      for (cur = json->child; cur != NULL; cur = cur->next)
+	{
+	  if (!strcmp (cur->key, "host"))
+	    {
+	      host = cur->value;
+	      if (port != NULL)
+		{
+		  break;
+		}
+	    }
+	  else if (!strcmp (cur->key, "port"))
+	    {
+	      port = cur->value;
+	      if (host != NULL)
+		{
+		  break;
+		}
+	    }
+	}
+      if (host != NULL && port != NULL)
+	{
+	  gpr_asprintf (&address, "%s:%s", host, port);
+	}
+      grpc_json_destroy (json);
     }
-    grpc_json_destroy(json);
-  }
-  gpr_free(buffer);
+  gpr_free (buffer);
 
   return address;
 }
 
-static void zookeeper_get_children_node_completion(int rc, const char *value,
-                                                   int value_len,
-                                                   const struct Stat *stat,
-                                                   const void *arg) {
+static void
+zookeeper_get_children_node_completion (int rc, const char *value, int value_len, const struct Stat *stat, const void *arg)
+{
   char *address = NULL;
-  zookeeper_resolver *r = (zookeeper_resolver *)arg;
+  zookeeper_resolver *r = (zookeeper_resolver *) arg;
   int resolve_done = 0;
 
-  if (rc != 0) {
-    gpr_log(GPR_ERROR, "Error in getting a child node of %s", r->name);
-    return;
-  }
+  if (rc != 0)
+    {
+      gpr_log (GPR_ERROR, "Error in getting a child node of %s", r->name);
+      return;
+    }
 
-  address = zookeeper_parse_address(value, (size_t)value_len);
-  if (address != NULL) {
+  address = zookeeper_parse_address (value, (size_t) value_len);
+  if (address != NULL)
+    {
     /** Further resolves address by DNS */
-    grpc_resolve_address(address, NULL, zookeeper_dns_resolved, r);
-    gpr_free(address);
-  } else {
-    gpr_log(GPR_ERROR, "Error in resolving a child node of %s", r->name);
-    gpr_mu_lock(&r->mu);
-    r->resolved_total--;
-    resolve_done = (r->resolved_num == r->resolved_total);
-    gpr_mu_unlock(&r->mu);
-    if (resolve_done) {
-      zookeeper_on_resolved(r, r->resolved_addrs);
+      grpc_resolve_address (address, NULL, zookeeper_dns_resolved, r);
+      gpr_free (address);
+    }
+  else
+    {
+      gpr_log (GPR_ERROR, "Error in resolving a child node of %s", r->name);
+      gpr_mu_lock (&r->mu);
+      r->resolved_total--;
+      resolve_done = (r->resolved_num == r->resolved_total);
+      gpr_mu_unlock (&r->mu);
+      if (resolve_done)
+	{
+	  zookeeper_on_resolved (r, r->resolved_addrs);
+	}
     }
-  }
 }
 
-static void zookeeper_get_children_completion(
-    int rc, const struct String_vector *children, const void *arg) {
+static void
+zookeeper_get_children_completion (int rc, const struct String_vector *children, const void *arg)
+{
   char *path;
   int status;
   int i;
-  zookeeper_resolver *r = (zookeeper_resolver *)arg;
+  zookeeper_resolver *r = (zookeeper_resolver *) arg;
 
-  if (rc != 0) {
-    gpr_log(GPR_ERROR, "Error in getting zookeeper children of %s", r->name);
-    return;
-  }
+  if (rc != 0)
+    {
+      gpr_log (GPR_ERROR, "Error in getting zookeeper children of %s", r->name);
+      return;
+    }
 
-  if (children->count == 0) {
-    gpr_log(GPR_ERROR, "Error in resolving zookeeper address %s", r->name);
-    return;
-  }
+  if (children->count == 0)
+    {
+      gpr_log (GPR_ERROR, "Error in resolving zookeeper address %s", r->name);
+      return;
+    }
 
-  r->resolved_addrs = gpr_malloc(sizeof(grpc_resolved_addresses));
+  r->resolved_addrs = gpr_malloc (sizeof (grpc_resolved_addresses));
   r->resolved_addrs->addrs = NULL;
   r->resolved_addrs->naddrs = 0;
   r->resolved_total = children->count;
 
   /** TODO: Replace expensive heap allocation with stack
       if we can get maximum length of zookeeper path */
-  for (i = 0; i < children->count; i++) {
-    gpr_asprintf(&path, "%s/%s", r->name, children->data[i]);
-    status = zoo_awget(r->zookeeper_handle, path, zookeeper_watcher, r,
-                       zookeeper_get_children_node_completion, r);
-    gpr_free(path);
-    if (status != 0) {
-      gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", path);
+  for (i = 0; i < children->count; i++)
+    {
+      gpr_asprintf (&path, "%s/%s", r->name, children->data[i]);
+      status = zoo_awget (r->zookeeper_handle, path, zookeeper_watcher, r, zookeeper_get_children_node_completion, r);
+      gpr_free (path);
+      if (status != 0)
+	{
+	  gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", path);
+	}
     }
-  }
 }
 
-static void zookeeper_get_node_completion(int rc, const char *value,
-                                          int value_len,
-                                          const struct Stat *stat,
-                                          const void *arg) {
+static void
+zookeeper_get_node_completion (int rc, const char *value, int value_len, const struct Stat *stat, const void *arg)
+{
   int status;
   char *address = NULL;
-  zookeeper_resolver *r = (zookeeper_resolver *)arg;
+  zookeeper_resolver *r = (zookeeper_resolver *) arg;
   r->resolved_addrs = NULL;
   r->resolved_total = 0;
   r->resolved_num = 0;
 
-  if (rc != 0) {
-    gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", r->name);
-    return;
-  }
+  if (rc != 0)
+    {
+      gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", r->name);
+      return;
+    }
 
   /** If zookeeper node of path r->name does not have address
       (i.e. service node), get its children */
-  address = zookeeper_parse_address(value, (size_t)value_len);
-  if (address != NULL) {
-    r->resolved_addrs = gpr_malloc(sizeof(grpc_resolved_addresses));
-    r->resolved_addrs->addrs = NULL;
-    r->resolved_addrs->naddrs = 0;
-    r->resolved_total = 1;
+  address = zookeeper_parse_address (value, (size_t) value_len);
+  if (address != NULL)
+    {
+      r->resolved_addrs = gpr_malloc (sizeof (grpc_resolved_addresses));
+      r->resolved_addrs->addrs = NULL;
+      r->resolved_addrs->naddrs = 0;
+      r->resolved_total = 1;
     /** Further resolves address by DNS */
-    grpc_resolve_address(address, NULL, zookeeper_dns_resolved, r);
-    gpr_free(address);
-    return;
-  }
-
-  status = zoo_awget_children(r->zookeeper_handle, r->name, zookeeper_watcher,
-                              r, zookeeper_get_children_completion, r);
-  if (status != 0) {
-    gpr_log(GPR_ERROR, "Error in getting zookeeper children of %s", r->name);
-  }
+      grpc_resolve_address (address, NULL, zookeeper_dns_resolved, r);
+      gpr_free (address);
+      return;
+    }
+
+  status = zoo_awget_children (r->zookeeper_handle, r->name, zookeeper_watcher, r, zookeeper_get_children_completion, r);
+  if (status != 0)
+    {
+      gpr_log (GPR_ERROR, "Error in getting zookeeper children of %s", r->name);
+    }
 }
 
-static void zookeeper_resolve_address(zookeeper_resolver *r) {
+static void
+zookeeper_resolve_address (zookeeper_resolver * r)
+{
   int status;
-  status = zoo_awget(r->zookeeper_handle, r->name, zookeeper_watcher, r,
-                     zookeeper_get_node_completion, r);
-  if (status != 0) {
-    gpr_log(GPR_ERROR, "Error in getting zookeeper node %s", r->name);
-  }
+  status = zoo_awget (r->zookeeper_handle, r->name, zookeeper_watcher, r, zookeeper_get_node_completion, r);
+  if (status != 0)
+    {
+      gpr_log (GPR_ERROR, "Error in getting zookeeper node %s", r->name);
+    }
 }
 
-static void zookeeper_start_resolving_locked(zookeeper_resolver *r) {
-  GRPC_RESOLVER_REF(&r->base, "zookeeper-resolving");
-  GPR_ASSERT(r->resolving == 0);
+static void
+zookeeper_start_resolving_locked (zookeeper_resolver * r)
+{
+  GRPC_RESOLVER_REF (&r->base, "zookeeper-resolving");
+  GPR_ASSERT (r->resolving == 0);
   r->resolving = 1;
-  zookeeper_resolve_address(r);
+  zookeeper_resolve_address (r);
 }
 
-static grpc_closure *zookeeper_maybe_finish_next_locked(zookeeper_resolver *r) {
+static grpc_closure *
+zookeeper_maybe_finish_next_locked (zookeeper_resolver * r)
+{
   grpc_closure *call = NULL;
-  if (r->next_completion != NULL &&
-      r->resolved_version != r->published_version) {
-    *r->target_config = r->resolved_config;
-    if (r->resolved_config != NULL) {
-      grpc_client_config_ref(r->resolved_config);
+  if (r->next_completion != NULL && r->resolved_version != r->published_version)
+    {
+      *r->target_config = r->resolved_config;
+      if (r->resolved_config != NULL)
+	{
+	  grpc_client_config_ref (r->resolved_config);
+	}
+      call = r->next_completion;
+      r->next_completion = NULL;
+      r->published_version = r->resolved_version;
     }
-    call = r->next_completion;
-    r->next_completion = NULL;
-    r->published_version = r->resolved_version;
-  }
   return call;
 }
 
-static void zookeeper_destroy(grpc_resolver *gr) {
-  zookeeper_resolver *r = (zookeeper_resolver *)gr;
-  gpr_mu_destroy(&r->mu);
-  if (r->resolved_config != NULL) {
-    grpc_client_config_unref(r->resolved_config);
-  }
-  grpc_subchannel_factory_unref(r->subchannel_factory);
-  gpr_free(r->name);
-  gpr_free(r->lb_policy_name);
-  gpr_free(r);
+static void
+zookeeper_destroy (grpc_resolver * gr)
+{
+  zookeeper_resolver *r = (zookeeper_resolver *) gr;
+  gpr_mu_destroy (&r->mu);
+  if (r->resolved_config != NULL)
+    {
+      grpc_client_config_unref (r->resolved_config);
+    }
+  grpc_subchannel_factory_unref (r->subchannel_factory);
+  gpr_free (r->name);
+  gpr_free (r->lb_policy_name);
+  gpr_free (r);
 }
 
-static grpc_resolver *zookeeper_create(grpc_resolver_args *args,
-                                       const char *lb_policy_name) {
+static grpc_resolver *
+zookeeper_create (grpc_resolver_args * args, const char *lb_policy_name)
+{
   zookeeper_resolver *r;
   size_t length;
   char *path = args->uri->path;
 
-  if (0 == strcmp(args->uri->authority, "")) {
-    gpr_log(GPR_ERROR, "No authority specified in zookeeper uri");
-    return NULL;
-  }
+  if (0 == strcmp (args->uri->authority, ""))
+    {
+      gpr_log (GPR_ERROR, "No authority specified in zookeeper uri");
+      return NULL;
+    }
 
   /** Removes the trailing slash if exists */
-  length = strlen(path);
-  if (length > 1 && path[length - 1] == '/') {
-    path[length - 1] = 0;
-  }
-
-  r = gpr_malloc(sizeof(zookeeper_resolver));
-  memset(r, 0, sizeof(*r));
-  gpr_ref_init(&r->refs, 1);
-  gpr_mu_init(&r->mu);
-  grpc_resolver_init(&r->base, &zookeeper_resolver_vtable);
-  r->name = gpr_strdup(path);
+  length = strlen (path);
+  if (length > 1 && path[length - 1] == '/')
+    {
+      path[length - 1] = 0;
+    }
+
+  r = gpr_malloc (sizeof (zookeeper_resolver));
+  memset (r, 0, sizeof (*r));
+  gpr_ref_init (&r->refs, 1);
+  gpr_mu_init (&r->mu);
+  grpc_resolver_init (&r->base, &zookeeper_resolver_vtable);
+  r->name = gpr_strdup (path);
 
   r->subchannel_factory = args->subchannel_factory;
-  grpc_subchannel_factory_ref(r->subchannel_factory);
+  grpc_subchannel_factory_ref (r->subchannel_factory);
 
-  r->lb_policy_name = gpr_strdup(lb_policy_name);
+  r->lb_policy_name = gpr_strdup (lb_policy_name);
 
   /** Initializes zookeeper client */
-  zoo_set_debug_level(ZOO_LOG_LEVEL_WARN);
-  r->zookeeper_handle =
-      zookeeper_init(args->uri->authority, zookeeper_global_watcher,
-                     GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0);
-  if (r->zookeeper_handle == NULL) {
-    gpr_log(GPR_ERROR, "Unable to connect to zookeeper server");
-    return NULL;
-  }
+  zoo_set_debug_level (ZOO_LOG_LEVEL_WARN);
+  r->zookeeper_handle = zookeeper_init (args->uri->authority, zookeeper_global_watcher, GRPC_ZOOKEEPER_SESSION_TIMEOUT, 0, 0, 0);
+  if (r->zookeeper_handle == NULL)
+    {
+      gpr_log (GPR_ERROR, "Unable to connect to zookeeper server");
+      return NULL;
+    }
 
   return &r->base;
 }
 
-static void zookeeper_plugin_init() {
-  grpc_register_resolver_type(grpc_zookeeper_resolver_factory_create());
+static void
+zookeeper_plugin_init ()
+{
+  grpc_register_resolver_type (grpc_zookeeper_resolver_factory_create ());
 }
 
-void grpc_zookeeper_register() {
-  grpc_register_plugin(zookeeper_plugin_init, NULL);
+void
+grpc_zookeeper_register ()
+{
+  grpc_register_plugin (zookeeper_plugin_init, NULL);
 }
 
 /*
  * FACTORY
  */
 
-static void zookeeper_factory_ref(grpc_resolver_factory *factory) {}
+static void
+zookeeper_factory_ref (grpc_resolver_factory * factory)
+{
+}
 
-static void zookeeper_factory_unref(grpc_resolver_factory *factory) {}
+static void
+zookeeper_factory_unref (grpc_resolver_factory * factory)
+{
+}
 
-static char *zookeeper_factory_get_default_hostname(
-    grpc_resolver_factory *factory, grpc_uri *uri) {
+static char *
+zookeeper_factory_get_default_hostname (grpc_resolver_factory * factory, grpc_uri * uri)
+{
   return NULL;
 }
 
-static grpc_resolver *zookeeper_factory_create_resolver(
-    grpc_resolver_factory *factory, grpc_resolver_args *args) {
-  return zookeeper_create(args, "pick_first");
+static grpc_resolver *
+zookeeper_factory_create_resolver (grpc_resolver_factory * factory, grpc_resolver_args * args)
+{
+  return zookeeper_create (args, "pick_first");
 }
 
 static const grpc_resolver_factory_vtable zookeeper_factory_vtable = {
-    zookeeper_factory_ref, zookeeper_factory_unref,
-    zookeeper_factory_create_resolver, zookeeper_factory_get_default_hostname,
-    "zookeeper"};
+  zookeeper_factory_ref, zookeeper_factory_unref,
+  zookeeper_factory_create_resolver, zookeeper_factory_get_default_hostname,
+  "zookeeper"
+};
+
 static grpc_resolver_factory zookeeper_resolver_factory = {
-    &zookeeper_factory_vtable};
+  &zookeeper_factory_vtable
+};
 
-grpc_resolver_factory *grpc_zookeeper_resolver_factory_create() {
+grpc_resolver_factory *
+grpc_zookeeper_resolver_factory_create ()
+{
   return &zookeeper_resolver_factory;
 }
diff --git a/src/core/client_config/resolvers/zookeeper_resolver.h b/src/core/client_config/resolvers/zookeeper_resolver.h
index a6f002dd6d..86b4480b15 100644
--- a/src/core/client_config/resolvers/zookeeper_resolver.h
+++ b/src/core/client_config/resolvers/zookeeper_resolver.h
@@ -37,6 +37,6 @@
 #include "src/core/client_config/resolver_factory.h"
 
 /** Create a zookeeper resolver factory */
-grpc_resolver_factory *grpc_zookeeper_resolver_factory_create(void);
+grpc_resolver_factory *grpc_zookeeper_resolver_factory_create (void);
 
 #endif /* GRPC_INTERNAL_CORE_CLIENT_CONFIG_RESOLVERS_ZOOKEEPER_RESOLVER_H */