Attachment 113842 Details for Bug 89284 – Fix warning: 'the comparison will always evaluate as 'false' (update 2)

[patch] Fix warning: 'the comparison will always evaluate as 'false' (update 2)

0001-Fix-warning-the-comparison-will-always-evaluate-as-fal.txt (text/plain), 1.50 KB, created by Ralf Habacker on 2015-02-26 10:05:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-02-26 10:05:29 UTC

Size: 1.50 KB

patch

obsolete

>From 1da19627321cd2b6451265ba3ebf6ac3c64946fe Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 25 Feb 2015 10:36:03 +0100
>Subject: [PATCH] Fix warning: 'the comparison will always evaluate as 'false'
> for the address of '....' will never be NULL [-Waddress]'
>
>---
> dbus/dbus-internals.h | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
>index d394680..6368538 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)))
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 89284: 113763 | 113808 | 113814 | 113842 | 113946 | 113953 | 113956 | 113957 | 113958 | 113976 | 113977 | 113978 | 113980 | 113985 | 113987

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.