From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 14 Jul 2011 16:14:29 +0000 (+0100)
Subject: dbus_message_ref: avoid unused variable if not asserting
X-Git-Tag: dbus-1.4.14~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc6ae73598bedab9ceac18d6ea693f89cd7cfb26;p=thirdparty%2Fdbus.git

dbus_message_ref: avoid unused variable if not asserting

Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38005
---

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index d62529cbe..a6426ba40 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -1519,14 +1519,20 @@ dbus_message_copy (const DBusMessage *message)
 DBusMessage *
 dbus_message_ref (DBusMessage *message)
 {
+#ifndef DBUS_DISABLE_ASSERT
   dbus_int32_t old_refcount;
+#endif
 
   _dbus_return_val_if_fail (message != NULL, NULL);
   _dbus_return_val_if_fail (message->generation == _dbus_current_generation, NULL);
   _dbus_return_val_if_fail (!message->in_cache, NULL);
-  
+
+#ifdef DBUS_DISABLE_ASSERT
+  _dbus_atomic_inc (&message->refcount);
+#else
   old_refcount = _dbus_atomic_inc (&message->refcount);
   _dbus_assert (old_refcount >= 1);
+#endif
 
   return message;
 }