From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 25 Feb 2015 09:36:03 +0000 (+0100)
Subject: Fix warning: 'the comparison will always evaluate as 'false' for the address of ... 
X-Git-Tag: dbus-1.9.14~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c803f0fbe129677c07722d4bd820f59ad86217ef;p=thirdparty%2Fdbus.git

Fix warning: 'the comparison will always evaluate as 'false' for the address of '....' will never be NULL [-Waddress]'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89284
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index d39468067..636853894 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -202,8 +202,20 @@ extern const char *_dbus_return_if_fail_warning_format;
 #define _DBUS_ASSERT_ERROR_IS_SET(error) do { } while (0)
 #define _DBUS_ASSERT_ERROR_IS_CLEAR(error) do { } while (0)
 #else
-#define _DBUS_ASSERT_ERROR_IS_SET(error)   _dbus_assert ((error) == NULL || dbus_error_is_set ((error)))
-#define _DBUS_ASSERT_ERROR_IS_CLEAR(error) _dbus_assert ((error) == NULL || !dbus_error_is_set ((error)))
+static inline void
+_dbus_assert_error_is_set (const DBusError *error)
+{
+    _dbus_assert (error == NULL || dbus_error_is_set (error));
+}
+
+static inline void
+_dbus_assert_error_is_clear (const DBusError *error)
+{
+    _dbus_assert (error == NULL || !dbus_error_is_set (error));
+}
+
+#define _DBUS_ASSERT_ERROR_IS_SET(error) _dbus_assert_error_is_set(error)
+#define _DBUS_ASSERT_ERROR_IS_CLEAR(error) _dbus_assert_error_is_clear(error)
 #endif
 
 #define _dbus_return_if_error_is_set(error) _dbus_return_if_fail ((error) == NULL || !dbus_error_is_set ((error)))