commit 397b397
Michael Forney
·
2014-01-23 23:36:30 +0000 UTC
parent 1823ef9
Add default paths for unexpected values in switch statements This fixes some warnings when compiled with -O2
2 files changed,
+15,
-12
+1,
-0
1@@ -93,6 +93,7 @@ static void handle_rel_event(struct swc_evdev_device * device,
2 axis = WL_POINTER_AXIS_HORIZONTAL_SCROLL;
3 amount = AXIS_STEP_DISTANCE * wl_fixed_from_int(input_event->value);
4 break;
5+ default: return;
6 }
7
8 device->handler->axis(time, axis, amount);
+14,
-12
1@@ -60,6 +60,7 @@ static void update_position(struct swc_panel * panel)
2 x = screen->x + screen->width - view->width;
3 y = screen->y + panel->offset;
4 break;
5+ default: return;
6 }
7
8 swc_view_move(panel->surface->view, x, y);
9@@ -78,6 +79,19 @@ static void dock(struct wl_client * client, struct wl_resource * resource,
10 bool screen_changed = screen != panel->screen;
11 uint32_t length;
12
13+ switch (edge)
14+ {
15+ case SWC_PANEL_EDGE_TOP:
16+ case SWC_PANEL_EDGE_BOTTOM:
17+ length = screen->base.geometry.width;
18+ break;
19+ case SWC_PANEL_EDGE_LEFT:
20+ case SWC_PANEL_EDGE_RIGHT:
21+ length = screen->base.geometry.height;
22+ break;
23+ default: return;
24+ }
25+
26 if (panel->docked)
27 wl_list_remove(&panel->view_listener.link);
28
29@@ -91,18 +105,6 @@ static void dock(struct wl_client * client, struct wl_resource * resource,
30 panel->edge = edge;
31 panel->docked = true;
32
33- switch (edge)
34- {
35- case SWC_PANEL_EDGE_TOP:
36- case SWC_PANEL_EDGE_BOTTOM:
37- length = panel->screen->base.geometry.width;
38- break;
39- case SWC_PANEL_EDGE_LEFT:
40- case SWC_PANEL_EDGE_RIGHT:
41- length = panel->screen->base.geometry.height;
42- break;
43- }
44-
45 swc_compositor_add_surface(panel->surface);
46 update_position(panel);
47 swc_compositor_surface_show(panel->surface);