From b35f80d680cc53e97b34e85386dc81172caf45e5 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 17 Oct 2019 08:51:09 -0700 Subject: [PATCH 1/2] Remove unused parameter warning (7 of 20) --- test/core/end2end/fuzzers/client_fuzzer.cc | 4 ++-- test/core/end2end/fuzzers/server_fuzzer.cc | 4 ++-- test/core/end2end/h2_ssl_cert_test.cc | 8 ++++--- test/core/end2end/inproc_callback_test.cc | 7 +++--- test/core/end2end/tests/cancel_test_helpers.h | 3 ++- test/core/end2end/tests/channelz.cc | 2 +- test/core/end2end/tests/connectivity.cc | 2 +- .../end2end/tests/filter_call_init_fails.cc | 22 +++++++++---------- .../core/end2end/tests/filter_causes_close.cc | 19 ++++++++-------- test/core/end2end/tests/filter_context.cc | 12 +++++----- 10 files changed, 44 insertions(+), 39 deletions(-) diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 8ff8c1a5474..bb97cc0b1cf 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -33,11 +33,11 @@ bool squelch = true; bool leak_check = true; -static void discard_write(grpc_slice slice) {} +static void discard_write(grpc_slice /*slice*/) {} static void* tag(int n) { return (void*)static_cast(n); } -static void dont_log(gpr_log_func_args* args) {} +static void dont_log(gpr_log_func_args* /*args*/) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_test_only_set_slice_hash_seed(0); diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 031db87dc2e..7664000dae8 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -29,12 +29,12 @@ bool squelch = true; bool leak_check = true; -static void discard_write(grpc_slice slice) {} +static void discard_write(grpc_slice /*slice*/) {} static void* tag(int n) { return (void*)static_cast(n); } static int detag(void* p) { return static_cast((uintptr_t)p); } -static void dont_log(gpr_log_func_args* args) {} +static void dont_log(gpr_log_func_args* /*args*/) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_test_only_set_slice_hash_seed(0); diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 31af4d545e3..2a1cf42229e 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -45,7 +45,8 @@ struct fullstack_secure_fixture_data { }; static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args* client_args, grpc_channel_args* server_args) { + grpc_channel_args* /*client_args*/, + grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); fullstack_secure_fixture_data* ffd = @@ -59,8 +60,9 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( return f; } -static void process_auth_failure(void* state, grpc_auth_context* ctx, - const grpc_metadata* md, size_t md_count, +static void process_auth_failure(void* state, grpc_auth_context* /*ctx*/, + const grpc_metadata* /*md*/, + size_t /*md_count*/, grpc_process_auth_metadata_done_cb cb, void* user_data) { GPR_ASSERT(state == nullptr); diff --git a/test/core/end2end/inproc_callback_test.cc b/test/core/end2end/inproc_callback_test.cc index 550c2c2d69a..a2b180c7096 100644 --- a/test/core/end2end/inproc_callback_test.cc +++ b/test/core/end2end/inproc_callback_test.cc @@ -74,7 +74,7 @@ class ShutdownCallback : public grpc_experimental_completion_queue_functor { auto* callback = static_cast(cb); callback->Run(static_cast(ok)); } - void Run(bool ok) { + void Run(bool /*ok*/) { gpr_log(GPR_DEBUG, "CQ shutdown notification invoked"); gpr_mu_lock(&mu_); done_ = true; @@ -205,7 +205,8 @@ static grpc_experimental_completion_queue_functor* tag(intptr_t t) { } static grpc_end2end_test_fixture inproc_create_fixture( - grpc_channel_args* client_args, grpc_channel_args* server_args) { + grpc_channel_args* /*client_args*/, + grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; inproc_fixture_data* ffd = static_cast( gpr_malloc(sizeof(inproc_fixture_data))); @@ -259,7 +260,7 @@ static gpr_timespec n_seconds_from_now(int n) { static gpr_timespec five_seconds_from_now() { return n_seconds_from_now(5); } -static void drain_cq(grpc_completion_queue* cq) { +static void drain_cq(grpc_completion_queue* /*cq*/) { // Wait for the shutdown callback to arrive, or fail the test GPR_ASSERT(g_shutdown_callback->Wait(five_seconds_from_now())); gpr_log(GPR_DEBUG, "CQ shutdown wait complete"); diff --git a/test/core/end2end/tests/cancel_test_helpers.h b/test/core/end2end/tests/cancel_test_helpers.h index 477d19929d6..353d6eb9a7d 100644 --- a/test/core/end2end/tests/cancel_test_helpers.h +++ b/test/core/end2end/tests/cancel_test_helpers.h @@ -26,7 +26,8 @@ typedef struct { const char* expect_details; } cancellation_mode; -static grpc_call_error wait_for_deadline(grpc_call* call, void* reserved) { +static grpc_call_error wait_for_deadline(grpc_call* /*call*/, + void* reserved) { (void)reserved; return GRPC_CALL_OK; } diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index 169190eec06..81f97811466 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -89,7 +89,7 @@ static void end_test(grpc_end2end_test_fixture* f) { grpc_completion_queue_destroy(f->shutdown_cq); } -static void run_one_request(grpc_end2end_test_config config, +static void run_one_request(grpc_end2end_test_config /*config*/, grpc_end2end_test_fixture f, bool request_is_success) { grpc_call* c; diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 5511e55ccc7..c208178b613 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -186,7 +186,7 @@ static void cb_watch_connectivity( } static void cb_shutdown(grpc_experimental_completion_queue_functor* functor, - int success) { + int /*success*/) { CallbackContext* cb_ctx = (CallbackContext*)functor; gpr_log(GPR_DEBUG, "cb_shutdown called, nothing to do"); diff --git a/test/core/end2end/tests/filter_call_init_fails.cc b/test/core/end2end/tests/filter_call_init_fails.cc index ab96879fe44..a5785d7338b 100644 --- a/test/core/end2end/tests/filter_call_init_fails.cc +++ b/test/core/end2end/tests/filter_call_init_fails.cc @@ -394,23 +394,23 @@ static void test_client_subchannel_filter(grpc_end2end_test_config config) { * Test filter - always fails to initialize a call */ -static grpc_error* init_call_elem(grpc_call_element* elem, - const grpc_call_element_args* args) { +static grpc_error* init_call_elem(grpc_call_element* /*elem*/, + const grpc_call_element_args* /*args*/) { return grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("access denied"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_PERMISSION_DENIED); } -static void destroy_call_elem(grpc_call_element* elem, - const grpc_call_final_info* final_info, - grpc_closure* ignored) {} +static void destroy_call_elem(grpc_call_element* /*elem*/, + const grpc_call_final_info* /*final_info*/, + grpc_closure* /*ignored*/) {} -static grpc_error* init_channel_elem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +static grpc_error* init_channel_elem(grpc_channel_element* /*elem*/, + grpc_channel_element_args* /*args*/) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* /*elem*/) {} static const grpc_channel_filter test_filter = { grpc_call_next_op, @@ -430,7 +430,7 @@ static const grpc_channel_filter test_filter = { */ static bool maybe_add_server_channel_filter(grpc_channel_stack_builder* builder, - void* arg) { + void* /*arg*/) { if (g_enable_server_channel_filter) { // Want to add the filter as close to the end as possible, to make // sure that all of the filters work well together. However, we @@ -449,7 +449,7 @@ static bool maybe_add_server_channel_filter(grpc_channel_stack_builder* builder, } static bool maybe_add_client_channel_filter(grpc_channel_stack_builder* builder, - void* arg) { + void* /*arg*/) { if (g_enable_client_channel_filter) { // Want to add the filter as close to the end as possible, to make // sure that all of the filters work well together. However, we @@ -468,7 +468,7 @@ static bool maybe_add_client_channel_filter(grpc_channel_stack_builder* builder, } static bool maybe_add_client_subchannel_filter( - grpc_channel_stack_builder* builder, void* arg) { + grpc_channel_stack_builder* builder, void* /*arg*/) { if (g_enable_client_subchannel_filter) { // Want to add the filter as close to the end as possible, to make // sure that all of the filters work well together. However, we diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index a7f4268803f..2e8d1e56663 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -218,21 +218,21 @@ static void start_transport_stream_op_batch( grpc_call_next_op(elem, op); } -static grpc_error* init_call_elem(grpc_call_element* elem, - const grpc_call_element_args* args) { +static grpc_error* init_call_elem(grpc_call_element* /*elem*/, + const grpc_call_element_args* /*args*/) { return GRPC_ERROR_NONE; } -static void destroy_call_elem(grpc_call_element* elem, - const grpc_call_final_info* final_info, - grpc_closure* ignored) {} +static void destroy_call_elem(grpc_call_element* /*elem*/, + const grpc_call_final_info* /*final_info*/, + grpc_closure* /*ignored*/) {} -static grpc_error* init_channel_elem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +static grpc_error* init_channel_elem(grpc_channel_element* /*elem*/, + grpc_channel_element_args* /*args*/) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* /*elem*/) {} static const grpc_channel_filter test_filter = { start_transport_stream_op_batch, @@ -251,7 +251,8 @@ static const grpc_channel_filter test_filter = { * Registration */ -static bool maybe_add_filter(grpc_channel_stack_builder* builder, void* arg) { +static bool maybe_add_filter(grpc_channel_stack_builder* builder, + void* /*arg*/) { if (g_enable_filter) { return grpc_channel_stack_builder_prepend_filter(builder, &test_filter, nullptr, nullptr); diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc index 1d5d9e5e46a..0c418748334 100644 --- a/test/core/end2end/tests/filter_context.cc +++ b/test/core/end2end/tests/filter_context.cc @@ -247,16 +247,16 @@ static void start_transport_stream_op_batch( grpc_call_next_op(elem, batch); } -static void destroy_call_elem(grpc_call_element* elem, - const grpc_call_final_info* final_info, - grpc_closure* ignored) {} +static void destroy_call_elem(grpc_call_element* /*elem*/, + const grpc_call_final_info* /*final_info*/, + grpc_closure* /*ignored*/) {} -static grpc_error* init_channel_elem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +static grpc_error* init_channel_elem(grpc_channel_element* /*elem*/, + grpc_channel_element_args* /*args*/) { return GRPC_ERROR_NONE; } -static void destroy_channel_elem(grpc_channel_element* elem) {} +static void destroy_channel_elem(grpc_channel_element* /*elem*/) {} static const grpc_channel_filter test_filter = { start_transport_stream_op_batch, From ec10d9ce90f1620e91892640c2b9f1df1433659b Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 17 Oct 2019 09:05:27 -0700 Subject: [PATCH 2/2] clang-format --- test/core/end2end/h2_ssl_cert_test.cc | 3 +-- test/core/end2end/inproc_callback_test.cc | 3 +-- test/core/end2end/tests/cancel_test_helpers.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 2a1cf42229e..9bdacc3f137 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -45,8 +45,7 @@ struct fullstack_secure_fixture_data { }; static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( - grpc_channel_args* /*client_args*/, - grpc_channel_args* /*server_args*/) { + grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); fullstack_secure_fixture_data* ffd = diff --git a/test/core/end2end/inproc_callback_test.cc b/test/core/end2end/inproc_callback_test.cc index a2b180c7096..15376c59d51 100644 --- a/test/core/end2end/inproc_callback_test.cc +++ b/test/core/end2end/inproc_callback_test.cc @@ -205,8 +205,7 @@ static grpc_experimental_completion_queue_functor* tag(intptr_t t) { } static grpc_end2end_test_fixture inproc_create_fixture( - grpc_channel_args* /*client_args*/, - grpc_channel_args* /*server_args*/) { + grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; inproc_fixture_data* ffd = static_cast( gpr_malloc(sizeof(inproc_fixture_data))); diff --git a/test/core/end2end/tests/cancel_test_helpers.h b/test/core/end2end/tests/cancel_test_helpers.h index 353d6eb9a7d..a2aa580c3ee 100644 --- a/test/core/end2end/tests/cancel_test_helpers.h +++ b/test/core/end2end/tests/cancel_test_helpers.h @@ -26,8 +26,7 @@ typedef struct { const char* expect_details; } cancellation_mode; -static grpc_call_error wait_for_deadline(grpc_call* /*call*/, - void* reserved) { +static grpc_call_error wait_for_deadline(grpc_call* /*call*/, void* reserved) { (void)reserved; return GRPC_CALL_OK; }