From baa14a975ef92ee6fb301f0e684f56f18f2c55a7 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 3 Nov 2017 09:09:36 -0700 Subject: Update clang-format to 5.0 --- test/core/http/format_request_test.c | 2 +- test/core/http/httpcli_test.c | 38 ++++++++++++++++---------------- test/core/http/httpscli_test.c | 38 ++++++++++++++++---------------- test/core/http/parser_test.c | 42 ++++++++++++++++++------------------ test/core/http/request_fuzzer.c | 4 ++-- test/core/http/response_fuzzer.c | 4 ++-- 6 files changed, 64 insertions(+), 64 deletions(-) (limited to 'test/core/http') diff --git a/test/core/http/format_request_test.c b/test/core/http/format_request_test.c index 0279a1b5e3..a1476e1b39 100644 --- a/test/core/http/format_request_test.c +++ b/test/core/http/format_request_test.c @@ -137,7 +137,7 @@ static void test_format_post_request_content_type_override(void) { grpc_slice_unref(slice); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); test_format_get_request(); diff --git a/test/core/http/httpcli_test.c b/test/core/http/httpcli_test.c index cc1c16d695..8c22b644e7 100644 --- a/test/core/http/httpcli_test.c +++ b/test/core/http/httpcli_test.c @@ -32,7 +32,7 @@ static int g_done = 0; static grpc_httpcli_context g_context; -static gpr_mu *g_mu; +static gpr_mu* g_mu; static grpc_polling_entity g_pops; static grpc_millis n_seconds_time(int seconds) { @@ -40,11 +40,11 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { - const char *expect = +static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + const char* expect = "Hello world!" "

This is a test

"; - grpc_http_response *response = arg; + grpc_http_response* response = arg; GPR_ASSERT(response); GPR_ASSERT(response->status == 200); GPR_ASSERT(response->body_length == strlen(expect)); @@ -59,7 +59,7 @@ static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { static void test_get(int port) { grpc_httpcli_request req; - char *host; + char* host; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; @@ -75,7 +75,7 @@ static void test_get(int port) { grpc_http_response response; memset(&response, 0, sizeof(response)); - grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_get"); + grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), @@ -83,7 +83,7 @@ static void test_get(int port) { grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { - grpc_pollset_worker *worker = NULL; + grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), @@ -99,7 +99,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; - char *host; + char* host; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; @@ -115,7 +115,7 @@ static void test_post(int port) { grpc_http_response response; memset(&response, 0, sizeof(response)); - grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_post"); + grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), @@ -124,7 +124,7 @@ static void test_post(int port) { grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { - grpc_pollset_worker *worker = NULL; + grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), @@ -138,21 +138,21 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, grpc_error *error) { +static void destroy_pops(grpc_exec_ctx* exec_ctx, void* p, grpc_error* error) { grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset(p)); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_closure destroyed; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_subprocess *server; - char *me = argv[0]; - char *lslash = strrchr(me, '/'); - char *args[4]; + gpr_subprocess* server; + char* me = argv[0]; + char* lslash = strrchr(me, '/'); + char* args[4]; int port = grpc_pick_unused_port_or_die(); int arg_shift = 0; /* figure out where we are */ - char *root; + char* root; if (lslash) { root = gpr_malloc((size_t)(lslash - me + 1)); memcpy(root, me, (size_t)(lslash - me)); @@ -173,7 +173,7 @@ int main(int argc, char **argv) { /* start the server */ args[1 + arg_shift] = "--port"; gpr_asprintf(&args[2 + arg_shift], "%d", port); - server = gpr_subprocess_create(3 + arg_shift, (const char **)args); + server = gpr_subprocess_create(3 + arg_shift, (const char**)args); GPR_ASSERT(server); gpr_free(args[0]); if (arg_shift) gpr_free(args[1]); @@ -186,7 +186,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); grpc_httpcli_context_init(&g_context); - grpc_pollset *pollset = gpr_zalloc(grpc_pollset_size()); + grpc_pollset* pollset = gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(pollset, &g_mu); g_pops = grpc_polling_entity_create_from_pollset(pollset); diff --git a/test/core/http/httpscli_test.c b/test/core/http/httpscli_test.c index f8a3cfdd76..b375d46b9f 100644 --- a/test/core/http/httpscli_test.c +++ b/test/core/http/httpscli_test.c @@ -32,7 +32,7 @@ static int g_done = 0; static grpc_httpcli_context g_context; -static gpr_mu *g_mu; +static gpr_mu* g_mu; static grpc_polling_entity g_pops; static grpc_millis n_seconds_time(int seconds) { @@ -40,11 +40,11 @@ static grpc_millis n_seconds_time(int seconds) { grpc_timeout_seconds_to_deadline(seconds)); } -static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { - const char *expect = +static void on_finish(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { + const char* expect = "Hello world!" "

This is a test

"; - grpc_http_response *response = arg; + grpc_http_response* response = arg; GPR_ASSERT(response); GPR_ASSERT(response->status == 200); GPR_ASSERT(response->body_length == strlen(expect)); @@ -59,7 +59,7 @@ static void on_finish(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { static void test_get(int port) { grpc_httpcli_request req; - char *host; + char* host; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; @@ -76,7 +76,7 @@ static void test_get(int port) { grpc_http_response response; memset(&response, 0, sizeof(response)); - grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_get"); + grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_get"); grpc_httpcli_get( &exec_ctx, &g_context, &g_pops, resource_quota, &req, n_seconds_time(15), GRPC_CLOSURE_CREATE(on_finish, &response, grpc_schedule_on_exec_ctx), @@ -84,7 +84,7 @@ static void test_get(int port) { grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { - grpc_pollset_worker *worker = NULL; + grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), @@ -100,7 +100,7 @@ static void test_get(int port) { static void test_post(int port) { grpc_httpcli_request req; - char *host; + char* host; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; g_done = 0; @@ -117,7 +117,7 @@ static void test_post(int port) { grpc_http_response response; memset(&response, 0, sizeof(response)); - grpc_resource_quota *resource_quota = grpc_resource_quota_create("test_post"); + grpc_resource_quota* resource_quota = grpc_resource_quota_create("test_post"); grpc_httpcli_post( &exec_ctx, &g_context, &g_pops, resource_quota, &req, "hello", 5, n_seconds_time(15), @@ -126,7 +126,7 @@ static void test_post(int port) { grpc_resource_quota_unref_internal(&exec_ctx, resource_quota); gpr_mu_lock(g_mu); while (!g_done) { - grpc_pollset_worker *worker = NULL; + grpc_pollset_worker* worker = NULL; GPR_ASSERT(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), @@ -140,21 +140,21 @@ static void test_post(int port) { grpc_http_response_destroy(&response); } -static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, grpc_error *error) { +static void destroy_pops(grpc_exec_ctx* exec_ctx, void* p, grpc_error* error) { grpc_pollset_destroy(exec_ctx, grpc_polling_entity_pollset(p)); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_closure destroyed; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - gpr_subprocess *server; - char *me = argv[0]; - char *lslash = strrchr(me, '/'); - char *args[5]; + gpr_subprocess* server; + char* me = argv[0]; + char* lslash = strrchr(me, '/'); + char* args[5]; int port = grpc_pick_unused_port_or_die(); int arg_shift = 0; /* figure out where we are */ - char *root; + char* root; if (lslash) { root = gpr_malloc((size_t)(lslash - me + 1)); memcpy(root, me, (size_t)(lslash - me)); @@ -176,7 +176,7 @@ int main(int argc, char **argv) { args[1 + arg_shift] = "--port"; gpr_asprintf(&args[2 + arg_shift], "%d", port); args[3 + arg_shift] = "--ssl"; - server = gpr_subprocess_create(4 + arg_shift, (const char **)args); + server = gpr_subprocess_create(4 + arg_shift, (const char**)args); GPR_ASSERT(server); gpr_free(args[0]); if (arg_shift) gpr_free(args[1]); @@ -189,7 +189,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); grpc_httpcli_context_init(&g_context); - grpc_pollset *pollset = gpr_zalloc(grpc_pollset_size()); + grpc_pollset* pollset = gpr_zalloc(grpc_pollset_size()); grpc_pollset_init(pollset, &g_mu); g_pops = grpc_polling_entity_create_from_pollset(pollset); diff --git a/test/core/http/parser_test.c b/test/core/http/parser_test.c index a7044c03bc..9a8528ddc8 100644 --- a/test/core/http/parser_test.c +++ b/test/core/http/parser_test.c @@ -29,14 +29,14 @@ #include "test/core/util/test_config.h" static void test_request_succeeds(grpc_slice_split_mode split_mode, - char *request_text, char *expect_method, + char* request_text, char* expect_method, grpc_http_version expect_version, - char *expect_path, char *expect_body, ...) { + char* expect_path, char* expect_body, ...) { grpc_http_parser parser; grpc_slice input_slice = grpc_slice_from_copied_string(request_text); size_t num_slices; size_t i; - grpc_slice *slices; + grpc_slice* slices; va_list args; grpc_http_request request; memset(&request, 0, sizeof(request)); @@ -68,12 +68,12 @@ static void test_request_succeeds(grpc_slice_split_mode split_mode, va_start(args, expect_body); i = 0; for (;;) { - char *expect_key; - char *expect_value; - expect_key = va_arg(args, char *); + char* expect_key; + char* expect_value; + expect_key = va_arg(args, char*); if (!expect_key) break; GPR_ASSERT(i < request.hdr_count); - expect_value = va_arg(args, char *); + expect_value = va_arg(args, char*); GPR_ASSERT(expect_value); GPR_ASSERT(0 == strcmp(expect_key, request.hdrs[i].key)); GPR_ASSERT(0 == strcmp(expect_value, request.hdrs[i].value)); @@ -87,13 +87,13 @@ static void test_request_succeeds(grpc_slice_split_mode split_mode, gpr_free(slices); } -static void test_succeeds(grpc_slice_split_mode split_mode, char *response_text, - int expect_status, char *expect_body, ...) { +static void test_succeeds(grpc_slice_split_mode split_mode, char* response_text, + int expect_status, char* expect_body, ...) { grpc_http_parser parser; grpc_slice input_slice = grpc_slice_from_copied_string(response_text); size_t num_slices; size_t i; - grpc_slice *slices; + grpc_slice* slices; va_list args; grpc_http_response response; memset(&response, 0, sizeof(response)); @@ -122,12 +122,12 @@ static void test_succeeds(grpc_slice_split_mode split_mode, char *response_text, va_start(args, expect_body); i = 0; for (;;) { - char *expect_key; - char *expect_value; - expect_key = va_arg(args, char *); + char* expect_key; + char* expect_value; + expect_key = va_arg(args, char*); if (!expect_key) break; GPR_ASSERT(i < response.hdr_count); - expect_value = va_arg(args, char *); + expect_value = va_arg(args, char*); GPR_ASSERT(expect_value); GPR_ASSERT(0 == strcmp(expect_key, response.hdrs[i].key)); GPR_ASSERT(0 == strcmp(expect_value, response.hdrs[i].value)); @@ -141,13 +141,13 @@ static void test_succeeds(grpc_slice_split_mode split_mode, char *response_text, gpr_free(slices); } -static void test_fails(grpc_slice_split_mode split_mode, char *response_text) { +static void test_fails(grpc_slice_split_mode split_mode, char* response_text) { grpc_http_parser parser; grpc_slice input_slice = grpc_slice_from_copied_string(response_text); size_t num_slices; size_t i; - grpc_slice *slices; - grpc_error *error = GRPC_ERROR_NONE; + grpc_slice* slices; + grpc_error* error = GRPC_ERROR_NONE; grpc_http_response response; memset(&response, 0, sizeof(response)); @@ -174,13 +174,13 @@ static void test_fails(grpc_slice_split_mode split_mode, char *response_text) { } static void test_request_fails(grpc_slice_split_mode split_mode, - char *request_text) { + char* request_text) { grpc_http_parser parser; grpc_slice input_slice = grpc_slice_from_copied_string(request_text); size_t num_slices; size_t i; - grpc_slice *slices; - grpc_error *error = GRPC_ERROR_NONE; + grpc_slice* slices; + grpc_error* error = GRPC_ERROR_NONE; grpc_http_request request; memset(&request, 0, sizeof(request)); @@ -206,7 +206,7 @@ static void test_request_fails(grpc_slice_split_mode split_mode, gpr_free(slices); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { size_t i; const grpc_slice_split_mode split_modes[] = {GRPC_SLICE_SPLIT_IDENTITY, GRPC_SLICE_SPLIT_ONE_BYTE}; diff --git a/test/core/http/request_fuzzer.c b/test/core/http/request_fuzzer.c index aefe9eb0f9..3f685711ff 100644 --- a/test/core/http/request_fuzzer.c +++ b/test/core/http/request_fuzzer.c @@ -27,12 +27,12 @@ bool squelch = true; bool leak_check = true; -int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { +int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_request request; memset(&request, 0, sizeof(request)); grpc_http_parser_init(&parser, GRPC_HTTP_REQUEST, &request); - grpc_slice slice = grpc_slice_from_copied_buffer((const char *)data, size); + grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); GRPC_ERROR_UNREF(grpc_http_parser_parse(&parser, slice, NULL)); GRPC_ERROR_UNREF(grpc_http_parser_eof(&parser)); grpc_slice_unref(slice); diff --git a/test/core/http/response_fuzzer.c b/test/core/http/response_fuzzer.c index d5bb67500d..b41a340f18 100644 --- a/test/core/http/response_fuzzer.c +++ b/test/core/http/response_fuzzer.c @@ -26,12 +26,12 @@ bool squelch = true; bool leak_check = true; -int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { +int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_http_parser parser; grpc_http_response response; memset(&response, 0, sizeof(response)); grpc_http_parser_init(&parser, GRPC_HTTP_RESPONSE, &response); - grpc_slice slice = grpc_slice_from_copied_buffer((const char *)data, size); + grpc_slice slice = grpc_slice_from_copied_buffer((const char*)data, size); GRPC_ERROR_UNREF(grpc_http_parser_parse(&parser, slice, NULL)); GRPC_ERROR_UNREF(grpc_http_parser_eof(&parser)); grpc_slice_unref(slice); -- cgit v1.2.3