From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 17 Jan 2017 20:49:31 +0000 (+0000)
Subject: DBusTransport: assert that invalid results don't happen
X-Git-Tag: dbus-1.11.12~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b044fa0c70ea4521185bb1c9677115372904465a;p=thirdparty%2Fdbus.git

DBusTransport: assert that invalid results don't happen

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-transport-socket.c b/dbus/dbus-transport-socket.c
index 0b8efe7fa..05acde0c3 100644
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -476,6 +476,9 @@ do_authentication (DBusTransport *transport,
           _dbus_verbose (" %s auth state: authenticated\n",
                          TRANSPORT_SIDE (transport));
           break;
+
+        case DBUS_AUTH_STATE_INVALID:
+          /* fall through */
         default:
           _dbus_assert_not_reached ("invalid auth state");
         }
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 9ff9bef6d..b1932c32e 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -410,6 +410,9 @@ _dbus_transport_open (DBusAddressEntry *entry,
           _DBUS_ASSERT_ERROR_IS_SET (&tmp_error);
           goto out;
           break;
+        default:
+          _dbus_assert_not_reached ("invalid transport open result");
+          break;
         }
     }