3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[R] Removed redundant code

Browse Source
This commit is contained in:
seleznevae 2018-01-21 12:53:26 +03:00
parent 859ff31b8a
commit 423ddb3ab8
4 changed files with 37 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/fort.h
View File

@ -99,13 +99,13 @@ FORT_EXTERN void ft_destroy_table(FTABLE *FORT_RESTRICT table);
FORT_EXTERN void ft_ln(FTABLE *FORT_RESTRICT table); FORT_EXTERN void ft_ln(FTABLE *FORT_RESTRICT table);
FORT_EXTERN int ft_printf(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, ...); FORT_EXTERN int ft_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...);
FORT_EXTERN int ft_printf_ln(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, ...); FORT_EXTERN int ft_printf_ln(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...);
#define FT_PRINTF(table, row, ...) \ #define FT_PRINTF(table, ...) \
(( 0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf(table, row, __VA_ARGS__)) (( 0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf(table, __VA_ARGS__))
#define FT_PRINTF_LN(table, row, ...) \ #define FT_PRINTF_LN(table, ...) \
(( 0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf_ln(table, row, __VA_ARGS__)) (( 0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf_ln(table, __VA_ARGS__))
FORT_EXTERN int ft_hdr_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...); FORT_EXTERN int ft_hdr_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...);

21
src/fort.c
View File

@ -140,7 +140,7 @@ int ft_hdr_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ..
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
int result = ft_row_printf_impl(table, 0, fmt, &va); int result = ft_row_printf_impl(table, table->cur_row, fmt, &va);
va_end(va); va_end(va);
if (result >= 0 && table->rows) { if (result >= 0 && table->rows) {
int sz = vector_size(table->rows); int sz = vector_size(table->rows);
@ -158,7 +158,7 @@ int ft_hdr_printf_ln(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt,
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
int result = ft_row_printf_impl(table, 0, fmt, &va); int result = ft_row_printf_impl(table, table->cur_row, fmt, &va);
va_end(va); va_end(va);
if (result >= 0 && table->rows) { if (result >= 0 && table->rows) {
int sz = vector_size(table->rows); int sz = vector_size(table->rows);
@ -172,20 +172,22 @@ int ft_hdr_printf_ln(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt,
return result; return result;
} }
int ft_printf(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, ...) int ft_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...)
{ {
assert(table);
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
int result = ft_row_printf_impl(table, row, fmt, &va); int result = ft_row_printf_impl(table, table->cur_row, fmt, &va);
va_end(va); va_end(va);
return result; return result;
} }
int ft_printf_ln(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, ...) int ft_printf_ln(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...)
{ {
assert(table);
va_list va; va_list va;
va_start(va, fmt); va_start(va, fmt);
int result = ft_row_printf_impl(table, row, fmt, &va); int result = ft_row_printf_impl(table, table->cur_row, fmt, &va);
if (result >= 0) { if (result >= 0) {
ft_ln(table); ft_ln(table);
} }
@ -196,6 +198,7 @@ int ft_printf_ln(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTR
int ft_write(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT cell_content) int ft_write(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT cell_content)
{ {
assert(table);
string_buffer_t *str_buffer = get_cur_str_buffer_and_create_if_not_exists(table); string_buffer_t *str_buffer = get_cur_str_buffer_and_create_if_not_exists(table);
if (str_buffer == NULL) if (str_buffer == NULL)
return F_ERROR; return F_ERROR;
@ -209,6 +212,7 @@ int ft_write(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT cell_content
int ft_write_ln(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT cell_content) int ft_write_ln(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT cell_content)
{ {
assert(table);
int status = ft_write(table, cell_content); int status = ft_write(table, cell_content);
if (IS_SUCCESS(status)) { if (IS_SUCCESS(status)) {
ft_ln(table); ft_ln(table);
@ -249,11 +253,12 @@ FORT_EXTERN int ft_nwrite_ln(FTABLE *FORT_RESTRICT table, size_t n, const char*
for (size_t i = 0; i < n; ++i) { for (size_t i = 0; i < n; ++i) {
const char *cell = va_arg(va, const char*); const char *cell = va_arg(va, const char*);
status = ft_write(table, cell); status = ft_write(table, cell);
if (IS_ERROR(status)) if (IS_ERROR(status)) {
va_end(va);
return status; return status;
}
} }
va_end(va); va_end(va);
return status;
ft_ln(table); ft_ln(table);
return status; return status;

24
src/string_buffer.c
View File

@ -188,27 +188,6 @@ int buffer_printf(string_buffer_t *buffer, size_t buffer_row, size_t table_colum
return written; return written;
// const char *substr = str_n_substring(buffer->str, '\n', buffer_row);
// if (substr == NULL)
// return -1;
// const char *next_substr = str_n_substring(buffer->str, '\n', buffer_row + 1);
// size_t buf_row_len = 0;
// if (next_substr) {
// buf_row_len = next_substr - substr - 1;
// } else {
// buf_row_len = strlen(buffer->str) - (next_substr - buffer->str);
// } todo
// if (buf_row_len > content_width)
// return -1;
// written += snprintf(buf + written, buf_len - written, "%*s", (int)buf_row_len, substr);
// if (written < 0)
// return written;
// written += snprint_n_chars(buf + written, buf_len - written, content_width - buf_row_len, ' ');
// if (written < 0)
// return written;
const char *beg = NULL; const char *beg = NULL;
const char *end = NULL; const char *end = NULL;
str_n_substring(buffer->str, '\n', buffer_row, &beg, &end); str_n_substring(buffer->str, '\n', buffer_row, &beg, &end);
@ -225,9 +204,6 @@ int buffer_printf(string_buffer_t *buffer, size_t buffer_row, size_t table_colum
if (written < 0) if (written < 0)
return written; return written;
// written += snprintf(buf + written, buf_len - written, "%*s", (int)content_width, buffer->str);
// if (written < 0)
// return written;
written += snprint_n_chars(buf + written, buf_len - written, right, ' '); written += snprint_n_chars(buf + written, buf_len - written, right, ' ');
return written; return written;

38
tests/test_table.c
View File

@ -33,7 +33,7 @@ void test_table_sizes(void **state)
} }
WHEN("Insert two cells in the next row") { WHEN("Insert two cells in the next row") {
int n = FT_PRINTF_LN(table, 1, "%c|%c", 'c', 'd'); int n = FT_PRINTF_LN(table, "%c|%c", 'c', 'd');
assert_true( n == 2 ); assert_true( n == 2 );
status = get_table_sizes(table, &rows, &cols); status = get_table_sizes(table, &rows, &cols);
assert_true( IS_SUCCESS(status) ); assert_true( IS_SUCCESS(status) );
@ -42,7 +42,7 @@ void test_table_sizes(void **state)
} }
WHEN("Insert five cells in the next row") { WHEN("Insert five cells in the next row") {
int n = FT_PRINTF_LN(table, 2, "%d|%d|%d|%d|%d", 1, 2, 3, 4, 5); int n = FT_PRINTF_LN(table, "%d|%d|%d|%d|%d", 1, 2, 3, 4, 5);
assert_true( n == 5 ); assert_true( n == 5 );
status = get_table_sizes(table, &rows, &cols); status = get_table_sizes(table, &rows, &cols);
assert_true( IS_SUCCESS(status) ); assert_true( IS_SUCCESS(status) );
@ -80,7 +80,7 @@ void test_table_geometry(void **state)
} }
WHEN("Inserting 3 cells in the next row") { WHEN("Inserting 3 cells in the next row") {
int n = FT_PRINTF_LN(table, 1, "%c|%s|%c", 'c', "as", 'e'); int n = FT_PRINTF_LN(table, "%c|%s|%c", 'c', "as", 'e');
assert_true( n == 3 ); assert_true( n == 3 );
status = table_geometry(table, &height, &width); status = table_geometry(table, &height, &width);
assert_true( IS_SUCCESS(status) ); assert_true( IS_SUCCESS(status) );
@ -102,9 +102,9 @@ void test_table_basic(void **state)
int n = FT_HDR_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14); int n = FT_HDR_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 1, "%d|%c|%s|%f", 3, 'c', "234", 3.14); n = FT_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 2, "%d|%c|%s|%f", 3, 'c', "234", 3.14); n = FT_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
const char *table_str = ft_to_string(table); const char *table_str = ft_to_string(table);
@ -137,9 +137,9 @@ void test_table_basic(void **state)
int n = FT_HDR_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14); int n = FT_HDR_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 1, "%c|%s|%f|%d", 'c', "234", 3.14, 3); n = FT_PRINTF_LN(table, "%c|%s|%f|%d", 'c', "234", 3.14, 3);
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 2, "%s|%f|%d|%c", "234", 3.14, 3, 'c'); n = FT_PRINTF_LN(table, "%s|%f|%d|%c", "234", 3.14, 3, 'c');
assert_true( n == 4 ); assert_true( n == 4 );
const char *table_str = ft_to_string(table); const char *table_str = ft_to_string(table);
@ -170,9 +170,9 @@ void test_table_basic(void **state)
int n = FT_HDR_PRINTF_LN(table, "||%s|%f", "234", 3.14); int n = FT_HDR_PRINTF_LN(table, "||%s|%f", "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 1, "%c|%s|%f", 'c', "234", 3.14); n = FT_PRINTF_LN(table, "%c|%s|%f", 'c', "234", 3.14);
assert_true( n == 3 ); assert_true( n == 3 );
n = FT_PRINTF_LN(table, 2, "%s|%f||", "234", 3.14); n = FT_PRINTF_LN(table, "%s|%f||", "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
const char *table_str = ft_to_string(table); const char *table_str = ft_to_string(table);
@ -203,9 +203,9 @@ void test_table_basic(void **state)
int n = FT_HDR_PRINTF_LN(table, "|||"); int n = FT_HDR_PRINTF_LN(table, "|||");
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 1, "|||"); n = FT_PRINTF_LN(table, "|||");
assert_true( n == 4 ); assert_true( n == 4 );
n = FT_PRINTF_LN(table, 2, "|||"); n = FT_PRINTF_LN(table, "|||");
assert_true( n == 4 ); assert_true( n == 4 );
const char *table_str = ft_to_string(table); const char *table_str = ft_to_string(table);
@ -403,7 +403,7 @@ void test_table_options(void **state)
ft_set_default_options(&table_options); ft_set_default_options(&table_options);
table = create_test_int_table(); table = create_test_int_table();
int n = ft_printf_ln(table, 3, "|||"); int n = ft_printf_ln(table, "|||");
assert_true( n == 4 ); assert_true( n == 4 );
const char *table_str = ft_to_string(table); const char *table_str = ft_to_string(table);
@ -618,13 +618,11 @@ void test_table_options(void **state)
WHEN("All columns are equal and not empty") { WHEN("All columns are equal and not empty") {
table = ft_create_table(); table = ft_create_table();
int n = FT_HDR_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14); int n = FT_HDR_PRINTF_LN(table, "%d|%c|%s|%f", 4, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
// n = FT_PRINTF_LN(table, 1, "%d|%c|%s|%f", 3, 'c', "234\n123", 3.14); n = FT_NWRITE_LN(table, "5", "c", "234\n12", "3.140000");
// assert_true( n == 4 ); assert_true( n == F_SUCCESS );
// FT_NWRITE_LN(table, "3", "c", "234", "3.140000"); n = FT_PRINTF_LN(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
FT_NWRITE_LN(table, "3", "c", "234\n12", "3.140000");
n = FT_PRINTF_LN(table, 2, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
const char *table_str = ft_to_string(table); const char *table_str = ft_to_string(table);
@ -632,11 +630,11 @@ void test_table_options(void **state)
const char *table_str_etalon = const char *table_str_etalon =
"+---+---+-----+----------+\n" "+---+---+-----+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 4 | c | 234 | 3.140000 |\n"
"| | | | |\n" "| | | | |\n"
"+---+---+-----+----------+\n" "+---+---+-----+----------+\n"
"| | | | |\n" "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n" "| 5 | c | 234 | 3.140000 |\n"
"| | | 12 | |\n" "| | | 12 | |\n"
"| | | | |\n" "| | | | |\n"
"+---+---+-----+----------+\n" "+---+---+-----+----------+\n"