From 781ed1ff02e38dffdfebca0fa80baa1791849c3b Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 19 May 2020 12:23:23 +0200 Subject: 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(). --- backend/libinput/tablet_tool.c | 3 +-- backend/wayland/tablet_v2.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'backend') 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, -- cgit v1.2.3