From: Kevin Day Date: Sat, 12 Sep 2026 23:59:36 +0000 (-0500) Subject: Progress: Minor tweaks in basic read and properly deallocate memory in test. X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=5f09f29ed0fb7aac7f9ca2251271497c622397ff;p=fll Progress: Minor tweaks in basic read and properly deallocate memory in test. --- diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c index ec7a640a6..601748bb6 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_content_read.c @@ -292,13 +292,12 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { f_range_t found_object = f_range_t_initialize; f_ranges_t found = f_ranges_t_initialize; uint8_t quote = 0; - f_number_unsigned_t line = 0; f_number_unsigneds_t delimits = f_number_unsigneds_t_initialize; f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; f_status_t status_object = F_okay; - for (;; ++line) { + for (f_number_unsigned_t line = 0; ; ++line) { max = 255; @@ -319,6 +318,11 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { max = 255; result = getline(&line_content, &max, file_contents); + + if (result == -1) { + printf("[ -------> ] --- [00] Failure loading line line %lu for file './data/tests/strings/extended-combining_read.txt', result = %lu.\n", line, result); + } + assert_return_code(result, 0); // The newline is copied by getline(), and so remove that newline before comparing. @@ -336,7 +340,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { // When matches is 2, then this matches both object and content. if (matches == 2) { if (!(state.status == F_fss_found_object)) { - printf("[ -------> ] --- [00] Failure with line (%lu) '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object); + printf("[ -------> ] --- [01] Failure with line (%lu) '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object); } assert_true(state.status == F_fss_found_object); @@ -345,7 +349,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { // When matches is 1, then this matches only object. else { if (!(state.status == F_fss_found_object_content_not)) { - printf("[ -------> ] --- [01] Failure with line (%lu) '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object_content_not); + printf("[ -------> ] --- [02] Failure with line (%lu) '%s', matches=%d, status=%u, expected %u.\n", line, line_content, matches, state.status, F_fss_found_object_content_not); } assert_true(state.status == F_fss_found_object_content_not); @@ -354,6 +358,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { else { // This is currently not supported. + printf("[ -------> ] --- [03] Failure line %lu matches of 0 is not supported.\n", line); assert_true(F_false); } @@ -364,14 +369,14 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { if (status_object == F_fss_found_object) { if (status_object != F_fss_found_object) { - printf("[ -------> ] --- [02] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_fss_found_object); + printf("[ -------> ] --- [04] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_fss_found_object); } assert_int_equal(state.status, F_fss_found_content); } else { if (state.status != F_data_not) { - printf("[ -------> ] --- [03] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_data_not); + printf("[ -------> ] --- [05] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_data_not); } assert_int_equal(state.status, F_data_not); @@ -380,7 +385,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { if (matches == 2) { if (state.status == F_fss_found_content) { if (!found.used) { - printf("[ -------> ] --- [04] Failure with line (%lu) '%s', expected found.used <> 0.\n", line, line_content); + printf("[ -------> ] --- [06] Failure with line (%lu) '%s', expected found.used <> 0.\n", line, line_content); } assert_true(found.used); @@ -389,7 +394,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [05] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_okay); + printf("[ -------> ] --- [07] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_okay); } assert_int_equal(status, F_okay); @@ -404,7 +409,7 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found.array[0], &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [06] Failure with line (%lu) '%s', status=%u, expected %u or %#0x.\n", line, line_content, status, F_okay, F_data_not_eos); + printf("[ -------> ] --- [08] Failure with line (%lu) '%s', status=%u, expected %u or %#0x.\n", line, line_content, status, F_okay, F_data_not_eos); } assert_true(status == F_okay || status == F_data_not_eos); @@ -414,21 +419,21 @@ void test__fl_fss_basic_content_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [07] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_okay); + printf("[ -------> ] --- [09] Failure with line (%lu) '%s', expected %u.\n", line, line_content, F_okay); } assert_int_equal(status, F_okay); } if (strcmp((const char *) result_string.string, (const char *) line_content)) { - printf("[ -------> ] --- [08] Failure with line (%lu) '%s', got '%s', expected '%s'.\n", line, line_content, result_string.string, line_content); + printf("[ -------> ] --- [10] Failure with line (%lu) '%s', got '%s', expected '%s'.\n", line, line_content, result_string.string, line_content); } assert_string_equal(result_string.string, line_content); } else { if (found.used) { - printf("[ -------> ] --- [09] Failure with line (%lu) '%s', expected found.used == 0.\n", line, line_content); + printf("[ -------> ] --- [11] Failure with line (%lu) '%s', expected found.used == 0.\n", line, line_content); } assert_true(!found.used); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c index fad3365b1..877de9186 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-basic_object_read.c @@ -270,7 +270,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { f_string_dynamic_t result_string = f_string_dynamic_t_initialize; f_string_dynamic_t delimit_string = f_string_dynamic_t_initialize; - for (;;) { + for (f_number_unsigned_t line = 0; ; ++line) { max = 255; @@ -291,6 +291,11 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { max = 255; result = getline(&line_object, &max, file_objects); + + if (result == -1) { + printf("[ -------> ] --- [00] Failure loading line line %lu for file './data/tests/strings/basic-combining_read.txt', result = %lu.\n", line, result); + } + assert_return_code(result, 0); // The newline is copied by getline(), and so remove that newline before comparing. @@ -308,13 +313,13 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { // When matches is 2, then this matches both object and content. if (matches == 2) { if (!(state.status == F_fss_found_object)) { - printf("[ -------> ] --- [00] Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); + printf("[ -------> ] --- [01] Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); } assert_true(state.status == F_fss_found_object); if (!(found.start <= found.stop)) { - printf("[ -------> ] --- [01] Failure with line '%s', matches=%d, found=(%lu, %lu).\n", line_object, matches, found.start, found.stop); + printf("[ -------> ] --- [02] Failure with line '%s', matches=%d, found=(%lu, %lu).\n", line_object, matches, found.start, found.stop); } assert_true(found.start <= found.stop); @@ -323,7 +328,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { // When matches is 1, then this matches only object. else { if (!(state.status == F_fss_found_object_content_not)) { - printf("[ -------> ] --- [02] Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); + printf("[ -------> ] --- [03] Failure with line '%s', matches=%d, status=%u.\n", line_object, matches, state.status); } assert_true(state.status == F_fss_found_object_content_not); @@ -332,6 +337,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { else { // This is currently not supported. + printf("[ -------> ] --- [04] Failure line %lu matches of 0 is not supported.\n", line); assert_true(F_false); } @@ -340,7 +346,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_append(buffer_string, &delimit_string); if (status != F_okay) { - printf("[ -------> ] --- [03] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [05] Failure with line '%s'.\n", line_object); } assert_int_equal(status, F_okay); @@ -351,7 +357,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { f_fss_apply_delimit(delimits, &delimit_string, &state); if (state.status != F_okay) { - printf("[ -------> ] --- [04] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [06] Failure with line '%s'.\n", line_object); } assert_int_equal(state.status, F_okay); @@ -360,7 +366,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_partial_append_nulless(delimit_string, found, &result_string); if (!(status == F_okay || status == F_data_not_eos)) { - printf("[ -------> ] --- [05] Failure with line '%s', status=%u.\n", line_object, status); + printf("[ -------> ] --- [07] Failure with line '%s', status=%u.\n", line_object, status); } assert_true(status == F_okay || status == F_data_not_eos); @@ -370,14 +376,14 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { const f_status_t status = f_string_dynamic_terminate_after(&result_string); if (status != F_okay) { - printf("[ -------> ] --- [06] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [08] Failure with line '%s'.\n", line_object); } assert_int_equal(status, F_okay); } if (strcmp((const char *) result_string.string, (const char *) line_object)) { - printf("[ -------> ] --- [07] Failure with line '%s'.\n", line_object); + printf("[ -------> ] --- [09] Failure with line '%s'.\n", line_object); } assert_string_equal(result_string.string, line_object); @@ -408,6 +414,7 @@ void test__fl_fss_basic_object_read__works_using_combining(void **void_state) { if (file_strings) fclose(file_strings); if (delimits.array) free(delimits.array); + if (line_matches) free(line_matches); if (line_string) free(line_string); if (line_object) free(line_object); if (result_string.string) free(result_string.string); diff --git a/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c b/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c index 7f0519207..01b86b631 100644 --- a/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c +++ b/level_1/fl_fss/tests/unit/c/test-fss-extended_object_read.c @@ -429,7 +429,7 @@ void test__fl_fss_extended_object_read__works_using_combining(void **void_state) if (file_objects) fclose(file_objects); if (delimits.array) free(delimits.array); - if (line_matches) free(line_matches);\ + if (line_matches) free(line_matches); if (line_string) free(line_string); if (line_object) free(line_object); if (result_string.string) free(result_string.string);