clang-format

5 files changed, 59 insertions, 64 deletions

diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.c b/src/core/ext/transport/chttp2/client/chttp2_connector.c
index 2af6b1e14d..213395c20f 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.c
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.c
@@ -41,9 +41,9 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include "src/core/ext/client_channel/connector.h"
 #include "src/core/ext/client_channel/http_connect_handshaker.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
-#include "src/core/ext/client_channel/connector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/handshaker.h"
 #include "src/core/lib/iomgr/tcp_client.h"
@@ -144,7 +144,7 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg,
   grpc_handshake_manager_destroy(exec_ctx, c->handshake_mgr);
   c->handshake_mgr = NULL;
   gpr_mu_unlock(&c->mu);
-  chttp2_connector_unref(exec_ctx, (grpc_connector*)c);
+  chttp2_connector_unref(exec_ctx, (grpc_connector *)c);
 }
 
 static void start_handshake_locked(grpc_exec_ctx *exec_ctx,
@@ -246,9 +246,9 @@ static const grpc_connector_vtable chttp2_connector_vtable = {
     chttp2_connector_connect};
 
 grpc_connector *grpc_chttp2_connector_create(
-    grpc_exec_ctx *exec_ctx, const char* server_name,
+    grpc_exec_ctx *exec_ctx, const char *server_name,
     grpc_chttp2_create_handshakers_func create_handshakers,
-    void* create_handshakers_user_data) {
+    void *create_handshakers_user_data) {
   chttp2_connector *c = gpr_malloc(sizeof(*c));
   memset(c, 0, sizeof(*c));
   c->base.vtable = &chttp2_connector_vtable;
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h
index 46401c34de..6c34ce1af1 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.h
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h
@@ -35,8 +35,8 @@
 #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
 
 #include "src/core/ext/client_channel/connector.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/channel/handshaker.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 
 typedef void (*grpc_chttp2_create_handshakers_func)(
     grpc_exec_ctx* exec_ctx, void* user_data,
@@ -44,8 +44,8 @@ typedef void (*grpc_chttp2_create_handshakers_func)(
 
 /// If \a create_handshakers is non-NULL, it will be called with
 /// \a create_handshakers_user_data to add handshakers.
-grpc_connector *grpc_chttp2_connector_create(
-    grpc_exec_ctx *exec_ctx, const char* server_name,
+grpc_connector* grpc_chttp2_connector_create(
+    grpc_exec_ctx* exec_ctx, const char* server_name,
     grpc_chttp2_create_handshakers_func create_handshakers,
     void* create_handshakers_user_data);
 
diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
index 10a84630ce..35e1e1f716 100644
--- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
+++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
@@ -69,9 +69,9 @@ static void client_channel_factory_unref(
   }
 }
 
-static void create_handshakers(grpc_exec_ctx* exec_ctx,
-                               void* security_connector,
-                               grpc_handshake_manager* handshake_mgr) {
+static void create_handshakers(grpc_exec_ctx *exec_ctx,
+                               void *security_connector,
+                               grpc_handshake_manager *handshake_mgr) {
   grpc_channel_security_connector_create_handshakers(
       exec_ctx, security_connector, handshake_mgr);
 }
@@ -80,9 +80,8 @@ static grpc_subchannel *client_channel_factory_create_subchannel(
     grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
     const grpc_subchannel_args *args) {
   client_channel_factory *f = (client_channel_factory *)cc_factory;
-  grpc_connector *connector =
-      grpc_chttp2_connector_create(exec_ctx, args->server_name,
-                                   create_handshakers, f->security_connector);
+  grpc_connector *connector = grpc_chttp2_connector_create(
+      exec_ctx, args->server_name, create_handshakers, f->security_connector);
   grpc_subchannel *s = grpc_subchannel_create(exec_ctx, connector, args);
   grpc_connector_unref(exec_ctx, connector);
   return s;
diff --git a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
index bdf10de49e..a4d7fc5f70 100644
--- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
+++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
@@ -50,7 +50,7 @@
 #include "src/core/lib/surface/server.h"
 
 typedef struct pending_handshake_manager_node {
-  grpc_handshake_manager* handshake_mgr;
+  grpc_handshake_manager *handshake_mgr;
   struct pending_handshake_manager_node *next;
 } pending_handshake_manager_node;
 
@@ -72,17 +72,17 @@ typedef struct {
 } server_connection_state;
 
 static void pending_handshake_manager_add_locked(
-    server_state* state, grpc_handshake_manager* handshake_mgr) {
-  pending_handshake_manager_node* node = gpr_malloc(sizeof(*node));
+    server_state *state, grpc_handshake_manager *handshake_mgr) {
+  pending_handshake_manager_node *node = gpr_malloc(sizeof(*node));
   node->handshake_mgr = handshake_mgr;
   node->next = state->pending_handshake_mgrs;
   state->pending_handshake_mgrs = node;
 }
 
 static void pending_handshake_manager_remove_locked(
-    server_state* state, grpc_handshake_manager* handshake_mgr) {
-  pending_handshake_manager_node** prev_node = &state->pending_handshake_mgrs;
-  for (pending_handshake_manager_node* node = state->pending_handshake_mgrs;
+    server_state *state, grpc_handshake_manager *handshake_mgr) {
+  pending_handshake_manager_node **prev_node = &state->pending_handshake_mgrs;
+  for (pending_handshake_manager_node *node = state->pending_handshake_mgrs;
        node != NULL; node = node->next) {
     if (node->handshake_mgr == handshake_mgr) {
       *prev_node = node->next;
@@ -93,10 +93,10 @@ static void pending_handshake_manager_remove_locked(
   }
 }
 
-static void pending_handshake_manager_shutdown_locked(
-    grpc_exec_ctx* exec_ctx, server_state* state) {
-  pending_handshake_manager_node* prev_node = NULL;
-  for (pending_handshake_manager_node* node = state->pending_handshake_mgrs;
+static void pending_handshake_manager_shutdown_locked(grpc_exec_ctx *exec_ctx,
+                                                      server_state *state) {
+  pending_handshake_manager_node *prev_node = NULL;
+  for (pending_handshake_manager_node *node = state->pending_handshake_mgrs;
        node != NULL; node = node->next) {
     grpc_handshake_manager_shutdown(exec_ctx, node->handshake_mgr);
     gpr_free(prev_node);
@@ -135,8 +135,7 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg,
         exec_ctx, connection_state->server_state->server, transport,
         connection_state->accepting_pollset,
         grpc_server_get_channel_args(connection_state->server_state->server));
-    grpc_chttp2_transport_start_reading(exec_ctx, transport,
-                                        args->read_buffer);
+    grpc_chttp2_transport_start_reading(exec_ctx, transport, args->read_buffer);
     grpc_channel_args_destroy(args->args);
   }
   pending_handshake_manager_remove_locked(connection_state->server_state,
@@ -150,14 +149,14 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg,
 static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp,
                       grpc_pollset *accepting_pollset,
                       grpc_tcp_server_acceptor *acceptor) {
-  server_state* state = arg;
+  server_state *state = arg;
   gpr_mu_lock(&state->mu);
   if (state->shutdown) {
     gpr_mu_unlock(&state->mu);
     grpc_endpoint_destroy(exec_ctx, tcp);
     return;
   }
-  grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create();
+  grpc_handshake_manager *handshake_mgr = grpc_handshake_manager_create();
   pending_handshake_manager_add_locked(state, handshake_mgr);
   gpr_mu_unlock(&state->mu);
   grpc_tcp_server_ref(state->tcp_server);
@@ -173,8 +172,8 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp,
       gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_seconds(120, GPR_TIMESPAN));
   grpc_handshake_manager_do_handshake(
       exec_ctx, connection_state->handshake_mgr, tcp,
-      grpc_server_get_channel_args(state->server),
-      deadline, acceptor, on_handshake_done, connection_state);
+      grpc_server_get_channel_args(state->server), deadline, acceptor,
+      on_handshake_done, connection_state);
 }
 
 /* Server callback: start listening on our ports */
@@ -239,14 +238,13 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) {
   if (err != GRPC_ERROR_NONE) {
     goto error;
   }
-  server_state* state = gpr_malloc(sizeof(*state));
+  server_state *state = gpr_malloc(sizeof(*state));
   memset(state, 0, sizeof(*state));
   grpc_closure_init(&state->tcp_server_shutdown_complete,
                     tcp_server_shutdown_complete, state);
-  err = grpc_tcp_server_create(&exec_ctx,
-                               &state->tcp_server_shutdown_complete,
-                               grpc_server_get_channel_args(server),
-                               &tcp_server);
+  err =
+      grpc_tcp_server_create(&exec_ctx, &state->tcp_server_shutdown_complete,
+                             grpc_server_get_channel_args(server), &tcp_server);
   if (err != GRPC_ERROR_NONE) {
     goto error;
   }
@@ -259,8 +257,8 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) {
   const size_t naddrs = resolved->naddrs;
   errors = gpr_malloc(sizeof(*errors) * naddrs);
   for (i = 0; i < naddrs; i++) {
-    errors[i] = grpc_tcp_server_add_port(tcp_server, &resolved->addrs[i],
-                                         &port_temp);
+    errors[i] =
+        grpc_tcp_server_add_port(tcp_server, &resolved->addrs[i], &port_temp);
     if (errors[i] == GRPC_ERROR_NONE) {
       if (port_num == -1) {
         port_num = port_temp;
@@ -293,8 +291,8 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) {
   grpc_resolved_addresses_destroy(resolved);
 
   /* Register with the server only upon success */
-  grpc_server_add_listener(&exec_ctx, server, state,
-                           server_start_listener, server_destroy_listener);
+  grpc_server_add_listener(&exec_ctx, server, state, server_start_listener,
+                           server_destroy_listener);
   goto done;
 
 /* Error path: cleanup and return */
diff --git a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c
index 19aa22c7c4..8d2371c917 100644
--- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c
+++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c
@@ -55,7 +55,7 @@
 #include "src/core/lib/surface/server.h"
 
 typedef struct pending_handshake_manager_node {
-  grpc_handshake_manager* handshake_mgr;
+  grpc_handshake_manager *handshake_mgr;
   struct pending_handshake_manager_node *next;
 } pending_handshake_manager_node;
 
@@ -79,17 +79,17 @@ typedef struct server_secure_connection_state {
 } server_secure_connection_state;
 
 static void pending_handshake_manager_add_locked(
-    server_secure_state* state, grpc_handshake_manager* handshake_mgr) {
-  pending_handshake_manager_node* node = gpr_malloc(sizeof(*node));
+    server_secure_state *state, grpc_handshake_manager *handshake_mgr) {
+  pending_handshake_manager_node *node = gpr_malloc(sizeof(*node));
   node->handshake_mgr = handshake_mgr;
   node->next = state->pending_handshake_mgrs;
   state->pending_handshake_mgrs = node;
 }
 
 static void pending_handshake_manager_remove_locked(
-    server_secure_state* state, grpc_handshake_manager* handshake_mgr) {
-  pending_handshake_manager_node** prev_node = &state->pending_handshake_mgrs;
-  for (pending_handshake_manager_node* node = state->pending_handshake_mgrs;
+    server_secure_state *state, grpc_handshake_manager *handshake_mgr) {
+  pending_handshake_manager_node **prev_node = &state->pending_handshake_mgrs;
+  for (pending_handshake_manager_node *node = state->pending_handshake_mgrs;
        node != NULL; node = node->next) {
     if (node->handshake_mgr == handshake_mgr) {
       *prev_node = node->next;
@@ -101,9 +101,9 @@ static void pending_handshake_manager_remove_locked(
 }
 
 static void pending_handshake_manager_shutdown_locked(
-    grpc_exec_ctx* exec_ctx, server_secure_state* state) {
-  pending_handshake_manager_node* prev_node = NULL;
-  for (pending_handshake_manager_node* node = state->pending_handshake_mgrs;
+    grpc_exec_ctx *exec_ctx, server_secure_state *state) {
+  pending_handshake_manager_node *prev_node = NULL;
+  for (pending_handshake_manager_node *node = state->pending_handshake_mgrs;
        node != NULL; node = node->next) {
     grpc_handshake_manager_shutdown(exec_ctx, node->handshake_mgr);
     gpr_free(prev_node);
@@ -136,19 +136,18 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg,
       gpr_free(args->read_buffer);
     }
   } else {
-    grpc_arg channel_arg = grpc_server_credentials_to_arg(
-	connection_state->server_state->creds);
+    grpc_arg channel_arg =
+        grpc_server_credentials_to_arg(connection_state->server_state->creds);
     grpc_channel_args *args_copy =
-	grpc_channel_args_copy_and_add(args->args, &channel_arg, 1);
+        grpc_channel_args_copy_and_add(args->args, &channel_arg, 1);
     grpc_channel_args_destroy(args->args);
     grpc_transport *transport =
-	grpc_create_chttp2_transport(exec_ctx, args_copy, args->endpoint, 0);
+        grpc_create_chttp2_transport(exec_ctx, args_copy, args->endpoint, 0);
     grpc_server_setup_transport(
-	exec_ctx, connection_state->server_state->server, transport,
-	connection_state->accepting_pollset, args_copy);
+        exec_ctx, connection_state->server_state->server, transport,
+        connection_state->accepting_pollset, args_copy);
     grpc_channel_args_destroy(args_copy);
-    grpc_chttp2_transport_start_reading(exec_ctx, transport,
-					args->read_buffer);
+    grpc_chttp2_transport_start_reading(exec_ctx, transport, args->read_buffer);
   }
   pending_handshake_manager_remove_locked(connection_state->server_state,
                                           connection_state->handshake_mgr);
@@ -168,7 +167,7 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp,
     grpc_endpoint_destroy(exec_ctx, tcp);
     return;
   }
-  grpc_handshake_manager* handshake_mgr = grpc_handshake_manager_create();
+  grpc_handshake_manager *handshake_mgr = grpc_handshake_manager_create();
   pending_handshake_manager_add_locked(state, handshake_mgr);
   gpr_mu_unlock(&state->mu);
   grpc_tcp_server_ref(state->tcp_server);
@@ -186,8 +185,8 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_endpoint *tcp,
       gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_seconds(120, GPR_TIMESPAN));
   grpc_handshake_manager_do_handshake(
       exec_ctx, connection_state->handshake_mgr, tcp,
-      grpc_server_get_channel_args(state->server),
-      deadline, acceptor, on_handshake_done, connection_state);
+      grpc_server_get_channel_args(state->server), deadline, acceptor,
+      on_handshake_done, connection_state);
 }
 
 /* Server callback: start listening on our ports */
@@ -283,10 +282,9 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr,
   memset(state, 0, sizeof(*state));
   grpc_closure_init(&state->tcp_server_shutdown_complete,
                     tcp_server_shutdown_complete, state);
-  err = grpc_tcp_server_create(&exec_ctx,
-                               &state->tcp_server_shutdown_complete,
-                               grpc_server_get_channel_args(server),
-                               &tcp_server);
+  err =
+      grpc_tcp_server_create(&exec_ctx, &state->tcp_server_shutdown_complete,
+                             grpc_server_get_channel_args(server), &tcp_server);
   if (err != GRPC_ERROR_NONE) {
     goto error;
   }
@@ -340,8 +338,8 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr,
   grpc_resolved_addresses_destroy(resolved);
 
   /* Register with the server only upon success */
-  grpc_server_add_listener(&exec_ctx, server, state,
-                           server_start_listener, server_destroy_listener);
+  grpc_server_add_listener(&exec_ctx, server, state, server_start_listener,
+                           server_destroy_listener);
 
   grpc_exec_ctx_finish(&exec_ctx);
   return port_num;