From ae1ed6641210c3d7bf570688d11b28c6460e4e9c Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 7 May 2018 21:43:22 +0200 Subject: Clean readability-inconsistent-declaration-parameter-name clang-tidy warnings --- src/gie.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/gie.c') diff --git a/src/gie.c b/src/gie.c index b81e6bdc..2f3e477d 100644 --- a/src/gie.c +++ b/src/gie.c @@ -134,15 +134,15 @@ typedef struct ffio { size_t level; } ffio; -static int get_inp (ffio *F); -static int skip_to_next_tag (ffio *F); -static int step_into_gie_block (ffio *F); -static int locate_tag (ffio *F, const char *tag); -static int nextline (ffio *F); -static int at_end_delimiter (ffio *F); -static const char *at_tag (ffio *F); -static int at_decorative_element (ffio *F); -static ffio *ffio_destroy (ffio *F); +static int get_inp (ffio *G); +static int skip_to_next_tag (ffio *G); +static int step_into_gie_block (ffio *G); +static int locate_tag (ffio *G, const char *tag); +static int nextline (ffio *G); +static int at_end_delimiter (ffio *G); +static const char *at_tag (ffio *G); +static int at_decorative_element (ffio *G); +static ffio *ffio_destroy (ffio *G); static ffio *ffio_create (const char **tags, size_t n_tags, size_t max_record_size); static const char *gie_tags[] = { @@ -1172,15 +1172,15 @@ See the PROJ ".gie" test suites for examples of supported formatting. -static int get_inp (ffio *F); -static int skip_to_next_tag (ffio *F); -static int step_into_gie_block (ffio *F); -static int locate_tag (ffio *F, const char *tag); -static int nextline (ffio *F); -static int at_end_delimiter (ffio *F); -static const char *at_tag (ffio *F); -static int at_decorative_element (ffio *F); -static ffio *ffio_destroy (ffio *F); +static int get_inp (ffio *G); +static int skip_to_next_tag (ffio *G); +static int step_into_gie_block (ffio *G); +static int locate_tag (ffio *G, const char *tag); +static int nextline (ffio *G); +static int at_end_delimiter (ffio *G); +static const char *at_tag (ffio *G); +static int at_decorative_element (ffio *G); +static ffio *ffio_destroy (ffio *G); static ffio *ffio_create (const char **tags, size_t n_tags, size_t max_record_size); -- cgit v1.2.3 From 11bfb050e4712c6b320b8a1256a36a66c60359c0 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 7 May 2018 21:51:42 +0200 Subject: Clean readability-redundant-declaratio clang-tidy warnings Function prototypes were declared twice for the FFIO framework, probably because FFIO at some point during development existed as a separate file. With this commit the second set of function prototypes is removed leaving only the first entry at the top of the file. Similarly duplicate header inclusions has been removed. --- src/gie.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/gie.c') diff --git a/src/gie.c b/src/gie.c index 2f3e477d..b912a3ac 100644 --- a/src/gie.c +++ b/src/gie.c @@ -1160,30 +1160,6 @@ See the PROJ ".gie" test suites for examples of supported formatting. ****************************************************************************************/ -#include -#include -#include - -#include -#include - -#include -#include - - - -static int get_inp (ffio *G); -static int skip_to_next_tag (ffio *G); -static int step_into_gie_block (ffio *G); -static int locate_tag (ffio *G, const char *tag); -static int nextline (ffio *G); -static int at_end_delimiter (ffio *G); -static const char *at_tag (ffio *G); -static int at_decorative_element (ffio *G); -static ffio *ffio_destroy (ffio *G); -static ffio *ffio_create (const char **tags, size_t n_tags, size_t max_record_size); - - /***************************************************************************************/ static ffio *ffio_create (const char **tags, size_t n_tags, size_t max_record_size) { -- cgit v1.2.3 From 2c5d2521b7e6c45e8dab44aa547c44d20925858f Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 7 May 2018 22:00:44 +0200 Subject: Clean readability-misleading-indentation clang-tidy warnings --- src/gie.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/gie.c') diff --git a/src/gie.c b/src/gie.c index b912a3ac..17f2cca0 100644 --- a/src/gie.c +++ b/src/gie.c @@ -303,9 +303,11 @@ int main (int argc, char **argv) { process_file (o->fargv[i]); if (T.verbosity > 0) { - if (o->fargc > 1) - fprintf (T.fout, "%sGrand total: %d. Success: %d, Skipped: %d, Failure: %d\n", - delim, T.grand_ok+T.grand_ko+T.grand_skip, T.grand_ok, T.grand_skip, T.grand_ko); + if (o->fargc > 1) { + fprintf (T.fout, "%sGrand total: %d. Success: %d, Skipped: %d, Failure: %d\n", + delim, T.grand_ok+T.grand_ko+T.grand_skip, T.grand_ok, T.grand_skip, + T.grand_ko); + } fprintf (T.fout, "%s", delim); if (T.verbosity > 1) { fprintf (T.fout, "Failing roundtrips: %4d, Succeeding roundtrips: %4d\n", fail_rtps, succ_rtps); @@ -414,10 +416,11 @@ static int process_file (const char *fname) { T.grand_ok += T.total_ok; T.grand_ko += T.total_ko; T.grand_skip += T.grand_skip; - if (T.verbosity > 0) - fprintf (T.fout, "%stotal: %2d tests succeeded, %2d tests skipped, %2d tests %s\n", - delim, T.total_ok, T.total_skip, T.total_ko, T.total_ko? "FAILED!": "failed."); - + if (T.verbosity > 0) { + fprintf (T.fout, "%stotal: %2d tests succeeded, %2d tests skipped, %2d tests %s\n", + delim, T.total_ok, T.total_skip, T.total_ko, + T.total_ko? "FAILED!": "failed."); + } if (F->level==0) return errmsg (-3, "File '%s':Missing '' cmnd - bye!\n", fname); if (F->level && F->level%2) -- cgit v1.2.3 From 1e8824517900d37232468b9e3d7f3724e7ffa786 Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Tue, 15 May 2018 13:42:20 -0700 Subject: IWYU: Partial PJ_natearth.c..rtodms.c --- src/gie.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gie.c') diff --git a/src/gie.c b/src/gie.c index 17f2cca0..e0effaa4 100644 --- a/src/gie.c +++ b/src/gie.c @@ -108,6 +108,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-10-01/2017-10-08 #include #include #include +#include #include #include #include -- cgit v1.2.3