clang-format

src/core/ext/client_channel/client_channel.c

@@ -202,7 +202,7 @@ static void on_resolver_result_changed(grpc_exec_ctx *exec_ctx, void *arg,
         grpc_channel_args_find(lb_policy_args.args, GRPC_ARG_LB_ADDRESSES);
     if (channel_arg != NULL) {
       GPR_ASSERT(channel_arg->type == GRPC_ARG_POINTER);
-      grpc_lb_addresses* addresses = channel_arg->value.pointer.p;
+      grpc_lb_addresses *addresses = channel_arg->value.pointer.p;
       bool found_backend_address = false;
       for (size_t i = 0; i < addresses->num_addresses; ++i) {
         if (!addresses->addresses[i].is_balancer) {

src/core/ext/client_channel/lb_policy_factory.c

@@ -60,8 +60,7 @@ grpc_lb_addresses* grpc_lb_addresses_copy(const grpc_lb_addresses* addresses) {
           gpr_strdup(new_addresses->addresses[i].balancer_name);
     }
     if (new_addresses->addresses[i].user_data != NULL) {
-      new_addresses->addresses[i].user_data =
+      new_addresses->addresses[i].user_data = addresses->user_data_vtable->copy(
-          addresses->user_data_vtable->copy(
           new_addresses->addresses[i].user_data);
     }
   }
@@ -93,15 +92,15 @@ int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1,
     const grpc_lb_address* target2 = &addresses2->addresses[i];
     if (target1->address.len > target2->address.len) return 1;
     if (target1->address.len < target2->address.len) return -1;
-    int retval = memcmp(
+    int retval = memcmp(target1->address.addr, target2->address.addr,
-        target1->address.addr, target2->address.addr, target1->address.len);
+                        target1->address.len);
     if (retval != 0) return retval;
     if (target1->is_balancer > target2->is_balancer) return 1;
     if (target1->is_balancer < target2->is_balancer) return -1;
-    const char* balancer_name1 = target1->balancer_name != NULL
+    const char* balancer_name1 =
-                                     ? target1->balancer_name : "";
+        target1->balancer_name != NULL ? target1->balancer_name : "";
-    const char* balancer_name2 = target2->balancer_name != NULL
+    const char* balancer_name2 =
-                                     ? target2->balancer_name : "";
+        target2->balancer_name != NULL ? target2->balancer_name : "";
     retval = strcmp(balancer_name1, balancer_name2);
     if (retval != 0) return retval;
     if (addresses1->user_data_vtable != NULL) {
@@ -137,7 +136,7 @@ static const grpc_arg_pointer_vtable lb_addresses_arg_vtable = {
     lb_addresses_copy, lb_addresses_destroy, lb_addresses_cmp};
 
 grpc_arg grpc_lb_addresses_create_channel_arg(
-    const grpc_lb_addresses *addresses) {
+    const grpc_lb_addresses* addresses) {
   grpc_arg arg;
   arg.type = GRPC_ARG_POINTER;
   arg.key = GRPC_ARG_LB_ADDRESSES;

src/core/ext/client_channel/lb_policy_factory.h

@@ -60,9 +60,9 @@ typedef struct grpc_lb_address {
 } grpc_lb_address;
 
 typedef struct grpc_lb_user_data_vtable {
-  void* (*copy)(void*);
+  void *(*copy)(void *);
-  void (*destroy)(void*);
+  void (*destroy)(void *);
-  int (*cmp)(void*, void*);
+  int (*cmp)(void *, void *);
 } grpc_lb_user_data_vtable;
 
 typedef struct grpc_lb_addresses {
@@ -75,7 +75,7 @@ typedef struct grpc_lb_addresses {
     \a num_addresses addresses.  The \a user_data_vtable argument may be
     NULL if no user data will be added. */
 grpc_lb_addresses *grpc_lb_addresses_create(
-    size_t num_addresses, const grpc_lb_user_data_vtable* user_data_vtable);
+    size_t num_addresses, const grpc_lb_user_data_vtable *user_data_vtable);
 
 /** Creates a copy of \a addresses.  If \a user_data_copy is not NULL,
  * it will be invoked to copy the \a user_data field of each address. */

src/core/ext/client_channel/resolver.c

@@ -76,7 +76,6 @@ void grpc_resolver_channel_saw_error(grpc_exec_ctx *exec_ctx,
 }
 
 void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-                        grpc_channel_args **result,
+                        grpc_channel_args **result, grpc_closure *on_complete) {
-                        grpc_closure *on_complete) {
   resolver->vtable->next(exec_ctx, resolver, result, on_complete);
 }

src/core/ext/client_channel/resolver.h

@@ -85,7 +85,6 @@ void grpc_resolver_channel_saw_error(grpc_exec_ctx *exec_ctx,
     If resolution is fatally broken, set *result to NULL and
     schedule on_complete. */
 void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-                        grpc_channel_args **result,
+                        grpc_channel_args **result, grpc_closure *on_complete);
-                        grpc_closure *on_complete);
 
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H */

src/core/ext/client_channel/resolver_registry.h

@@ -59,7 +59,7 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory);
     return it.
     If a resolver factory was not found, return NULL. */
 grpc_resolver *grpc_resolver_create(const char *target,
-                                    const grpc_channel_args* args);
+                                    const grpc_channel_args *args);
 
 /** Find a resolver factory given a name and return an (owned-by-the-caller)
  *  reference to it */

src/core/ext/lb_policy/grpclb/grpclb.c

@@ -339,13 +339,13 @@ static bool is_server_valid(const grpc_grpclb_server *server, size_t idx,
 }
 
 /* vtable for LB tokens in grpc_lb_addresses. */
-static void* lb_token_copy(void *token) {
+static void *lb_token_copy(void *token) {
   return token == NULL ? NULL : GRPC_MDELEM_REF(token);
 }
 static void lb_token_destroy(void *token) {
   if (token != NULL) GRPC_MDELEM_UNREF(token);
 }
-static int lb_token_cmp(void* token1, void* token2) {
+static int lb_token_cmp(void *token1, void *token2) {
   if (token1 > token2) return 1;
   if (token1 < token2) return -1;
   return 0;
@@ -477,7 +477,7 @@ static grpc_lb_policy *create_rr_locked(
 
   // Replace the LB addresses in the channel args that we pass down to
   // the subchannel.
-  static const char* keys_to_remove[] = {GRPC_ARG_LB_ADDRESSES};
+  static const char *keys_to_remove[] = {GRPC_ARG_LB_ADDRESSES};
   const grpc_arg arg =
       grpc_lb_addresses_create_channel_arg(glb_policy->addresses);
   args.args = grpc_channel_args_copy_and_add_and_remove(
@@ -582,11 +582,10 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
                                   grpc_lb_policy_factory *factory,
                                   grpc_lb_policy_args *args) {
   /* Get server name. */
-  const grpc_arg* arg =
+  const grpc_arg *arg =
       grpc_channel_args_find(args->args, GRPC_ARG_SERVER_NAME);
-  const char* server_name =
+  const char *server_name =
-      arg != NULL && arg->type == GRPC_ARG_STRING
+      arg != NULL && arg->type == GRPC_ARG_STRING ? arg->value.string : NULL;
-          ? arg->value.string : NULL;
 
   /* Count the number of gRPC-LB addresses. There must be at least one.
    * TODO(roth): For now, we ignore non-balancer addresses, but in the
@@ -597,7 +596,7 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
    * this is the right LB policy to use. */
   arg = grpc_channel_args_find(args->args, GRPC_ARG_LB_ADDRESSES);
   GPR_ASSERT(arg != NULL && arg->type == GRPC_ARG_POINTER);
-  grpc_lb_addresses* addresses = arg->value.pointer.p;
+  grpc_lb_addresses *addresses = arg->value.pointer.p;
   size_t num_grpclb_addrs = 0;
   for (size_t i = 0; i < addresses->num_addresses; ++i) {
     if (addresses->addresses[i].is_balancer) ++num_grpclb_addrs;
@@ -631,13 +630,12 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
     if (addresses->addresses[i].is_balancer) {
       if (addr_index == 0) {
         addr_strs[addr_index++] = grpc_sockaddr_to_uri(
-            (const struct sockaddr *)&addresses->addresses[i]
+            (const struct sockaddr *)&addresses->addresses[i].address.addr);
-                .address.addr);
       } else {
-        GPR_ASSERT(grpc_sockaddr_to_string(
+        GPR_ASSERT(
+            grpc_sockaddr_to_string(
                 &addr_strs[addr_index++],
-                       (const struct sockaddr *)&addresses->addresses[i]
+                (const struct sockaddr *)&addresses->addresses[i].address.addr,
-                           .address.addr,
                 true) > 0);
       }
     }
@@ -661,8 +659,8 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
    * so that it does not wind up recursively using the grpclb LB policy,
    * as per the special case logic in client_channel.c.
    */
-  static const char* keys_to_remove[] = {
+  static const char *keys_to_remove[] = {GRPC_ARG_LB_POLICY_NAME,
-      GRPC_ARG_LB_POLICY_NAME, GRPC_ARG_LB_ADDRESSES};
+                                         GRPC_ARG_LB_ADDRESSES};
   grpc_channel_args *new_args = grpc_channel_args_copy_and_remove(
       args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove));
   glb_policy->lb_channel = grpc_client_channel_factory_create_channel(

src/core/ext/lb_policy/pick_first/pick_first.c

@@ -35,8 +35,8 @@
 
 #include <grpc/support/alloc.h>
 
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/ext/client_channel/lb_policy_registry.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/connectivity_state.h"
 
 typedef struct pending_pick {
@@ -437,17 +437,16 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
   GPR_ASSERT(args->client_channel_factory != NULL);
 
   /* Get server name. */
-  const grpc_arg* arg =
+  const grpc_arg *arg =
       grpc_channel_args_find(args->args, GRPC_ARG_SERVER_NAME);
-  const char* server_name =
+  const char *server_name =
-      arg != NULL && arg->type == GRPC_ARG_STRING
+      arg != NULL && arg->type == GRPC_ARG_STRING ? arg->value.string : NULL;
-          ? arg->value.string : NULL;
 
   /* Find the number of backend addresses. We ignore balancer
    * addresses, since we don't know how to handle them. */
   arg = grpc_channel_args_find(args->args, GRPC_ARG_LB_ADDRESSES);
   GPR_ASSERT(arg != NULL && arg->type == GRPC_ARG_POINTER);
-  grpc_lb_addresses* addresses = arg->value.pointer.p;
+  grpc_lb_addresses *addresses = arg->value.pointer.p;
   size_t num_addrs = 0;
   for (size_t i = 0; i < addresses->num_addresses; i++) {
     if (!addresses->addresses[i].is_balancer) ++num_addrs;
@@ -474,8 +473,7 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
     /* server_name will be copied as part of the subchannel creation. This makes
      * the copying of server_name (a borrowed pointer) OK. */
     sc_args.server_name = server_name;
-    sc_args.addr =
+    sc_args.addr = (struct sockaddr *)(&addresses->addresses[i].address.addr);
-        (struct sockaddr *)(&addresses->addresses[i].address.addr);
     sc_args.addr_len = addresses->addresses[i].address.len;
     sc_args.args = args->args;
 

src/core/ext/lb_policy/round_robin/round_robin.c

@@ -602,17 +602,16 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
   GPR_ASSERT(args->client_channel_factory != NULL);
 
   /* Get server name. */
-  const grpc_arg* arg =
+  const grpc_arg *arg =
       grpc_channel_args_find(args->args, GRPC_ARG_SERVER_NAME);
-  const char* server_name =
+  const char *server_name =
-      arg != NULL && arg->type == GRPC_ARG_STRING
+      arg != NULL && arg->type == GRPC_ARG_STRING ? arg->value.string : NULL;
-          ? arg->value.string : NULL;
 
   /* Find the number of backend addresses. We ignore balancer
    * addresses, since we don't know how to handle them. */
   arg = grpc_channel_args_find(args->args, GRPC_ARG_LB_ADDRESSES);
   GPR_ASSERT(arg != NULL && arg->type == GRPC_ARG_POINTER);
-  grpc_lb_addresses* addresses = arg->value.pointer.p;
+  grpc_lb_addresses *addresses = arg->value.pointer.p;
   size_t num_addrs = 0;
   for (size_t i = 0; i < addresses->num_addresses; i++) {
     if (!addresses->addresses[i].is_balancer) ++num_addrs;
@@ -636,8 +635,7 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
     /* server_name will be copied as part of the subchannel creation. This makes
      * the copying of server_name (a borrowed pointer) OK. */
     sc_args.server_name = server_name;
-    sc_args.addr =
+    sc_args.addr = (struct sockaddr *)(&addresses->addresses[i].address.addr);
-        (struct sockaddr *)(&addresses->addresses[i].address.addr);
     sc_args.addr_len = addresses->addresses[i].address.len;
     sc_args.args = args->args;
 

src/core/ext/resolver/dns/native/dns_resolver.c

@@ -264,7 +264,7 @@ static grpc_resolver *dns_create(grpc_resolver_args *args,
   grpc_arg server_name_arg;
   server_name_arg.type = GRPC_ARG_STRING;
   server_name_arg.key = GRPC_ARG_SERVER_NAME;
-  server_name_arg.value.string = (char*)path;
+  server_name_arg.value.string = (char *)path;
   r->channel_args =
       grpc_channel_args_copy_and_add(args->args, &server_name_arg, 1);
   gpr_backoff_init(&r->backoff_state, BACKOFF_MULTIPLIER, BACKOFF_JITTER,

src/core/ext/resolver/sockaddr/sockaddr_resolver.c

@@ -175,8 +175,8 @@ static grpc_resolver *sockaddr_create(grpc_resolver_args *args,
   gpr_slice_buffer path_parts;
   gpr_slice_buffer_init(&path_parts);
   gpr_slice_split(path_slice, ",", &path_parts);
-  grpc_lb_addresses *addresses = grpc_lb_addresses_create(
+  grpc_lb_addresses *addresses =
-      path_parts.count, NULL /* user_data_vtable */);
+      grpc_lb_addresses_create(path_parts.count, NULL /* user_data_vtable */);
   bool errors_found = false;
   for (size_t i = 0; i < addresses->num_addresses; i++) {
     grpc_uri ith_uri = *args->uri;

src/core/ext/transport/chttp2/client/insecure/channel_create.c

@@ -195,8 +195,8 @@ static grpc_channel *client_channel_factory_create_channel(
     grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
     const char *target, grpc_client_channel_type type,
     grpc_channel_args *args) {
-  grpc_channel *channel = grpc_channel_create(exec_ctx, target, args,
+  grpc_channel *channel =
-                                              GRPC_CLIENT_CHANNEL, NULL);
+      grpc_channel_create(exec_ctx, target, args, GRPC_CLIENT_CHANNEL, NULL);
   grpc_resolver *resolver = grpc_resolver_create(target, args);
   if (!resolver) {
     GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel,
@@ -233,7 +233,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target,
   GPR_ASSERT(!reserved);
 
   grpc_client_channel_factory *factory =
-      (grpc_client_channel_factory*)&client_channel_factory;
+      (grpc_client_channel_factory *)&client_channel_factory;
   grpc_channel *channel = client_channel_factory_create_channel(
       &exec_ctx, factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
 

src/core/ext/transport/chttp2/client/secure/secure_channel_create.c

@@ -274,8 +274,8 @@ static grpc_channel *client_channel_factory_create_channel(
     const char *target, grpc_client_channel_type type,
     grpc_channel_args *args) {
   client_channel_factory *f = (client_channel_factory *)cc_factory;
-  grpc_channel *channel = grpc_channel_create(exec_ctx, target, args,
+  grpc_channel *channel =
-                                              GRPC_CLIENT_CHANNEL, NULL);
+      grpc_channel_create(exec_ctx, target, args, GRPC_CLIENT_CHANNEL, NULL);
   grpc_resolver *resolver = grpc_resolver_create(target, args);
   if (resolver != NULL) {
     grpc_client_channel_finish_initialization(

src/core/lib/channel/channel_args.c

@@ -71,13 +71,13 @@ grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src,
 }
 
 grpc_channel_args *grpc_channel_args_copy_and_remove(
-    const grpc_channel_args *src, const char** to_remove,
+    const grpc_channel_args *src, const char **to_remove,
     size_t num_to_remove) {
   return grpc_channel_args_copy_and_add_and_remove(src, to_remove,
                                                    num_to_remove, NULL, 0);
 }
 
-static bool should_remove_arg(const grpc_arg* arg, const char** to_remove,
+static bool should_remove_arg(const grpc_arg *arg, const char **to_remove,
                               size_t num_to_remove) {
   for (size_t i = 0; i < num_to_remove; ++i) {
     if (strcmp(arg->key, to_remove[i]) == 0) return true;
@@ -86,7 +86,7 @@ static bool should_remove_arg(const grpc_arg* arg, const char** to_remove,
 }
 
 grpc_channel_args *grpc_channel_args_copy_and_add_and_remove(
-    const grpc_channel_args *src, const char** to_remove, size_t num_to_remove,
+    const grpc_channel_args *src, const char **to_remove, size_t num_to_remove,
     const grpc_arg *to_add, size_t num_to_add) {
   // Figure out how many args we'll be copying.
   size_t num_args_to_copy = 0;

src/core/lib/channel/channel_args.h

@@ -54,12 +54,12 @@ grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src,
 /** Copies the arguments in \a src except for those whose keys are in
     \a to_remove. */
 grpc_channel_args *grpc_channel_args_copy_and_remove(
-    const grpc_channel_args *src, const char** to_remove, size_t num_to_remove);
+    const grpc_channel_args *src, const char **to_remove, size_t num_to_remove);
 
 /** Copies the arguments from \a src except for those whose keys are in
     \a to_remove and appends the arguments in \a to_add. */
 grpc_channel_args *grpc_channel_args_copy_and_add_and_remove(
-    const grpc_channel_args *src, const char** to_remove, size_t num_to_remove,
+    const grpc_channel_args *src, const char **to_remove, size_t num_to_remove,
     const grpc_arg *to_add, size_t num_to_add);
 
 /** Concatenate args from \a a and \a b into a new instance */

test/core/end2end/fake_resolver.c

@@ -174,8 +174,8 @@ static grpc_resolver* fake_resolver_create(grpc_resolver_factory* factory,
   gpr_slice_buffer path_parts;
   gpr_slice_buffer_init(&path_parts);
   gpr_slice_split(path_slice, ",", &path_parts);
-  grpc_lb_addresses* addresses = grpc_lb_addresses_create(
+  grpc_lb_addresses* addresses =
-      path_parts.count, NULL /* user_data_vtable */);
+      grpc_lb_addresses_create(path_parts.count, NULL /* user_data_vtable */);
   bool errors_found = false;
   for (size_t i = 0; i < addresses->num_addresses; i++) {
     grpc_uri ith_uri = *args->uri;