Skip to content
Snippets Groups Projects
Commit fd2ddd28 authored by Mark D. Roth's avatar Mark D. Roth
Browse files

clang-format

parent 5f1c4b58
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/core/ext/client_config/client_channel.c
+ 2
− 3
View file @ fd2ddd28
...@@ -611,9 +611,8 @@ static void continue_picking(grpc_exec_ctx *exec_ctx, void *arg, ...@@ -611,9 +611,8 @@ static void continue_picking(grpc_exec_ctx *exec_ctx, void *arg,
call_data *calld = cpa->elem->call_data; call_data *calld = cpa->elem->call_data;
gpr_mu_lock(&calld->mu); gpr_mu_lock(&calld->mu);
if (pick_subchannel(exec_ctx, cpa->elem, cpa->initial_metadata, 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); grpc_exec_ctx_sched(exec_ctx, cpa->on_ready, GRPC_ERROR_NONE, NULL);
} }
gpr_mu_unlock(&calld->mu); gpr_mu_unlock(&calld->mu);
......
test/core/channel/channel_stack_test.c
+ 3
− 3
View file @ fd2ddd28
...@@ -118,7 +118,7 @@ static void test_create_channel_stack(void) { ...@@ -118,7 +118,7 @@ static void test_create_channel_stack(void) {
int *channel_data; int *channel_data;
int *call_data; int *call_data;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; 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.type = GRPC_ARG_INTEGER;
arg.key = "test_key"; arg.key = "test_key";
...@@ -137,8 +137,8 @@ static void test_create_channel_stack(void) { ...@@ -137,8 +137,8 @@ static void test_create_channel_stack(void) {
call_stack = gpr_malloc(channel_stack->call_stack_size); call_stack = gpr_malloc(channel_stack->call_stack_size);
grpc_error *error = grpc_call_stack_init( 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(error == GRPC_ERROR_NONE);
GPR_ASSERT(call_stack->count == 1); GPR_ASSERT(call_stack->count == 1);
call_elem = grpc_call_stack_element(call_stack, 0); call_elem = grpc_call_stack_element(call_stack, 0);
......
test/core/end2end/end2end_tests.h
+ 1
− 2
View file @ fd2ddd28
...@@ -60,8 +60,7 @@ struct grpc_end2end_test_config { ...@@ -60,8 +60,7 @@ struct grpc_end2end_test_config {
grpc_end2end_test_fixture (*create_fixture)(grpc_channel_args *client_args, grpc_end2end_test_fixture (*create_fixture)(grpc_channel_args *client_args,
grpc_channel_args *server_args); grpc_channel_args *server_args);
void (*init_client)(grpc_end2end_test_fixture *f, 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, void (*init_server)(grpc_end2end_test_fixture *f,
grpc_channel_args *server_args); grpc_channel_args *server_args);
void (*tear_down_data)(grpc_end2end_test_fixture *f); void (*tear_down_data)(grpc_end2end_test_fixture *f);
......
test/core/end2end/fixtures/h2_ssl_cert.c
+ 35
− 35
View file @ fd2ddd28
...@@ -154,41 +154,41 @@ SERVER_INIT(GRPC_SSL_REQUEST_AND_REQUIRE_CLIENT_CERTIFICATE_AND_VERIFY) ...@@ -154,41 +154,41 @@ SERVER_INIT(GRPC_SSL_REQUEST_AND_REQUIRE_CLIENT_CERTIFICATE_AND_VERIFY)
typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype; typedef enum { NONE, SELF_SIGNED, SIGNED, BAD_CERT_PAIR } certtype;
#define CLIENT_INIT(cert_type) \ #define CLIENT_INIT(cert_type) \
static void CLIENT_INIT_NAME(cert_type)(grpc_end2end_test_fixture * f, \ static void CLIENT_INIT_NAME(cert_type)(grpc_end2end_test_fixture * f, \
grpc_channel_args * client_args, \ grpc_channel_args * client_args, \
const char *query_args) { \ const char *query_args) { \
GPR_ASSERT(query_args == NULL); \ GPR_ASSERT(query_args == NULL); \
grpc_channel_credentials *ssl_creds = NULL; \ grpc_channel_credentials *ssl_creds = NULL; \
grpc_ssl_pem_key_cert_pair self_signed_client_key_cert_pair = { \ grpc_ssl_pem_key_cert_pair self_signed_client_key_cert_pair = { \
test_self_signed_client_key, test_self_signed_client_cert}; \ test_self_signed_client_key, test_self_signed_client_cert}; \
grpc_ssl_pem_key_cert_pair signed_client_key_cert_pair = { \ grpc_ssl_pem_key_cert_pair signed_client_key_cert_pair = { \
test_signed_client_key, test_signed_client_cert}; \ test_signed_client_key, test_signed_client_cert}; \
grpc_ssl_pem_key_cert_pair bad_client_key_cert_pair = { \ grpc_ssl_pem_key_cert_pair bad_client_key_cert_pair = { \
test_self_signed_client_key, test_signed_client_cert}; \ test_self_signed_client_key, test_signed_client_cert}; \
grpc_ssl_pem_key_cert_pair *key_cert_pair = NULL; \ grpc_ssl_pem_key_cert_pair *key_cert_pair = NULL; \
switch (cert_type) { \ switch (cert_type) { \
case SELF_SIGNED: \ case SELF_SIGNED: \
key_cert_pair = &self_signed_client_key_cert_pair; \ key_cert_pair = &self_signed_client_key_cert_pair; \
break; \ break; \
case SIGNED: \ case SIGNED: \
key_cert_pair = &signed_client_key_cert_pair; \ key_cert_pair = &signed_client_key_cert_pair; \
break; \ break; \
case BAD_CERT_PAIR: \ case BAD_CERT_PAIR: \
key_cert_pair = &bad_client_key_cert_pair; \ key_cert_pair = &bad_client_key_cert_pair; \
break; \ break; \
default: \ default: \
break; \ break; \
} \ } \
ssl_creds = \ ssl_creds = \
grpc_ssl_credentials_create(test_root_cert, key_cert_pair, NULL); \ grpc_ssl_credentials_create(test_root_cert, key_cert_pair, NULL); \
grpc_arg ssl_name_override = {GRPC_ARG_STRING, \ grpc_arg ssl_name_override = {GRPC_ARG_STRING, \
GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, \ GRPC_SSL_TARGET_NAME_OVERRIDE_ARG, \
{"foo.test.google.fr"}}; \ {"foo.test.google.fr"}}; \
grpc_channel_args *new_client_args = \ grpc_channel_args *new_client_args = \
grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \ grpc_channel_args_copy_and_add(client_args, &ssl_name_override, 1); \
chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \ chttp2_init_client_secure_fullstack(f, new_client_args, ssl_creds); \
grpc_channel_args_destroy(new_client_args); \ grpc_channel_args_destroy(new_client_args); \
} }
CLIENT_INIT(NONE) CLIENT_INIT(NONE)
......
test/core/end2end/tests/max_message_length.c
+ 6
− 4
View file @ fd2ddd28
...@@ -136,8 +136,9 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config, ...@@ -136,8 +136,9 @@ static void test_max_message_length_on_request(grpc_end2end_test_config config,
if (use_service_config) { if (use_service_config) {
// We don't currently support service configs on the server side. // We don't currently support service configs on the server side.
GPR_ASSERT(send_limit); GPR_ASSERT(send_limit);
query_args = "method_name=/service/method" query_args =
"&max_request_message_bytes=5"; "method_name=/service/method"
"&max_request_message_bytes=5";
} else { } else {
// Set limit via channel args. // Set limit via channel args.
channel_arg.key = send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH channel_arg.key = send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH
...@@ -297,8 +298,9 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config, ...@@ -297,8 +298,9 @@ static void test_max_message_length_on_response(grpc_end2end_test_config config,
if (use_service_config) { if (use_service_config) {
// We don't currently support service configs on the server side. // We don't currently support service configs on the server side.
GPR_ASSERT(!send_limit); GPR_ASSERT(!send_limit);
query_args = "method_name=/service/method" query_args =
"&max_response_message_bytes=5"; "method_name=/service/method"
"&max_response_message_bytes=5";
} else { } else {
// Set limit via channel args. // Set limit via channel args.
channel_arg.key = send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH channel_arg.key = send_limit ? GRPC_ARG_MAX_SEND_MESSAGE_LENGTH
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment