From 2ff8751874e7b3c1fc8480215d98cca3c48ea37b Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Sat, 2 Sep 2023 11:20:10 +0200 Subject: linter fehler/warnungen behoben und bessere Benamung verschiedener Variablen --- csv-test.c | 204 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 103 insertions(+), 101 deletions(-) (limited to 'csv-test.c') diff --git a/csv-test.c b/csv-test.c index ab996b4..854df7f 100644 --- a/csv-test.c +++ b/csv-test.c @@ -12,8 +12,8 @@ f = fmemopen(data, sizeof(data) - 1, "r"); \ assert(f != NULL) -#define FMEMCLOSE(f) \ - fclose(f); \ +#define FMEMCLOSE(f) \ + (void) fclose(f); \ f = NULL #define UNUSED(x) (void) (sizeof((x), 0)) @@ -36,64 +36,64 @@ test_empty_object(void) void test_line_endings1(void) { - FILE *f; - csv_t csv = { 0 }; + FILE *file = NULL; + csv_t csv = { 0 }; char data[] = "A,B,C\r\n" "D,E,F\n"; - FMEMOPEN(f, data); + FMEMOPEN(file, data); - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "D") == 0); assert(strcmp(csv_field(&csv, 1), "E") == 0); assert(strcmp(csv_field(&csv, 2), "F") == 0); - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); - FMEMCLOSE(f); + FMEMCLOSE(file); } void test_line_endings2(void) { - FILE *f; - csv_t csv = { 0 }; + FILE *file = NULL; + csv_t csv = { 0 }; char data[] = "A,B,C\r\n" "D,E,F"; - FMEMOPEN(f, data); + FMEMOPEN(file, data); - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "D") == 0); assert(strcmp(csv_field(&csv, 1), "E") == 0); assert(strcmp(csv_field(&csv, 2), "F") == 0); - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); - FMEMCLOSE(f); + FMEMCLOSE(file); } void test_empty_fields(void) { - FILE *f; - csv_t csv = { 0 }; + FILE *file = NULL; + csv_t csv = { 0 }; char data[] = "\n" "\r" @@ -115,134 +115,134 @@ test_empty_fields(void) "\"\",\"\",\r\n" ",,"; - FMEMOPEN(f, data); + FMEMOPEN(file, data); // Line 1 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 2 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 3 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 4 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 5 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 6 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 7 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 8 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 9 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 10 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 11 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 12 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 13 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 14 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 15 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 16 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 17 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 18 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 19 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "") == 0); assert(strcmp(csv_field(&csv, 1), "") == 0); assert(strcmp(csv_field(&csv, 2), "") == 0); // EOF - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); - FMEMCLOSE(f); + FMEMCLOSE(file); } void test_simple_fields(void) { - FILE *f; - csv_t csv = { 0 }; + FILE *file = NULL; + csv_t csv = { 0 }; char data[] = "A\n" "A\r" @@ -264,140 +264,140 @@ test_simple_fields(void) "\"A\",\"B\",C\r\n" "A,B,C"; - FMEMOPEN(f, data); + FMEMOPEN(file, data); // Line 1 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 2 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 3 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 4 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 5 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 6 - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 7 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 8 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 9 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 10 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 11 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 12 - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 13 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 14 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 15 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 16 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 17 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 18 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 19 - assert(csv_read(&csv, f) == 3); + assert(csv_read(&csv, file) == 3); assert(csv_nfields(&csv) == 3); assert(strcmp(csv_field(&csv, 0), "A") == 0); assert(strcmp(csv_field(&csv, 1), "B") == 0); assert(strcmp(csv_field(&csv, 2), "C") == 0); // EOF - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); - FMEMCLOSE(f); + FMEMCLOSE(file); } void test_quoted_fields(void) { - FILE *f; - csv_t csv = { 0 }; + FILE *file = NULL; + csv_t csv = { 0 }; char data[] = "foo \"baz\" bar,foo \"\"baz\"\" bar,\"foo \"\"baz\"\" bar\",\"foo \"baz\" bar\",\"foo \"\"baz\"\", bar\""; - FMEMOPEN(f, data); + FMEMOPEN(file, data); - assert(csv_read(&csv, f) == 5); + assert(csv_read(&csv, file) == 5); assert(csv_nfields(&csv) == 5); assert(strcmp(csv_field(&csv, 0), "foo \"baz\" bar") == 0); assert(strcmp(csv_field(&csv, 1), "foo \"\"baz\"\" bar") == 0); @@ -405,28 +405,28 @@ test_quoted_fields(void) assert(strcmp(csv_field(&csv, 3), "foo \"baz\" bar") == 0); assert(strcmp(csv_field(&csv, 4), "foo \"baz\", bar") == 0); - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); - FMEMCLOSE(f); + FMEMCLOSE(file); } void test_wrong_quoted_field(void) { - FILE *f; - csv_t csv = { 0 }; + FILE *file = NULL; + csv_t csv = { 0 }; char data[] = "\"foo"; - FMEMOPEN(f, data); + FMEMOPEN(file, data); - assert(csv_read(&csv, f) == 1); + assert(csv_read(&csv, file) == 1); assert(csv_nfields(&csv) == 1); assert(strcmp(csv_field(&csv, 0), "foo") == 0); - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); - FMEMCLOSE(f); + FMEMCLOSE(file); } static void @@ -446,14 +446,14 @@ test_out_of_range_error(void) csv_t csv; csv_init_opt(&csv, &csv_options); - FILE *f; + FILE *file = NULL; char data[] = ","; - FMEMOPEN(f, data); + FMEMOPEN(file, data); switch ( setjmp(env) ) { case CSV_ERR_OK: - assert(csv_read(&csv, f) == 2); + assert(csv_read(&csv, file) == 2); assert(csv_nfields(&csv) == 2); // force an "out of range"-Exception! @@ -468,7 +468,7 @@ test_out_of_range_error(void) assert(!"this should not be happen!"); } - FMEMCLOSE(f); + FMEMCLOSE(file); } void @@ -482,13 +482,13 @@ test_read_error(void) csv_t csv; csv_init_opt(&csv, &csv_options); - FILE *f = fopen("/dev/null", "r"); - assert(f != NULL); - fputc('T', f); // Set Error-Flag! + FILE *file = fopen("/dev/null", "r"); + assert(file != NULL); + (void) fputc('T', file); // Set Error-Flag! switch ( setjmp(env) ) { case CSV_ERR_OK: - assert(csv_read(&csv, f) == 0); + assert(csv_read(&csv, file) == 0); break; case CSV_ERR_IO_READ: @@ -499,44 +499,44 @@ test_read_error(void) assert(!"this should not be happen!"); } - fclose(f); + (void) fclose(file); } void * -my_allocate(size_t n, size_t sz, void *cb_arg) +my_allocate(size_t n, size_t size, void *cb_arg) { UNUSED(cb_arg); - void *ptr = calloc(n, sz); + void *ptr = calloc(n, size); return ptr; } void * -my_allocate_null(size_t n, size_t sz, void *cb_arg) +my_allocate_null(size_t n, size_t size, void *cb_arg) { UNUSED(n); - UNUSED(sz); + UNUSED(size); UNUSED(cb_arg); return NULL; } void * -my_reallocate(void *ptr, size_t n, size_t sz, void *cb_arg) +my_reallocate(void *ptr, size_t n, size_t size, void *cb_arg) { UNUSED(ptr); UNUSED(n); - UNUSED(sz); + UNUSED(size); UNUSED(cb_arg); return NULL; } void -my_free(void *ptr, size_t n, size_t sz, void *cb_arg) +my_free(void *ptr, size_t n, size_t size, void *cb_arg) { UNUSED(n); - UNUSED(sz); + UNUSED(size); UNUSED(cb_arg); free(ptr); @@ -559,13 +559,13 @@ test_allocation_error1(void) char data[] = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T"; - FILE *f; - FMEMOPEN(f, data); - assert(f != NULL); + FILE *file = NULL; + FMEMOPEN(file, data); + assert(file != NULL); switch ( setjmp(env) ) { case CSV_ERR_OK: - assert(csv_read(&csv, f) == 20); + assert(csv_read(&csv, file) == 20); assert(!"this should not be happen!"); break; @@ -577,7 +577,7 @@ test_allocation_error1(void) assert(!"this should not be happen!"); } - FMEMCLOSE(f); + FMEMCLOSE(file); } void @@ -585,17 +585,17 @@ show_version(void) { const char *version = csv_version; - printf("Version: "); + printf("libcsv - version: "); for ( ; *version; ++version ) { putchar(*version); } - printf(", Build Date: "); + printf(", build date: "); for ( ++version; *version; ++version ) { putchar(*version); } - printf(", Build Time: "); + printf(", build time: "); for ( ++version; *version; ++version ) { putchar(*version); } @@ -620,5 +620,7 @@ main(void) test_allocation_error1(); + puts("all tests passed..."); + return EXIT_SUCCESS; } -- cgit v1.3