diff options
| author | Simon Ser <contact@emersion.fr> | 2020-05-19 12:23:23 +0200 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2020-05-19 14:54:02 +0200 |
| commit | 781ed1ff02e38dffdfebca0fa80baa1791849c3b (patch) | |
| tree | 92216d727e9e2e0d20392c072cc26328e1a8a6e5 | |
| parent | 666498db015ad1439a8916bce609baf8fa042b5d (diff) | |
| download | wlroots-781ed1ff02e38dffdfebca0fa80baa1791849c3b.tar.xz | |
Fix -Wreturn-type warnings
When calling assert(0) instead of returning a value, -Wreturn-type
warnings are triggered because assertions can be disabled. Replace these
assertions with abort().
| -rw-r--r-- | backend/libinput/tablet_tool.c | 3 | ||||
| -rw-r--r-- | backend/wayland/tablet_v2.c | 4 | ||||
| -rw-r--r-- | types/tablet_v2/wlr_tablet_v2_tool.c | 4 | ||||
| -rw-r--r-- | types/xdg_shell/wlr_xdg_positioner.c | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 9c0ef0cf..845ef220 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -118,8 +118,7 @@ static enum wlr_tablet_tool_type wlr_type_from_libinput_type( return WLR_TABLET_TOOL_TYPE_TOTEM; #endif } - - assert(false && "UNREACHABLE"); + abort(); // unreachable } static struct wlr_libinput_tablet_tool *get_wlr_tablet_tool( diff --git a/backend/wayland/tablet_v2.c b/backend/wayland/tablet_v2.c index 3b24161d..77d737c5 100644 --- a/backend/wayland/tablet_v2.c +++ b/backend/wayland/tablet_v2.c @@ -466,7 +466,6 @@ static void handle_tablet_tool_done(void *data, } static enum wlr_tablet_tool_type tablet_type_to_wlr_type(enum zwp_tablet_tool_v2_type type) { - switch (type) { case ZWP_TABLET_TOOL_V2_TYPE_PEN: return WLR_TABLET_TOOL_TYPE_PEN; @@ -485,8 +484,7 @@ static enum wlr_tablet_tool_type tablet_type_to_wlr_type(enum zwp_tablet_tool_v2 default: break; } - - assert(false && "Unreachable"); + abort(); // unreachable } static void handle_tablet_tool_type(void *data, diff --git a/types/tablet_v2/wlr_tablet_v2_tool.c b/types/tablet_v2/wlr_tablet_v2_tool.c index 7cb5b7e9..f9b4b458 100644 --- a/types/tablet_v2/wlr_tablet_v2_tool.c +++ b/types/tablet_v2/wlr_tablet_v2_tool.c @@ -75,10 +75,8 @@ static enum zwp_tablet_tool_v2_type tablet_type_from_wlr_type( return ZWP_TABLET_TOOL_V2_TYPE_LENS; default: /* We skip these devices earlier on */ - assert(false && "Unreachable"); + abort(); // unreachable } - - assert(false && "Unreachable"); } void destroy_tablet_tool_v2(struct wl_resource *resource) { diff --git a/types/xdg_shell/wlr_xdg_positioner.c b/types/xdg_shell/wlr_xdg_positioner.c index 95d5dbd3..f88bf323 100644 --- a/types/xdg_shell/wlr_xdg_positioner.c +++ b/types/xdg_shell/wlr_xdg_positioner.c @@ -176,7 +176,7 @@ static bool positioner_anchor_has_edge(enum xdg_positioner_anchor anchor, anchor == XDG_POSITIONER_ANCHOR_TOP_RIGHT || anchor == XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT; default: - assert(false); // not reached + abort(); // unreachable } } |