koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer compiler warnings to assertions for unhandled switch cases

Browse Source 
Using 'default:' cases can hide logical errors which would lead to i3
crashes for users. With this change the compiler will print a warning
when a case is not handled. For example, if I add a new value in the
Font.type enum:
../../i3/libi3/font.c: In function ‘draw_text’:
../../i3/libi3/font.c:378:5: warning: enumeration value ‘NEWFONT’ not handled in switch [-Wswitch]
     switch (savedFont->type) {
     ^~~~~~
This commit is contained in:
Orestis Floros
2018-04-04 18:12:44 +03:00
parent 393412a204
commit 0aa636b207
4 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libi3/font.c
View File

@ -283,9 +283,6 @@ void free_font(void) {
/* Free the font description */
pango_font_description_free(savedFont->specific.pango_desc);
break;
default:
assert(false);
break;
}
savedFont = NULL;
@ -315,9 +312,6 @@ void set_font_colors(xcb_gcontext_t gc, color_t foreground, color_t background)
pango_font_green = foreground.green;
pango_font_blue = foreground.blue;
break;
default:
assert(false);
break;
}
}
@ -388,8 +382,6 @@ void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc,
draw_text_pango(i3string_as_utf8(text), i3string_get_num_bytes(text),
drawable, visual, x, y, max_width, i3string_is_markup(text));
return;
default:
assert(false);
}
}
@ -425,8 +417,6 @@ void draw_text_ascii(const char *text, xcb_drawable_t drawable,
draw_text_pango(text, strlen(text),
drawable, root_visual_type, x, y, max_width, false);
return;
default:
assert(false);
}
}
@ -519,8 +509,6 @@ int predict_text_width(i3String *text) {
/* Calculate extents using Pango */
return predict_text_width_pango(i3string_as_utf8(text), i3string_get_num_bytes(text),
i3string_is_markup(text));
default:
assert(false);
return 0;
}
assert(false);
}