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
Download Patch File Download Diff File Expand all files Collapse all files

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_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);
if (result >= 0 && 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_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);
if (result >= 0 && 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;
}
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_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);
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_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) {
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)
{
assert(table);
string_buffer_t *str_buffer = get_cur_str_buffer_and_create_if_not_exists(table);
if (str_buffer == NULL)
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)
{
assert(table);
int status = ft_write(table, cell_content);
if (IS_SUCCESS(status)) {
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) {
const char *cell = va_arg(va, const char*);
status = ft_write(table, cell);
if (IS_ERROR(status))
if (IS_ERROR(status)) {
va_end(va);
return status;
}
}
va_end(va);
return status;
ft_ln(table);
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;
// 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 *end = NULL;
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)
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, ' ');
return written;