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

[A] Added more warnings to compilation

Browse Source
This commit is contained in:
seleznevae
2018-11-17 10:44:35 +03:00
parent fe6dbfce4a
commit 88a5d76454
5 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/fort_impl.c
View File

@@ -847,20 +847,20 @@ struct ft_border_style *FT_FRAME_STYLE = (struct ft_border_style *) &FORT_FRAME
static void set_border_props_for_props(fort_table_properties_t *properties, const struct ft_border_style *style)
{
if ((struct fort_border_style *)style == &FORT_BASIC_STYLE
|| (struct fort_border_style *)style == &FORT_BASIC2_STYLE
|| (struct fort_border_style *)style == &FORT_SIMPLE_STYLE
|| (struct fort_border_style *)style == &FORT_DOT_STYLE
|| (struct fort_border_style *)style == &FORT_PLAIN_STYLE
|| (struct fort_border_style *)style == &FORT_EMPTY_STYLE
|| (struct fort_border_style *)style == &FORT_SOLID_STYLE
|| (struct fort_border_style *)style == &FORT_SOLID_ROUND_STYLE
|| (struct fort_border_style *)style == &FORT_NICE_STYLE
|| (struct fort_border_style *)style == &FORT_DOUBLE_STYLE
|| (struct fort_border_style *)style == &FORT_DOUBLE2_STYLE
|| (struct fort_border_style *)style == &FORT_BOLD_STYLE
|| (struct fort_border_style *)style == &FORT_BOLD2_STYLE
|| (struct fort_border_style *)style == &FORT_FRAME_STYLE) {
if ((const struct fort_border_style *)style == &FORT_BASIC_STYLE
|| (const struct fort_border_style *)style == &FORT_BASIC2_STYLE
|| (const struct fort_border_style *)style == &FORT_SIMPLE_STYLE
|| (const struct fort_border_style *)style == &FORT_DOT_STYLE
|| (const struct fort_border_style *)style == &FORT_PLAIN_STYLE
|| (const struct fort_border_style *)style == &FORT_EMPTY_STYLE
|| (const struct fort_border_style *)style == &FORT_SOLID_STYLE
|| (const struct fort_border_style *)style == &FORT_SOLID_ROUND_STYLE
|| (const struct fort_border_style *)style == &FORT_NICE_STYLE
|| (const struct fort_border_style *)style == &FORT_DOUBLE_STYLE
|| (const struct fort_border_style *)style == &FORT_DOUBLE2_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_FRAME_STYLE) {
memcpy(&(properties->border_style), (struct fort_border_style *)style, sizeof(struct fort_border_style));
return;
}

8
src/fort_utils.c
View File

@@ -260,13 +260,13 @@ int wsnprint_n_string(wchar_t *buf, size_t length, size_t n, const char *str)
else {
wchar_t wcs[WCS_SIZE];
const char *ptr = str;
size_t length;
length = mbsrtowcs(wcs, (const char **)&ptr, WCS_SIZE, NULL);
size_t wcs_len;
wcs_len = mbsrtowcs(wcs, (const char **)&ptr, WCS_SIZE, NULL);
/* for simplicity */
if ((length == (size_t) - 1) || length > 1) {
if ((wcs_len == (size_t) - 1) || wcs_len > 1) {
return -1;
} else {
wcs[length] = L'\0';
wcs[wcs_len] = L'\0';
size_t k = n;
while (k) {
*buf = *wcs;