aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-11-04 12:49:49 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-11-04 12:49:49 -0700
commit78afd778009a2af0fcc6c05b5739e5bc457c9d6f (patch)
tree1258901a64f27963ebf29b58e3149252cb5a8724
parent9a8dbc406e1b6c6612837056bee601d88c910747 (diff)
clang-format
-rw-r--r--src/core/ext/client_channel/client_channel.c5
-rw-r--r--src/core/lib/security/transport/client_auth_filter.c17
2 files changed, 8 insertions, 14 deletions
diff --git a/src/core/ext/client_channel/client_channel.c b/src/core/ext/client_channel/client_channel.c
index 1bed965ed1..1cce3bc329 100644
--- a/src/core/ext/client_channel/client_channel.c
+++ b/src/core/ext/client_channel/client_channel.c
@@ -124,7 +124,7 @@ typedef struct client_channel_channel_data {
/** mutex protecting all variables below in this data structure */
gpr_mu mu;
/** currently active load balancer */
- char* lb_policy_name;
+ char *lb_policy_name;
grpc_lb_policy *lb_policy;
/** maps method names to method_parameters structs */
grpc_mdstr_hash_table *method_params_table;
@@ -443,7 +443,8 @@ static void cc_get_channel_info(grpc_exec_ctx *exec_ctx,
gpr_mu_lock(&chand->mu);
if (info->lb_policy_name != NULL) {
*info->lb_policy_name = chand->lb_policy_name == NULL
- ? NULL : gpr_strdup(chand->lb_policy_name);
+ ? NULL
+ : gpr_strdup(chand->lb_policy_name);
}
gpr_mu_unlock(&chand->mu);
}
diff --git a/src/core/lib/security/transport/client_auth_filter.c b/src/core/lib/security/transport/client_auth_filter.c
index 3a96af2c69..d075ed037b 100644
--- a/src/core/lib/security/transport/client_auth_filter.c
+++ b/src/core/lib/security/transport/client_auth_filter.c
@@ -341,15 +341,8 @@ static void destroy_channel_elem(grpc_exec_ctx *exec_ctx,
GRPC_AUTH_CONTEXT_UNREF(chand->auth_context, "client_auth_filter");
}
-const grpc_channel_filter grpc_client_auth_filter = {auth_start_transport_op,
- grpc_channel_next_op,
- sizeof(call_data),
- init_call_elem,
- set_pollset_or_pollset_set,
- destroy_call_elem,
- sizeof(channel_data),
- init_channel_elem,
- destroy_channel_elem,
- grpc_call_next_get_peer,
- grpc_channel_next_get_info,
- "client-auth"};
+const grpc_channel_filter grpc_client_auth_filter = {
+ auth_start_transport_op, grpc_channel_next_op, sizeof(call_data),
+ init_call_elem, set_pollset_or_pollset_set, destroy_call_elem,
+ sizeof(channel_data), init_channel_elem, destroy_channel_elem,
+ grpc_call_next_get_peer, grpc_channel_next_get_info, "client-auth"};