fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 07:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89284
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Ralf Habacker 2015-02-25 10:36:03 +01:00
parent 57971f69ef
commit c803f0fbe1
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dbus/dbus-internals.h
View file

@ -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)))