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

[F] Fixed more clang-tidy warnings

Browse Source
This commit is contained in:
seleznevae 2019-01-01 19:07:57 +03:00
parent 8e58d1b8c4
commit a458d7fdf6
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/fort.c
View File

@ -1994,7 +1994,7 @@ static void set_border_props_for_props(fort_table_properties_t *properties, cons
|| (const struct fort_border_style *)style == &FORT_BOLD_STYLE || (const struct fort_border_style *)style == &FORT_BOLD_STYLE
|| (const struct fort_border_style *)style == &FORT_BOLD2_STYLE || (const struct fort_border_style *)style == &FORT_BOLD2_STYLE
|| (const struct fort_border_style *)style == &FORT_FRAME_STYLE) { || (const struct fort_border_style *)style == &FORT_FRAME_STYLE) {
memcpy(&(properties->border_style), (struct fort_border_style *)style, sizeof(struct fort_border_style)); memcpy(&(properties->border_style), (const struct fort_border_style *)style, sizeof(struct fort_border_style));
return; return;
} }
@ -2308,7 +2308,7 @@ wchar_t *fort_wcsdup(const wchar_t *str)
FT_INTERNAL FT_INTERNAL
size_t number_of_columns_in_format_string(const char *fmt) size_t number_of_columns_in_format_string(const char *fmt)
{ {
int separator_counter = 0; size_t separator_counter = 0;
const char *pos = fmt; const char *pos = fmt;
while (1) { while (1) {
pos = strchr(pos, FORT_COL_SEPARATOR); pos = strchr(pos, FORT_COL_SEPARATOR);
@ -2326,7 +2326,7 @@ size_t number_of_columns_in_format_string(const char *fmt)
FT_INTERNAL FT_INTERNAL
size_t number_of_columns_in_format_wstring(const wchar_t *fmt) size_t number_of_columns_in_format_wstring(const wchar_t *fmt)
{ {
int separator_counter = 0; size_t separator_counter = 0;
const wchar_t *pos = fmt; const wchar_t *pos = fmt;
while (1) { while (1) {
pos = wcschr(pos, FORT_COL_SEPARATOR); pos = wcschr(pos, FORT_COL_SEPARATOR);
@ -3610,7 +3610,6 @@ fort_cell_t *get_cell_implementation(fort_row_t *row, size_t col, enum PolicyOnN
return *(fort_cell_t **)vector_at(row->cells, col); return *(fort_cell_t **)vector_at(row->cells, col);
} }
return NULL; return NULL;
break;
case Create: case Create:
while (col >= columns_in_row(row)) { while (col >= columns_in_row(row)) {
fort_cell_t *new_cell = create_cell(); fort_cell_t *new_cell = create_cell();
@ -3622,8 +3621,9 @@ fort_cell_t *get_cell_implementation(fort_row_t *row, size_t col, enum PolicyOnN
} }
} }
return *(fort_cell_t **)vector_at(row->cells, col); return *(fort_cell_t **)vector_at(row->cells, col);
break;
} }
assert(0 && "Shouldn't be here!");
return NULL; return NULL;
} }

2
src/fort_impl.c
View File

@ -838,7 +838,7 @@ static void set_border_props_for_props(fort_table_properties_t *properties, cons
|| (const struct fort_border_style *)style == &FORT_BOLD_STYLE || (const struct fort_border_style *)style == &FORT_BOLD_STYLE
|| (const struct fort_border_style *)style == &FORT_BOLD2_STYLE || (const struct fort_border_style *)style == &FORT_BOLD2_STYLE
|| (const struct fort_border_style *)style == &FORT_FRAME_STYLE) { || (const struct fort_border_style *)style == &FORT_FRAME_STYLE) {
memcpy(&(properties->border_style), (struct fort_border_style *)style, sizeof(struct fort_border_style)); memcpy(&(properties->border_style), (const struct fort_border_style *)style, sizeof(struct fort_border_style));
return; return;
} }

4
src/fort_utils.c
View File

@ -136,7 +136,7 @@ wchar_t *fort_wcsdup(const wchar_t *str)
FT_INTERNAL FT_INTERNAL
size_t number_of_columns_in_format_string(const char *fmt) size_t number_of_columns_in_format_string(const char *fmt)
{ {
int separator_counter = 0; size_t separator_counter = 0;
const char *pos = fmt; const char *pos = fmt;
while (1) { while (1) {
pos = strchr(pos, FORT_COL_SEPARATOR); pos = strchr(pos, FORT_COL_SEPARATOR);
@ -154,7 +154,7 @@ size_t number_of_columns_in_format_string(const char *fmt)
FT_INTERNAL FT_INTERNAL
size_t number_of_columns_in_format_wstring(const wchar_t *fmt) size_t number_of_columns_in_format_wstring(const wchar_t *fmt)
{ {
int separator_counter = 0; size_t separator_counter = 0;
const wchar_t *pos = fmt; const wchar_t *pos = fmt;
while (1) { while (1) {
pos = wcschr(pos, FORT_COL_SEPARATOR); pos = wcschr(pos, FORT_COL_SEPARATOR);

4
src/row.c
View File

@ -96,7 +96,6 @@ fort_cell_t *get_cell_implementation(fort_row_t *row, size_t col, enum PolicyOnN
return *(fort_cell_t **)vector_at(row->cells, col); return *(fort_cell_t **)vector_at(row->cells, col);
} }
return NULL; return NULL;
break;
case Create: case Create:
while (col >= columns_in_row(row)) { while (col >= columns_in_row(row)) {
fort_cell_t *new_cell = create_cell(); fort_cell_t *new_cell = create_cell();
@ -108,8 +107,9 @@ fort_cell_t *get_cell_implementation(fort_row_t *row, size_t col, enum PolicyOnN
} }
} }
return *(fort_cell_t **)vector_at(row->cells, col); return *(fort_cell_t **)vector_at(row->cells, col);
break;
} }
assert(0 && "Shouldn't be here!");
return NULL; return NULL;
} }