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

[F] Fixed compilation errors

Browse Source
This commit is contained in:
seleznevae 2019-08-25 10:18:41 +03:00
parent e88f49d8ff
commit 4845bba54c
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/fort.c
View File

@ -3662,7 +3662,9 @@ int print_n_strings(conv_context_t *cntx, size_t n, const char *str)
switch (cntx->b_type) { switch (cntx->b_type) {
case CHAR_BUF: case CHAR_BUF:
return snprint_n_strings(cntx, n, str); raw_written = snprint_n_strings(cntx, n, str);
cod_w = raw_written;
return cod_w;
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
case W_CHAR_BUF: case W_CHAR_BUF:
cod_w = wsnprint_n_string(cntx->u.wbuf, cntx->raw_avail, n, str); cod_w = wsnprint_n_string(cntx->u.wbuf, cntx->raw_avail, n, str);
@ -6248,7 +6250,7 @@ buffer_substring(const string_buffer_t *buffer, size_t buffer_row, const void **
#endif /* FT_HAVE_WCHAR */ #endif /* FT_HAVE_WCHAR */
#ifdef FT_HAVE_UTF8 #ifdef FT_HAVE_UTF8
case UTF8_BUF: case UTF8_BUF:
utf8_n_substring(buffer->str.wstr, '\n', buffer_row, begin, end); utf8_n_substring(buffer->str.u8str, '\n', buffer_row, begin, end);
if ((*(const char **)begin) && (*(const char **)end)) if ((*(const char **)begin) && (*(const char **)end))
*str_it_width = ut8_width(*begin, *end); *str_it_width = ut8_width(*begin, *end);
break; break;
@ -6380,14 +6382,13 @@ int buffer_check_align(string_buffer_t *buffer)
{ {
assert(buffer); assert(buffer);
assert(buffer->str.data); assert(buffer->str.data);
void *p = buffer->str.data;
switch (buffer->type) { switch (buffer->type) {
case CHAR_BUF: case CHAR_BUF:
return 1; return 1;
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
case W_CHAR_BUF: case W_CHAR_BUF:
return (((unsigned long)p) & (sizeof(wchar_t) - 1)) == 0; return (((unsigned long)buffer->str.data) & (sizeof(wchar_t) - 1)) == 0;
#endif #endif
#ifdef FT_HAVE_UTF8 #ifdef FT_HAVE_UTF8
case UTF8_BUF: case UTF8_BUF:

4
src/fort_utils.c
View File

@ -252,7 +252,9 @@ int print_n_strings(conv_context_t *cntx, size_t n, const char *str)
switch (cntx->b_type) { switch (cntx->b_type) {
case CHAR_BUF: case CHAR_BUF:
return snprint_n_strings(cntx, n, str); raw_written = snprint_n_strings(cntx, n, str);
cod_w = raw_written;
return cod_w;
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
case W_CHAR_BUF: case W_CHAR_BUF:
cod_w = wsnprint_n_string(cntx->u.wbuf, cntx->raw_avail, n, str); cod_w = wsnprint_n_string(cntx->u.wbuf, cntx->raw_avail, n, str);

5
src/string_buffer.c
View File

@ -505,7 +505,7 @@ buffer_substring(const string_buffer_t *buffer, size_t buffer_row, const void **
#endif /* FT_HAVE_WCHAR */ #endif /* FT_HAVE_WCHAR */
#ifdef FT_HAVE_UTF8 #ifdef FT_HAVE_UTF8
case UTF8_BUF: case UTF8_BUF:
utf8_n_substring(buffer->str.wstr, '\n', buffer_row, begin, end); utf8_n_substring(buffer->str.u8str, '\n', buffer_row, begin, end);
if ((*(const char **)begin) && (*(const char **)end)) if ((*(const char **)begin) && (*(const char **)end))
*str_it_width = ut8_width(*begin, *end); *str_it_width = ut8_width(*begin, *end);
break; break;
@ -637,14 +637,13 @@ int buffer_check_align(string_buffer_t *buffer)
{ {
assert(buffer); assert(buffer);
assert(buffer->str.data); assert(buffer->str.data);
void *p = buffer->str.data;
switch (buffer->type) { switch (buffer->type) {
case CHAR_BUF: case CHAR_BUF:
return 1; return 1;
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
case W_CHAR_BUF: case W_CHAR_BUF:
return (((unsigned long)p) & (sizeof(wchar_t) - 1)) == 0; return (((unsigned long)buffer->str.data) & (sizeof(wchar_t) - 1)) == 0;
#endif #endif
#ifdef FT_HAVE_UTF8 #ifdef FT_HAVE_UTF8
case UTF8_BUF: case UTF8_BUF: