From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 17 Jan 2017 20:54:20 +0000 (+0000)
Subject: sysdeps: assert that log severity is one we expect
X-Git-Tag: dbus-1.12.0~194
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d42d167cc3ba0d20aa891a75aa1cd80ec5f490f1;p=platform%2Fupstream%2Fdbus.git

sysdeps: assert that log severity is one we expect

This silences -Wswitch-default.

Based on part of a patch from Thomas Zimmermann.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
---

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 39c1336..8b6ac30 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -4628,7 +4628,7 @@ _dbus_logv (DBusSystemLogSeverity  severity,
             flags = LOG_DAEMON|LOG_CRIT;
             break;
           default:
-            return;
+            _dbus_assert_not_reached ("invalid log severity");
         }
 
       DBUS_VA_COPY (tmp, args);
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index e5cab35..5a94eaf 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -3720,6 +3720,7 @@ _dbus_logv (DBusSystemLogSeverity  severity,
      case DBUS_SYSTEM_LOG_WARNING: s = "warning"; break;
      case DBUS_SYSTEM_LOG_SECURITY: s = "security"; break;
      case DBUS_SYSTEM_LOG_FATAL: s = "fatal"; break;
+     default: _dbus_assert_not_reached ("invalid log severity");
    }
 
   if (log_flags & DBUS_LOG_FLAGS_SYSTEM_LOG)