From 8fc219de242f55117a325a8266743a854a03d4a2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 17 Jan 2017 20:25:14 +0000 Subject: [PATCH 03/16] _dbus_lm_strerror: move default behaviour inside switch This silences -Wswitch-default. Part of a larger commit from Thomas Zimmermann. Signed-off-by: Simon McVittie --- dbus/dbus-sysdeps-util-win.c | 12 +++++++----- dbus/dbus-sysdeps-win.c | 13 ++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index 923fe3c5..05bd976d 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -1380,12 +1380,14 @@ _dbus_lm_strerror(int error_number) return "The password does not meet the requirements of the password filter DLLs."; #endif - } - msg = strerror (error_number); - if (msg == NULL) - msg = "unknown"; + default: + msg = strerror (error_number); + + if (msg == NULL) + msg = "unknown"; - return msg; + return msg; + } #endif //DBUS_WINCE } diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index e321168b..30f084e4 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -3554,12 +3554,15 @@ _dbus_strerror (int error_number) case WSASYSCALLFAILURE: return "System call failure"; - } - msg = strerror (error_number); - if (msg == NULL) - msg = "unknown"; - return msg; + default: + msg = strerror (error_number); + + if (msg == NULL) + msg = "unknown"; + + return msg; + } #endif //DBUS_WINCE } -- 2.11.0