cepheid

commit ae46146dec36954b6a3219db2ac8f57e76b102ab
parent e1088d19c7f25999a47c361eaa8d2b35d2d59740
Author: hhvn <dev@hhvn.uk>
Date:   Mon, 30 Jan 2023 13:44:09 +0000

Fix warnings in gui.c

Diffstat:
M
config.mk
 | 
1
-
M
src/gui.c
 | 
9
+++++++--

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/config.mk b/config.mk
@@ -1,7 +1,6 @@
 STYLE = aurora
 SAVEDIR = saves
 RAYLIB	= -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
-CFLAGS	= -Wno-switch
 LDFLAGS	= $(RAYLIB) $(DBLIB)
 
 # include dev/config.mk
diff --git a/src/gui.c b/src/gui.c
@@ -547,7 +547,6 @@ gui_form(int x, int y, int w, int h, Form *form) {
 	FormElem *sub;
 	int bn, bx, bw;
 	int lx, lw;
-	int lpad;
 	int cy;
 	int tw;
 	int i, j;
@@ -570,7 +569,7 @@ gui_form(int x, int y, int w, int h, Form *form) {
 	for (i = 0, lx = lw = -1, cy = y, sub = NULL; form->elems[i].type != FORM_END_TYPE && i < FORM_MAX; i++) {
 		elem = &form->elems[i];
 
-		switch (elem->type) {
+		switch ((int)elem->type) {
 		case FORM_SUBFORM_TYPE:
 			if (sub)
 				cy += gui_form_sub_end(x, cy, w);
@@ -625,6 +624,8 @@ gui_form(int x, int y, int w, int h, Form *form) {
 		case GUI_DROPDOWN:
 			gui_dropdown(lx + tw, cy, lw - tw, elem->elem);
 			break;
+		default:
+			error(1, "unexpected GUI element type");
 		}
 
 		if (sub) {
@@ -666,6 +667,8 @@ gui_form_filled(Form *form) {
 			if (drop->sel == -1)
 				return 0;
 			break;
+		default:
+			error(1, "unexpected GUI element type");
 		}
 	}
 
@@ -700,6 +703,8 @@ gui_form_clear(Form *form) {
 				continue;
 			drop->sel = drop->def - DROPDOWN_DEFAULT_OFF;
 			break;
+		default:
+			error(1, "unexpected GUI element type");
 		}
 	}
 }