clang-format

src/core/ext/client_config/client_channel.c

@@ -611,9 +611,8 @@ static void continue_picking(grpc_exec_ctx *exec_ctx, void *arg,
     call_data *calld = cpa->elem->call_data;
     gpr_mu_lock(&calld->mu);
     if (pick_subchannel(exec_ctx, cpa->elem, cpa->initial_metadata,
-                        cpa->initial_metadata_flags,
+                        cpa->initial_metadata_flags, cpa->connected_subchannel,
-                        cpa->connected_subchannel, cpa->on_ready,
+                        cpa->on_ready, GRPC_ERROR_NONE)) {
-                        GRPC_ERROR_NONE)) {
       grpc_exec_ctx_sched(exec_ctx, cpa->on_ready, GRPC_ERROR_NONE, NULL);
     }
     gpr_mu_unlock(&calld->mu);

test/core/channel/channel_stack_test.c

@@ -118,7 +118,7 @@ static void test_create_channel_stack(void) {
   int *channel_data;
   int *call_data;
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-  grpc_mdstr* path = grpc_mdstr_from_string("/service/method");
+  grpc_mdstr *path = grpc_mdstr_from_string("/service/method");
 
   arg.type = GRPC_ARG_INTEGER;
   arg.key = "test_key";
@@ -137,8 +137,8 @@ static void test_create_channel_stack(void) {
 
   call_stack = gpr_malloc(channel_stack->call_stack_size);
   grpc_error *error = grpc_call_stack_init(
-      &exec_ctx, channel_stack, 1, free_call, call_stack, NULL, NULL,
+      &exec_ctx, channel_stack, 1, free_call, call_stack, NULL, NULL, path,
-      path, gpr_inf_future(GPR_CLOCK_MONOTONIC), call_stack);
+      gpr_inf_future(GPR_CLOCK_MONOTONIC), call_stack);
   GPR_ASSERT(error == GRPC_ERROR_NONE);
   GPR_ASSERT(call_stack->count == 1);
   call_elem = grpc_call_stack_element(call_stack, 0);

test/core/end2end/end2end_tests.h

@@ -60,8 +60,7 @@ struct grpc_end2end_test_config {
   grpc_end2end_test_fixture (*create_fixture)(grpc_channel_args *client_args,
                                               grpc_channel_args *server_args);
   void (*init_client)(grpc_end2end_test_fixture *f,
-                      grpc_channel_args *client_args,
+                      grpc_channel_args *client_args, const char *query_args);
-                      const char *query_args);
   void (*init_server)(grpc_end2end_test_fixture *f,
                       grpc_channel_args *server_args);
   void (*tear_down_data)(grpc_end2end_test_fixture *f);

test/core/end2end/tests/max_message_length.c

@@ -136,7 +136,8 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config,
   if (use_service_config) {
     // We don't currently support service configs on the server side.
     GPR_ASSERT(send_limit);
-    query_args = "method_name=/service/method"
+    query_args =
+        "method_name=/service/method"
         "&max_request_message_bytes=5";
   } else {
     // Set limit via channel args.
@@ -297,7 +298,8 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config,
   if (use_service_config) {
     // We don't currently support service configs on the server side.
     GPR_ASSERT(!send_limit);
-    query_args = "method_name=/service/method"
+    query_args =
+        "method_name=/service/method"
         "&max_response_message_bytes=5";
   } else {
     // Set limit via channel args.