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/json/fuzzer.c | 6 +-- test/core/json/json_rewrite.c | 88 ++++++++++++++++--------------- test/core/json/json_rewrite_test.c | 92 +++++++++++++++++---------------- test/core/json/json_stream_error_test.c | 6 +-- test/core/json/json_test.c | 23 +++++---- 5 files changed, 110 insertions(+), 105 deletions(-) (limited to 'test/core/json') diff --git a/test/core/json/fuzzer.c b/test/core/json/fuzzer.c index b825904d41..273886873c 100644 --- a/test/core/json/fuzzer.c +++ b/test/core/json/fuzzer.c @@ -29,13 +29,13 @@ bool squelch = true; bool leak_check = true; -int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - char *s; +int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + char* s; struct grpc_memory_counters counters; grpc_memory_counters_init(); s = gpr_malloc(size); memcpy(s, data, size); - grpc_json *x; + grpc_json* x; if ((x = grpc_json_parse_string_with_len(s, size))) { grpc_json_destroy(x); } diff --git a/test/core/json/json_rewrite.c b/test/core/json/json_rewrite.c index dfe32f5adf..3bd50e67b3 100644 --- a/test/core/json/json_rewrite.c +++ b/test/core/json/json_rewrite.c @@ -26,37 +26,39 @@ #include "src/core/lib/json/json_reader.h" #include "src/core/lib/json/json_writer.h" -typedef struct json_writer_userdata { FILE *out; } json_writer_userdata; +typedef struct json_writer_userdata { + FILE* out; +} json_writer_userdata; typedef struct stacked_container { grpc_json_type type; - struct stacked_container *next; + struct stacked_container* next; } stacked_container; typedef struct json_reader_userdata { - FILE *in; - grpc_json_writer *writer; - char *scratchpad; - char *ptr; + FILE* in; + grpc_json_writer* writer; + char* scratchpad; + char* ptr; size_t free_space; size_t allocated; size_t string_len; - stacked_container *top; + stacked_container* top; } json_reader_userdata; -static void json_writer_output_char(void *userdata, char c) { - json_writer_userdata *state = userdata; +static void json_writer_output_char(void* userdata, char c) { + json_writer_userdata* state = userdata; fputc(c, state->out); } -static void json_writer_output_string(void *userdata, const char *str) { - json_writer_userdata *state = userdata; +static void json_writer_output_string(void* userdata, const char* str) { + json_writer_userdata* state = userdata; fputs(str, state->out); } -static void json_writer_output_string_with_len(void *userdata, const char *str, +static void json_writer_output_string_with_len(void* userdata, const char* str, size_t len) { - json_writer_userdata *state = userdata; + json_writer_userdata* state = userdata; fwrite(str, len, 1, state->out); } @@ -64,7 +66,7 @@ grpc_json_writer_vtable writer_vtable = {json_writer_output_char, json_writer_output_string, json_writer_output_string_with_len}; -static void check_string(json_reader_userdata *state, size_t needed) { +static void check_string(json_reader_userdata* state, size_t needed) { if (state->free_space >= needed) return; needed -= state->free_space; needed = (needed + 0xffu) & ~0xffu; @@ -73,20 +75,20 @@ static void check_string(json_reader_userdata *state, size_t needed) { state->allocated += needed; } -static void json_reader_string_clear(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_string_clear(void* userdata) { + json_reader_userdata* state = userdata; state->free_space = state->allocated; state->string_len = 0; } -static void json_reader_string_add_char(void *userdata, uint32_t c) { - json_reader_userdata *state = userdata; +static void json_reader_string_add_char(void* userdata, uint32_t c) { + json_reader_userdata* state = userdata; check_string(state, 1); GPR_ASSERT(c < 256); state->scratchpad[state->string_len++] = (char)c; } -static void json_reader_string_add_utf32(void *userdata, uint32_t c) { +static void json_reader_string_add_utf32(void* userdata, uint32_t c) { if (c <= 0x7f) { json_reader_string_add_char(userdata, c); } else if (c <= 0x7ff) { @@ -113,18 +115,18 @@ static void json_reader_string_add_utf32(void *userdata, uint32_t c) { } } -static uint32_t json_reader_read_char(void *userdata) { +static uint32_t json_reader_read_char(void* userdata) { int r; - json_reader_userdata *state = userdata; + json_reader_userdata* state = userdata; r = fgetc(state->in); if (r == EOF) r = GRPC_JSON_READ_CHAR_EOF; return (uint32_t)r; } -static void json_reader_container_begins(void *userdata, grpc_json_type type) { - json_reader_userdata *state = userdata; - stacked_container *container = gpr_malloc(sizeof(stacked_container)); +static void json_reader_container_begins(void* userdata, grpc_json_type type) { + json_reader_userdata* state = userdata; + stacked_container* container = gpr_malloc(sizeof(stacked_container)); container->type = type; container->next = state->top; @@ -133,9 +135,9 @@ static void json_reader_container_begins(void *userdata, grpc_json_type type) { grpc_json_writer_container_begins(state->writer, type); } -static grpc_json_type json_reader_container_ends(void *userdata) { - json_reader_userdata *state = userdata; - stacked_container *container = state->top; +static grpc_json_type json_reader_container_ends(void* userdata) { + json_reader_userdata* state = userdata; + stacked_container* container = state->top; grpc_json_writer_container_ends(state->writer, container->type); state->top = container->next; @@ -143,22 +145,22 @@ static grpc_json_type json_reader_container_ends(void *userdata) { return state->top ? state->top->type : GRPC_JSON_TOP_LEVEL; } -static void json_reader_set_key(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_key(void* userdata) { + json_reader_userdata* state = userdata; json_reader_string_add_char(userdata, 0); grpc_json_writer_object_key(state->writer, state->scratchpad); } -static void json_reader_set_string(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_string(void* userdata) { + json_reader_userdata* state = userdata; json_reader_string_add_char(userdata, 0); grpc_json_writer_value_string(state->writer, state->scratchpad); } -static int json_reader_set_number(void *userdata) { - json_reader_userdata *state = userdata; +static int json_reader_set_number(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, state->scratchpad, state->string_len); @@ -166,20 +168,20 @@ static int json_reader_set_number(void *userdata) { return 1; } -static void json_reader_set_true(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_true(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, "true", 4); } -static void json_reader_set_false(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_false(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, "false", 5); } -static void json_reader_set_null(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_null(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, "null", 4); } @@ -192,7 +194,7 @@ static grpc_json_reader_vtable reader_vtable = { json_reader_set_number, json_reader_set_true, json_reader_set_false, json_reader_set_null}; -int rewrite(FILE *in, FILE *out, int indent) { +int rewrite(FILE* in, FILE* out, int indent) { grpc_json_writer writer; grpc_json_reader reader; grpc_json_reader_status status; @@ -216,7 +218,7 @@ int rewrite(FILE *in, FILE *out, int indent) { free(reader_user.scratchpad); while (reader_user.top) { - stacked_container *container = reader_user.top; + stacked_container* container = reader_user.top; reader_user.top = container->next; free(container); } @@ -224,9 +226,9 @@ int rewrite(FILE *in, FILE *out, int indent) { return status == GRPC_JSON_DONE; } -int main(int argc, char **argv) { +int main(int argc, char** argv) { int indent = 2; - gpr_cmdline *cl; + gpr_cmdline* cl; cl = gpr_cmdline_create(NULL); gpr_cmdline_add_int(cl, "indent", NULL, &indent); diff --git a/test/core/json/json_rewrite_test.c b/test/core/json/json_rewrite_test.c index a654971b34..a83989f402 100644 --- a/test/core/json/json_rewrite_test.c +++ b/test/core/json/json_rewrite_test.c @@ -27,27 +27,29 @@ #include "src/core/lib/json/json_reader.h" #include "src/core/lib/json/json_writer.h" -typedef struct json_writer_userdata { FILE *cmp; } json_writer_userdata; +typedef struct json_writer_userdata { + FILE* cmp; +} json_writer_userdata; typedef struct stacked_container { grpc_json_type type; - struct stacked_container *next; + struct stacked_container* next; } stacked_container; typedef struct json_reader_userdata { - FILE *in; - grpc_json_writer *writer; - char *scratchpad; - char *ptr; + FILE* in; + grpc_json_writer* writer; + char* scratchpad; + char* ptr; size_t free_space; size_t allocated; size_t string_len; - stacked_container *top; + stacked_container* top; int did_eagain; } json_reader_userdata; -static void json_writer_output_char(void *userdata, char c) { - json_writer_userdata *state = userdata; +static void json_writer_output_char(void* userdata, char c) { + json_writer_userdata* state = userdata; int cmp = fgetc(state->cmp); /* treat CRLF as LF */ @@ -57,13 +59,13 @@ static void json_writer_output_char(void *userdata, char c) { GPR_ASSERT(cmp == c); } -static void json_writer_output_string(void *userdata, const char *str) { +static void json_writer_output_string(void* userdata, const char* str) { while (*str) { json_writer_output_char(userdata, *str++); } } -static void json_writer_output_string_with_len(void *userdata, const char *str, +static void json_writer_output_string_with_len(void* userdata, const char* str, size_t len) { size_t i; for (i = 0; i < len; i++) { @@ -75,7 +77,7 @@ grpc_json_writer_vtable writer_vtable = {json_writer_output_char, json_writer_output_string, json_writer_output_string_with_len}; -static void check_string(json_reader_userdata *state, size_t needed) { +static void check_string(json_reader_userdata* state, size_t needed) { if (state->free_space >= needed) return; needed -= state->free_space; needed = (needed + 0xffu) & ~0xffu; @@ -84,20 +86,20 @@ static void check_string(json_reader_userdata *state, size_t needed) { state->allocated += needed; } -static void json_reader_string_clear(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_string_clear(void* userdata) { + json_reader_userdata* state = userdata; state->free_space = state->allocated; state->string_len = 0; } -static void json_reader_string_add_char(void *userdata, uint32_t c) { - json_reader_userdata *state = userdata; +static void json_reader_string_add_char(void* userdata, uint32_t c) { + json_reader_userdata* state = userdata; check_string(state, 1); GPR_ASSERT(c <= 256); state->scratchpad[state->string_len++] = (char)c; } -static void json_reader_string_add_utf32(void *userdata, uint32_t c) { +static void json_reader_string_add_utf32(void* userdata, uint32_t c) { if (c <= 0x7f) { json_reader_string_add_char(userdata, c); } else if (c <= 0x7ffu) { @@ -124,9 +126,9 @@ static void json_reader_string_add_utf32(void *userdata, uint32_t c) { } } -static uint32_t json_reader_read_char(void *userdata) { +static uint32_t json_reader_read_char(void* userdata) { int r; - json_reader_userdata *state = userdata; + json_reader_userdata* state = userdata; if (!state->did_eagain) { state->did_eagain = 1; @@ -140,9 +142,9 @@ static uint32_t json_reader_read_char(void *userdata) { return (uint32_t)r; } -static void json_reader_container_begins(void *userdata, grpc_json_type type) { - json_reader_userdata *state = userdata; - stacked_container *container = gpr_malloc(sizeof(stacked_container)); +static void json_reader_container_begins(void* userdata, grpc_json_type type) { + json_reader_userdata* state = userdata; + stacked_container* container = gpr_malloc(sizeof(stacked_container)); container->type = type; container->next = state->top; @@ -151,9 +153,9 @@ static void json_reader_container_begins(void *userdata, grpc_json_type type) { grpc_json_writer_container_begins(state->writer, type); } -static grpc_json_type json_reader_container_ends(void *userdata) { - json_reader_userdata *state = userdata; - stacked_container *container = state->top; +static grpc_json_type json_reader_container_ends(void* userdata) { + json_reader_userdata* state = userdata; + stacked_container* container = state->top; grpc_json_writer_container_ends(state->writer, container->type); state->top = container->next; @@ -161,22 +163,22 @@ static grpc_json_type json_reader_container_ends(void *userdata) { return state->top ? state->top->type : GRPC_JSON_TOP_LEVEL; } -static void json_reader_set_key(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_key(void* userdata) { + json_reader_userdata* state = userdata; json_reader_string_add_char(userdata, 0); grpc_json_writer_object_key(state->writer, state->scratchpad); } -static void json_reader_set_string(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_string(void* userdata) { + json_reader_userdata* state = userdata; json_reader_string_add_char(userdata, 0); grpc_json_writer_value_string(state->writer, state->scratchpad); } -static int json_reader_set_number(void *userdata) { - json_reader_userdata *state = userdata; +static int json_reader_set_number(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, state->scratchpad, state->string_len); @@ -184,20 +186,20 @@ static int json_reader_set_number(void *userdata) { return 1; } -static void json_reader_set_true(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_true(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, "true", 4); } -static void json_reader_set_false(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_false(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, "false", 5); } -static void json_reader_set_null(void *userdata) { - json_reader_userdata *state = userdata; +static void json_reader_set_null(void* userdata) { + json_reader_userdata* state = userdata; grpc_json_writer_value_raw_with_len(state->writer, "null", 4); } @@ -210,7 +212,7 @@ static grpc_json_reader_vtable reader_vtable = { json_reader_set_number, json_reader_set_true, json_reader_set_false, json_reader_set_null}; -int rewrite_and_compare(FILE *in, FILE *cmp, int indent) { +int rewrite_and_compare(FILE* in, FILE* cmp, int indent) { grpc_json_writer writer; grpc_json_reader reader; grpc_json_reader_status status; @@ -240,7 +242,7 @@ int rewrite_and_compare(FILE *in, FILE *cmp, int indent) { free(reader_user.scratchpad); while (reader_user.top) { - stacked_container *container = reader_user.top; + stacked_container* container = reader_user.top; reader_user.top = container->next; free(container); } @@ -249,8 +251,8 @@ int rewrite_and_compare(FILE *in, FILE *cmp, int indent) { } typedef struct test_file { - const char *input; - const char *cmp; + const char* input; + const char* cmp; int indent; } test_file; @@ -269,9 +271,9 @@ void test_rewrites() { unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(test_files); i++) { - test_file *test = test_files + i; - FILE *input = fopen(test->input, "rb"); - FILE *cmp = fopen(test->cmp, "rb"); + test_file* test = test_files + i; + FILE* input = fopen(test->input, "rb"); + FILE* cmp = fopen(test->cmp, "rb"); int status; gpr_log(GPR_INFO, "Testing file %s against %s using indent=%i", test->input, test->cmp, test->indent); @@ -282,7 +284,7 @@ void test_rewrites() { } } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); test_rewrites(); gpr_log(GPR_INFO, "json_rewrite_test success"); diff --git a/test/core/json/json_stream_error_test.c b/test/core/json/json_stream_error_test.c index 379cd5d078..975ccd2b42 100644 --- a/test/core/json/json_stream_error_test.c +++ b/test/core/json/json_stream_error_test.c @@ -29,12 +29,12 @@ static int g_string_clear_once = 0; -static void string_clear(void *userdata) { +static void string_clear(void* userdata) { GPR_ASSERT(!g_string_clear_once); g_string_clear_once = 1; } -static uint32_t read_char(void *userdata) { return GRPC_JSON_READ_CHAR_ERROR; } +static uint32_t read_char(void* userdata) { return GRPC_JSON_READ_CHAR_ERROR; } static grpc_json_reader_vtable reader_vtable = { string_clear, NULL, NULL, read_char, NULL, NULL, @@ -49,7 +49,7 @@ static void read_error() { GPR_ASSERT(status == GRPC_JSON_READ_ERROR); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); read_error(); gpr_log(GPR_INFO, "json_stream_error success"); diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c index bbc6f7a4e6..9e4d351dd7 100644 --- a/test/core/json/json_test.c +++ b/test/core/json/json_test.c @@ -28,8 +28,8 @@ #include "test/core/util/test_config.h" typedef struct testing_pair { - const char *input; - const char *output; + const char* input; + const char* output; } testing_pair; static testing_pair testing_pairs[] = { @@ -52,7 +52,8 @@ static testing_pair testing_pairs[] = { {"{\"\\ud834\\udd1e\":0}", "{\"\\ud834\\udd1e\":0}"}, /* Testing nested empty containers. */ { - " [ [ ] , { } , [ ] ] ", "[[],{},[]]", + " [ [ ] , { } , [ ] ] ", + "[[],{},[]]", }, /* Testing escapes and control chars in key strings. */ {" { \"\\u007f\x7f\\n\\r\\\"\\f\\b\\\\a , b\": 1, \"\": 0 } ", @@ -139,16 +140,16 @@ static void test_pairs() { unsigned i; for (i = 0; i < GPR_ARRAY_SIZE(testing_pairs); i++) { - testing_pair *pair = testing_pairs + i; - char *scratchpad = gpr_strdup(pair->input); - grpc_json *json; + testing_pair* pair = testing_pairs + i; + char* scratchpad = gpr_strdup(pair->input); + grpc_json* json; gpr_log(GPR_INFO, "parsing string %i - should %s", i, pair->output ? "succeed" : "fail"); json = grpc_json_parse_string(scratchpad); if (pair->output) { - char *output; + char* output; GPR_ASSERT(json); output = grpc_json_dump_to_string(json, 0); @@ -168,9 +169,9 @@ static void test_pairs() { } static void test_atypical() { - char *scratchpad = gpr_strdup("[[],[],[]]"); - grpc_json *json = grpc_json_parse_string(scratchpad); - grpc_json *brother; + char* scratchpad = gpr_strdup("[[],[],[]]"); + grpc_json* json = grpc_json_parse_string(scratchpad); + grpc_json* brother; GPR_ASSERT(json); GPR_ASSERT(json->child); @@ -182,7 +183,7 @@ static void test_atypical() { gpr_free(scratchpad); } -int main(int argc, char **argv) { +int main(int argc, char** argv) { grpc_test_init(argc, argv); test_pairs(); test_atypical(); -- cgit v1.2.3