Attachment 130426 Details for Bug 98191 – [3] _dbus_lm_strerror: move default behaviour inside switch

[patch] [3] _dbus_lm_strerror: move default behaviour inside switch

0003-_dbus_lm_strerror-move-default-behaviour-inside-swit.patch (text/plain), 1.65 KB, created by Simon McVittie on 2017-03-24 19:42:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-03-24 19:42:39 UTC

Size: 1.65 KB

patch

obsolete

>From 8fc219de242f55117a325a8266743a854a03d4a2 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>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 <simon.mcvittie@collabora.co.uk>
>---
> 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
>

Actions: View | Splinter Review

Attachments on bug 98191: 127281 | 127282 | 127283 | 127284 | 127285 | 127286 | 129005 | 130424 | 130425 | 130426 | 130427 | 130428 | 130429 | 130430 | 130431 | 130432 | 130433 | 130434 | 130435 | 130436 | 130437 | 130438 | 130439 | 130442 | 130743

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.