From 8db220cbf24026277e283ec51fe2c136c4100d6e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 22 Feb 2011 18:50:02 +0000 Subject: [PATCH 03/10] _dbus_connection_message_sent: rename to _unlocked It's called with the connection's lock held. --- dbus/dbus-connection-internal.h | 2 +- dbus/dbus-connection.c | 6 +++--- dbus/dbus-transport-socket.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h index cdf3f59..7e315db 100644 --- a/dbus/dbus-connection-internal.h +++ b/dbus/dbus-connection-internal.h @@ -54,7 +54,7 @@ void _dbus_connection_queue_received_message_link (DBusConnection DBusList *link); dbus_bool_t _dbus_connection_has_messages_to_send_unlocked (DBusConnection *connection); DBusMessage* _dbus_connection_get_message_to_send (DBusConnection *connection); -void _dbus_connection_message_sent (DBusConnection *connection, +void _dbus_connection_message_sent_unlocked (DBusConnection *connection, DBusMessage *message); dbus_bool_t _dbus_connection_add_watch_unlocked (DBusConnection *connection, DBusWatch *watch); diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 6779b6a..3538ee3 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -599,8 +599,8 @@ _dbus_connection_get_message_to_send (DBusConnection *connection) * @param message the message that was sent. */ void -_dbus_connection_message_sent (DBusConnection *connection, - DBusMessage *message) +_dbus_connection_message_sent_unlocked (DBusConnection *connection, + DBusMessage *message) { DBusList *link; @@ -4181,7 +4181,7 @@ notify_disconnected_unlocked (DBusConnection *connection) while ((link = _dbus_list_get_last_link (&connection->outgoing_messages))) { - _dbus_connection_message_sent (connection, link->data); + _dbus_connection_message_sent_unlocked (connection, link->data); } } } diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 1d4c2bf..779505a 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -677,8 +677,8 @@ do_writing (DBusTransport *transport) _dbus_string_set_length (&socket_transport->encoded_outgoing, 0); _dbus_string_compact (&socket_transport->encoded_outgoing, 2048); - _dbus_connection_message_sent (transport->connection, - message); + _dbus_connection_message_sent_unlocked (transport->connection, + message); } } } -- 1.7.4.1