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

[F] Fixed more clang-tidy warnings

This commit is contained in:
seleznevae 2019-01-01 19:22:39 +03:00
parent a458d7fdf6
commit 9870c39dde
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fort.c
View File

@ -4946,7 +4946,7 @@ size_t buffer_text_width(const string_buffer_t *buffer)
{ {
size_t max_length = 0; size_t max_length = 0;
if (buffer->type == CharBuf) { if (buffer->type == CharBuf) {
int n = 0; size_t n = 0;
while (1) { while (1) {
const char *beg = NULL; const char *beg = NULL;
const char *end = NULL; const char *end = NULL;
@ -4959,7 +4959,7 @@ size_t buffer_text_width(const string_buffer_t *buffer)
} }
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
} else { } else {
int n = 0; size_t n = 0;
while (1) { while (1) {
const wchar_t *beg = NULL; const wchar_t *beg = NULL;
const wchar_t *end = NULL; const wchar_t *end = NULL;
@ -4967,7 +4967,7 @@ size_t buffer_text_width(const string_buffer_t *buffer)
if (beg == NULL || end == NULL) if (beg == NULL || end == NULL)
return max_length; return max_length;
int line_width = mk_wcswidth(beg, end - beg); int line_width = mk_wcswidth(beg, (size_t)(end - beg));
if (line_width < 0) /* For safety */ if (line_width < 0) /* For safety */
line_width = 0; line_width = 0;
max_length = MAX(max_length, (size_t)line_width); max_length = MAX(max_length, (size_t)line_width);

6
src/string_buffer.c
View File

@ -294,7 +294,7 @@ size_t buffer_text_width(const string_buffer_t *buffer)
{ {
size_t max_length = 0; size_t max_length = 0;
if (buffer->type == CharBuf) { if (buffer->type == CharBuf) {
int n = 0; size_t n = 0;
while (1) { while (1) {
const char *beg = NULL; const char *beg = NULL;
const char *end = NULL; const char *end = NULL;
@ -307,7 +307,7 @@ size_t buffer_text_width(const string_buffer_t *buffer)
} }
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
} else { } else {
int n = 0; size_t n = 0;
while (1) { while (1) {
const wchar_t *beg = NULL; const wchar_t *beg = NULL;
const wchar_t *end = NULL; const wchar_t *end = NULL;
@ -315,7 +315,7 @@ size_t buffer_text_width(const string_buffer_t *buffer)
if (beg == NULL || end == NULL) if (beg == NULL || end == NULL)
return max_length; return max_length;
int line_width = mk_wcswidth(beg, end - beg); int line_width = mk_wcswidth(beg, (size_t)(end - beg));
if (line_width < 0) /* For safety */ if (line_width < 0) /* For safety */
line_width = 0; line_width = 0;
max_length = MAX(max_length, (size_t)line_width); max_length = MAX(max_length, (size_t)line_width);