From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 29 Apr 2011 15:01:59 +0000 (+0100)
Subject: _dbus_message_remove_counter: remove ability to return the link
X-Git-Tag: dbus-1.5.6~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1ad8a9ac9290e6f0dd9323b4af9f994c4585372;p=thirdparty%2Fdbus.git

_dbus_message_remove_counter: remove ability to return the link

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34393
---

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index c93c3f850..400a79df2 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -666,7 +666,7 @@ _dbus_connection_message_sent_unlocked (DBusConnection *connection,
 
   /* It's OK that in principle we call the notify function, because for the
    * outgoing limit, there isn't one */
-  _dbus_message_remove_counter (message, connection->outgoing_counter, NULL);
+  _dbus_message_remove_counter (message, connection->outgoing_counter);
 
   /* The message will actually be unreffed when we unlock */
 }
@@ -2641,9 +2641,7 @@ free_outgoing_message (void *element,
   DBusMessage *message = element;
   DBusConnection *connection = data;
 
-  _dbus_message_remove_counter (message,
-                                connection->outgoing_counter,
-                                NULL);
+  _dbus_message_remove_counter (message, connection->outgoing_counter);
   dbus_message_unref (message);
 }
 
diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
index 870934b91..d4e8a6c59 100644
--- a/dbus/dbus-message-internal.h
+++ b/dbus/dbus-message-internal.h
@@ -46,8 +46,7 @@ dbus_bool_t _dbus_message_add_counter           (DBusMessage  *message,
 void        _dbus_message_add_counter_link      (DBusMessage  *message,
                                                  DBusList     *link);
 void        _dbus_message_remove_counter        (DBusMessage  *message,
-                                                 DBusCounter  *counter,
-                                                 DBusList    **link_return);
+                                                 DBusCounter  *counter);
 
 DBusMessageLoader* _dbus_message_loader_new                   (void);
 DBusMessageLoader* _dbus_message_loader_ref                   (DBusMessageLoader  *loader);
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index faaf3e191..cc1cfa177 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -296,13 +296,11 @@ _dbus_message_add_counter (DBusMessage *message,
  * decrements the counter by the size/unix fds of this message.
  *
  * @param message the message
- * @param link_return return the link used
  * @param counter the counter
  */
 void
 _dbus_message_remove_counter (DBusMessage  *message,
-                              DBusCounter  *counter,
-                              DBusList    **link_return)
+                              DBusCounter  *counter)
 {
   DBusList *link;
 
@@ -310,12 +308,7 @@ _dbus_message_remove_counter (DBusMessage  *message,
                                counter);
   _dbus_assert (link != NULL);
 
-  _dbus_list_unlink (&message->counters,
-                     link);
-  if (link_return)
-    *link_return = link;
-  else
-    _dbus_list_free_link (link);
+  _dbus_list_remove_link (&message->counters, link);
 
   _dbus_counter_adjust_size (counter, - message->size_counter_delta);