diff options
| -rw-r--r-- | test/core/channel/minimal_stack_is_minimal_test.cc | 2 | ||||
| -rw-r--r-- | test/core/end2end/BUILD | 2 | ||||
| -rw-r--r-- | test/core/end2end/fuzzers/BUILD | 6 | ||||
| -rw-r--r-- | test/core/security/secure_endpoint_test.cc | 2 | ||||
| -rw-r--r-- | test/core/transport/chttp2/hpack_encoder_test.cc | 28 |
5 files changed, 19 insertions, 21 deletions
diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index be6670c368..5884893be3 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -117,7 +117,7 @@ static int check_stack(const char *file, int line, const char *transport_name, grpc_transport_vtable fake_transport_vtable; memset(&fake_transport_vtable, 0, sizeof(grpc_transport_vtable)); fake_transport_vtable.name = transport_name; - grpc_transport fake_transport = {.vtable = &fake_transport_vtable}; + grpc_transport fake_transport = {&fake_transport_vtable}; grpc_channel_stack_builder_set_target(builder, "foo.test.google.fr"); grpc_channel_args *channel_args = grpc_channel_args_copy(init_args); if (transport_name != NULL) { diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 1589880e1f..831ba7611d 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -39,7 +39,7 @@ grpc_cc_library( "data/client_certs.cc", "data/server1_cert.cc", "data/server1_key.cc", - "data/test_root_cert.c", + "data/test_root_cert.cc", ], hdrs = ["data/ssl_test_data.h"], language = "C", diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD index 4ed9a70578..09c175e8d2 100644 --- a/test/core/end2end/fuzzers/BUILD +++ b/test/core/end2end/fuzzers/BUILD @@ -22,7 +22,7 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "api_fuzzer", - srcs = ["api_fuzzer.c"], + srcs = ["api_fuzzer.cc"], language = "C", corpus = "api_fuzzer_corpus", deps = [ @@ -35,7 +35,7 @@ grpc_fuzzer( grpc_fuzzer( name = "client_fuzzer", - srcs = ["client_fuzzer.c"], + srcs = ["client_fuzzer.cc"], language = "C", corpus = "client_fuzzer_corpus", deps = [ @@ -47,7 +47,7 @@ grpc_fuzzer( grpc_fuzzer( name = "server_fuzzer", - srcs = ["server_fuzzer.c"], + srcs = ["server_fuzzer.cc"], language = "C", corpus = "server_fuzzer_corpus", deps = [ diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index fe7961d1d9..00ff7cf4e8 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -56,7 +56,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( a[0].key = const_cast<char *>(GRPC_ARG_TCP_READ_CHUNK_SIZE); a[0].type = GRPC_ARG_INTEGER; a[0].value.integer = (int)slice_size; - grpc_channel_args args = {.num_args = GPR_ARRAY_SIZE(a), .args = a}; + grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; tcp = grpc_iomgr_create_endpoint_pair("fixture", &args); grpc_endpoint_add_to_pollset(&exec_ctx, tcp.client, g_pollset); grpc_endpoint_add_to_pollset(&exec_ctx, tcp.server, g_pollset); diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index b203df1892..f950f8a63c 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -100,11 +100,11 @@ static void verify(grpc_exec_ctx *exec_ctx, const verify_params params, grpc_transport_one_way_stats stats; memset(&stats, 0, sizeof(stats)); grpc_encode_header_options hopt = { - .stream_id = 0xdeadbeef, - .is_eof = params.eof, - .use_true_binary_metadata = params.use_true_binary_metadata, - .max_frame_size = 16384, - .stats = &stats, + 0xdeadbeef, /* stream_id */ + params.eof, /* is_eof */ + params.use_true_binary_metadata, /* use_true_binary_metadata */ + 16384, /* max_frame_size */ + &stats /* stats */ }; grpc_chttp2_encode_header(exec_ctx, &g_compressor, NULL, 0, &b, &hopt, &output); @@ -131,7 +131,7 @@ static void test_basic_headers(grpc_exec_ctx *exec_ctx) { int i; verify_params params = { - .eof = false, .use_true_binary_metadata = false, .only_intern_key = false, + false, false, false, }; verify(exec_ctx, params, "000005 0104 deadbeef 40 0161 0161", 1, "a", "a"); verify(exec_ctx, params, "000001 0104 deadbeef be", 1, "a", "a"); @@ -167,7 +167,7 @@ static void test_decode_table_overflow(grpc_exec_ctx *exec_ctx) { char *expect; verify_params params = { - .eof = false, .use_true_binary_metadata = false, .only_intern_key = false, + false, false, false, }; for (i = 0; i < 114; i++) { @@ -226,11 +226,11 @@ static void verify_table_size_change_match_elem_size(grpc_exec_ctx *exec_ctx, grpc_transport_one_way_stats stats; memset(&stats, 0, sizeof(stats)); grpc_encode_header_options hopt = { - .stream_id = 0xdeadbeef, - .is_eof = false, - .use_true_binary_metadata = use_true_binary, - .max_frame_size = 16384, - .stats = &stats}; + 0xdeadbeef, /* stream_id */ + false, /* is_eof */ + use_true_binary, /* use_true_binary_metadata */ + 16384, /* max_frame_size */ + &stats /* stats */}; grpc_chttp2_encode_header(exec_ctx, &g_compressor, NULL, 0, &b, &hopt, &output); grpc_slice_buffer_destroy_internal(exec_ctx, &output); @@ -250,9 +250,7 @@ static void test_encode_header_size(grpc_exec_ctx *exec_ctx) { static void test_interned_key_indexed(grpc_exec_ctx *exec_ctx) { int i; - verify_params params = { - .eof = false, .use_true_binary_metadata = false, .only_intern_key = true, - }; + verify_params params = {false, false, true}; verify(exec_ctx, params, "000009 0104 deadbeef 40 0161 0162 0f2f 0163", 2, "a", "b", "a", "c"); for (i = 0; i < 10; i++) { |