diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-02-25 10:36:03 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-03-02 09:40:22 +0100 |
| commit | c803f0fbe129677c07722d4bd820f59ad86217ef (patch) | |
| tree | c84b78dd391787453b2fdfbdf74bd2e324f4e501 | |
| parent | 57971f69ef610079d16e32de78c2dfaf9a8750a1 (diff) | |
| download | dbus-c803f0fbe129677c07722d4bd820f59ad86217ef.tar.gz | |
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>
| -rw-r--r-- | dbus/dbus-internals.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index d3946806..63685389 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))) |