indent pass to get logical source lines on one physical line
diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c
index ad44aed..47b96f8 100644
--- a/src/core/surface/server_chttp2.c
+++ b/src/core/surface/server_chttp2.c
@@ -42,18 +42,18 @@
#include <grpc/support/log.h>
#include <grpc/support/useful.h>
-static void setup_transport(void *server, grpc_transport *transport,
- grpc_mdctx *mdctx,
- grpc_closure_list *closure_list) {
+static void
+setup_transport (void *server, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list)
+{
static grpc_channel_filter const *extra_filters[] = {
- &grpc_http_server_filter};
- grpc_server_setup_transport(
- server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx,
- grpc_server_get_channel_args(server), closure_list);
+ &grpc_http_server_filter
+ };
+ grpc_server_setup_transport (server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (server), closure_list);
}
-static void new_transport(void *server, grpc_endpoint *tcp,
- grpc_closure_list *closure_list) {
+static void
+new_transport (void *server, grpc_endpoint * tcp, grpc_closure_list * closure_list)
+{
/*
* Beware that the call to grpc_create_chttp2_transport() has to happen before
* grpc_tcp_server_destroy(). This is fine here, but similar code
@@ -61,30 +61,32 @@
* (as in server_secure_chttp2.c) needs to add synchronization to avoid this
* case.
*/
- grpc_mdctx *mdctx = grpc_mdctx_create();
- grpc_transport *transport = grpc_create_chttp2_transport(
- grpc_server_get_channel_args(server), tcp, mdctx, 0, closure_list);
- setup_transport(server, transport, mdctx, closure_list);
- grpc_chttp2_transport_start_reading(transport, NULL, 0, closure_list);
+ grpc_mdctx *mdctx = grpc_mdctx_create ();
+ grpc_transport *transport = grpc_create_chttp2_transport (grpc_server_get_channel_args (server), tcp, mdctx, 0, closure_list);
+ setup_transport (server, transport, mdctx, closure_list);
+ grpc_chttp2_transport_start_reading (transport, NULL, 0, closure_list);
}
/* Server callback: start listening on our ports */
-static void start(grpc_server *server, void *tcpp, grpc_pollset **pollsets,
- size_t pollset_count, grpc_closure_list *closure_list) {
+static void
+start (grpc_server * server, void *tcpp, grpc_pollset ** pollsets, size_t pollset_count, grpc_closure_list * closure_list)
+{
grpc_tcp_server *tcp = tcpp;
- grpc_tcp_server_start(tcp, pollsets, pollset_count, new_transport, server,
- closure_list);
+ grpc_tcp_server_start (tcp, pollsets, pollset_count, new_transport, server, closure_list);
}
/* Server callback: destroy the tcp listener (so we don't generate further
callbacks) */
-static void destroy(grpc_server *server, void *tcpp, grpc_closure *destroy_done,
- grpc_closure_list *closure_list) {
+static void
+destroy (grpc_server * server, void *tcpp, grpc_closure * destroy_done, grpc_closure_list * closure_list)
+{
grpc_tcp_server *tcp = tcpp;
- grpc_tcp_server_destroy(tcp, destroy_done, closure_list);
+ grpc_tcp_server_destroy (tcp, destroy_done, closure_list);
}
-int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) {
+int
+grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr)
+{
grpc_resolved_addresses *resolved = NULL;
grpc_tcp_server *tcp = NULL;
size_t i;
@@ -93,55 +95,62 @@
int port_temp;
grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT;
- resolved = grpc_blocking_resolve_address(addr, "http");
- if (!resolved) {
- goto error;
- }
-
- tcp = grpc_tcp_server_create();
- if (!tcp) {
- goto error;
- }
-
- for (i = 0; i < resolved->naddrs; i++) {
- port_temp = grpc_tcp_server_add_port(
- tcp, (struct sockaddr *)&resolved->addrs[i].addr,
- resolved->addrs[i].len);
- if (port_temp >= 0) {
- if (port_num == -1) {
- port_num = port_temp;
- } else {
- GPR_ASSERT(port_num == port_temp);
- }
- count++;
+ resolved = grpc_blocking_resolve_address (addr, "http");
+ if (!resolved)
+ {
+ goto error;
}
- }
- if (count == 0) {
- gpr_log(GPR_ERROR, "No address added out of total %d resolved",
- resolved->naddrs);
- goto error;
- }
- if (count != resolved->naddrs) {
- gpr_log(GPR_ERROR, "Only %d addresses added out of total %d resolved",
- count, resolved->naddrs);
- }
- grpc_resolved_addresses_destroy(resolved);
+
+ tcp = grpc_tcp_server_create ();
+ if (!tcp)
+ {
+ goto error;
+ }
+
+ for (i = 0; i < resolved->naddrs; i++)
+ {
+ port_temp = grpc_tcp_server_add_port (tcp, (struct sockaddr *) &resolved->addrs[i].addr, resolved->addrs[i].len);
+ if (port_temp >= 0)
+ {
+ if (port_num == -1)
+ {
+ port_num = port_temp;
+ }
+ else
+ {
+ GPR_ASSERT (port_num == port_temp);
+ }
+ count++;
+ }
+ }
+ if (count == 0)
+ {
+ gpr_log (GPR_ERROR, "No address added out of total %d resolved", resolved->naddrs);
+ goto error;
+ }
+ if (count != resolved->naddrs)
+ {
+ gpr_log (GPR_ERROR, "Only %d addresses added out of total %d resolved", count, resolved->naddrs);
+ }
+ grpc_resolved_addresses_destroy (resolved);
/* Register with the server only upon success */
- grpc_server_add_listener(server, tcp, start, destroy, &closure_list);
+ grpc_server_add_listener (server, tcp, start, destroy, &closure_list);
goto done;
/* Error path: cleanup and return */
error:
- if (resolved) {
- grpc_resolved_addresses_destroy(resolved);
- }
- if (tcp) {
- grpc_tcp_server_destroy(tcp, NULL, NULL);
- }
+ if (resolved)
+ {
+ grpc_resolved_addresses_destroy (resolved);
+ }
+ if (tcp)
+ {
+ grpc_tcp_server_destroy (tcp, NULL, NULL);
+ }
port_num = 0;
done:
- grpc_closure_list_run(&closure_list);
+ grpc_closure_list_run (&closure_list);
return port_num;
}