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

[C] Improved code readability

Browse Source
This commit is contained in:
seleznevae 2018-03-31 18:13:30 +03:00
parent 63ea186a4a
commit a32485d19c
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/main.c
View File

@ -146,7 +146,7 @@ int main(void)
ft_destroy_table(table); ft_destroy_table(table);
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
#ifdef FT_HAVE_WCHAR #if defined(FT_HAVE_WCHAR) && !defined(FT_MICROSOFT_COMPILER)
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
table = ft_create_table(); table = ft_create_table();

51
src/string_buffer.c
View File

@ -316,30 +316,28 @@ int buffer_printf(string_buffer_t *buffer, size_t buffer_row, char *buf, size_t
int written = 0; int written = 0;
written += SNPRINT_N_CHARS(buf + written, buf_len - written, left, SPACE_CHAR); int tmp = 0;
if (written < 0)
return written;
const CHAR_TYPE *beg = NULL; const CHAR_TYPE *beg = NULL;
const CHAR_TYPE *end = NULL; const CHAR_TYPE *end = NULL;
CHAR_TYPE old_value;
CHCK_RSLT_ADD_TO_WRITTEN(SNPRINT_N_CHARS(buf + written, buf_len - written, left, SPACE_CHAR));
STR_N_SUBSTRING(buffer->BUFFER_STR, NEWLINE_CHAR, buffer_row, &beg, &end); STR_N_SUBSTRING(buffer->BUFFER_STR, NEWLINE_CHAR, buffer_row, &beg, &end);
if (beg == NULL || end == NULL) if (beg == NULL || end == NULL)
return -1; return -1;
CHAR_TYPE old_value = *end; old_value = *end;
*(CHAR_TYPE *)end = NULL_CHAR; *(CHAR_TYPE *)end = NULL_CHAR;
written += SNPRINTF(buf + written, buf_len - written, SNPRINTF_FMT_STR, (int)(end - beg), beg); CHCK_RSLT_ADD_TO_WRITTEN(SNPRINTF(buf + written, buf_len - written, SNPRINTF_FMT_STR, (int)(end - beg), beg));
*(CHAR_TYPE *)end = old_value; *(CHAR_TYPE *)end = old_value;
if (written < 0) CHCK_RSLT_ADD_TO_WRITTEN(SNPRINT_N_CHARS(buf + written, buf_len - written, (int)(content_width - STR_ITER_WIDTH(beg, end)), SPACE_CHAR));
return written; CHCK_RSLT_ADD_TO_WRITTEN(SNPRINT_N_CHARS(buf + written, buf_len - written, right, SPACE_CHAR));
written += SNPRINT_N_CHARS(buf + written, buf_len - written, (int)(content_width - STR_ITER_WIDTH(beg, end)), SPACE_CHAR);
if (written < 0)
return written;
written += SNPRINT_N_CHARS(buf + written, buf_len - written, right, SPACE_CHAR);
return written; return written;
clear:
return -1;
#undef CHAR_TYPE #undef CHAR_TYPE
#undef NULL_CHAR #undef NULL_CHAR
#undef NEWLINE_CHAR #undef NEWLINE_CHAR
@ -399,29 +397,28 @@ int buffer_wprintf(string_buffer_t *buffer, size_t buffer_row, wchar_t *buf, siz
return -1; return -1;
int written = 0; int written = 0;
written += SNPRINT_N_CHARS(buf + written, buf_len - written, left, SPACE_CHAR); int tmp = 0;
if (written < 0)
return written;
const CHAR_TYPE *beg = NULL; const CHAR_TYPE *beg = NULL;
const CHAR_TYPE *end = NULL; const CHAR_TYPE *end = NULL;
CHAR_TYPE old_value;
CHCK_RSLT_ADD_TO_WRITTEN(SNPRINT_N_CHARS(buf + written, buf_len - written, left, SPACE_CHAR));
STR_N_SUBSTRING(buffer->BUFFER_STR, NEWLINE_CHAR, buffer_row, &beg, &end); STR_N_SUBSTRING(buffer->BUFFER_STR, NEWLINE_CHAR, buffer_row, &beg, &end);
if (beg == NULL || end == NULL) if (beg == NULL || end == NULL)
return -1; return -1;
CHAR_TYPE old_value = *end; old_value = *end;
*(CHAR_TYPE *)end = NULL_CHAR; *(CHAR_TYPE *)end = NULL_CHAR;
written += SNPRINTF(buf + written, buf_len - written, SNPRINTF_FMT_STR, (int)(end - beg), beg); CHCK_RSLT_ADD_TO_WRITTEN(SNPRINTF(buf + written, buf_len - written, SNPRINTF_FMT_STR, (int)(end - beg), beg));
*(CHAR_TYPE *)end = old_value; *(CHAR_TYPE *)end = old_value;
if (written < 0) CHCK_RSLT_ADD_TO_WRITTEN(SNPRINT_N_CHARS(buf + written, buf_len - written, (int)(content_width - STR_ITER_WIDTH(beg, end)), SPACE_CHAR));
return written; CHCK_RSLT_ADD_TO_WRITTEN(SNPRINT_N_CHARS(buf + written, buf_len - written, right, SPACE_CHAR));
written += SNPRINT_N_CHARS(buf + written, buf_len - written, (int)(content_width - STR_ITER_WIDTH(beg, end)), SPACE_CHAR);
if (written < 0)
return written;
written += SNPRINT_N_CHARS(buf + written, buf_len - written, right, SPACE_CHAR);
return written; return written;
clear:
return -1;
#undef CHAR_TYPE #undef CHAR_TYPE
#undef NULL_CHAR #undef NULL_CHAR
#undef NEWLINE_CHAR #undef NEWLINE_CHAR