From 222bd07e9df5e3b5a367d1282b43fd3a827a7552 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 4 Aug 2006 16:15:16 +0000 Subject: * configure.in: add -Wdeclaration-after-statement * dbus/dbus-connection.c: change all the pending call stuff to reflect the fact that pending call operations use the connection lock * dbus/dbus-pending-call.c: add locking here * dbus/dbus-errors.c (struct DBusRealError): don't make the name field const consistent with how message field is done --- dbus/dbus-pending-call-internal.h | 53 +++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 24 deletions(-) (limited to 'dbus/dbus-pending-call-internal.h') diff --git a/dbus/dbus-pending-call-internal.h b/dbus/dbus-pending-call-internal.h index 0a5aa25c..03fbdb46 100644 --- a/dbus/dbus-pending-call-internal.h +++ b/dbus/dbus-pending-call-internal.h @@ -31,30 +31,35 @@ DBUS_BEGIN_DECLS -dbus_bool_t _dbus_pending_call_is_timeout_added (DBusPendingCall *pending); -void _dbus_pending_call_set_timeout_added (DBusPendingCall *pending, - dbus_bool_t is_added); -DBusTimeout *_dbus_pending_call_get_timeout (DBusPendingCall *pending); -dbus_uint32_t _dbus_pending_call_get_reply_serial (DBusPendingCall *pending); -void _dbus_pending_call_set_reply_serial (DBusPendingCall *pending, - dbus_uint32_t serial); -DBusConnection *_dbus_pending_call_get_connection (DBusPendingCall *pending); - -void _dbus_pending_call_complete (DBusPendingCall *pending); -void _dbus_pending_call_set_reply (DBusPendingCall *pending, - DBusMessage *message); -void _dbus_pending_call_clear_connection (DBusPendingCall *pending); - -void _dbus_pending_call_queue_timeout_error (DBusPendingCall *pending, - DBusConnection *connection); -void _dbus_pending_call_set_reply_serial (DBusPendingCall *pending, - dbus_uint32_t serial); -dbus_bool_t _dbus_pending_call_set_timeout_error (DBusPendingCall *pending, - DBusMessage *message, - dbus_uint32_t serial); -DBusPendingCall* _dbus_pending_call_new (DBusConnection *connection, - int timeout_milliseconds, - DBusTimeoutHandler timeout_handler); +dbus_bool_t _dbus_pending_call_is_timeout_added_unlocked (DBusPendingCall *pending); +void _dbus_pending_call_set_timeout_added_unlocked (DBusPendingCall *pending, + dbus_bool_t is_added); +DBusTimeout * _dbus_pending_call_get_timeout_unlocked (DBusPendingCall *pending); +dbus_uint32_t _dbus_pending_call_get_reply_serial_unlocked (DBusPendingCall *pending); +void _dbus_pending_call_set_reply_serial_unlocked (DBusPendingCall *pending, + dbus_uint32_t serial); +DBusConnection * _dbus_pending_call_get_connection_and_lock (DBusPendingCall *pending); +DBusConnection * _dbus_pending_call_get_connection_unlocked (DBusPendingCall *pending); +dbus_bool_t _dbus_pending_call_get_completed_unlocked (DBusPendingCall *pending); +void _dbus_pending_call_complete (DBusPendingCall *pending); +void _dbus_pending_call_set_reply_unlocked (DBusPendingCall *pending, + DBusMessage *message); +void _dbus_pending_call_queue_timeout_error_unlocked (DBusPendingCall *pending, + DBusConnection *connection); +void _dbus_pending_call_set_reply_serial_unlocked (DBusPendingCall *pending, + dbus_uint32_t serial); +dbus_bool_t _dbus_pending_call_set_timeout_error_unlocked (DBusPendingCall *pending, + DBusMessage *message, + dbus_uint32_t serial); +DBusPendingCall* _dbus_pending_call_new_unlocked (DBusConnection *connection, + int timeout_milliseconds, + DBusTimeoutHandler timeout_handler); +DBusPendingCall* _dbus_pending_call_ref_unlocked (DBusPendingCall *pending); +void _dbus_pending_call_unref_and_unlock (DBusPendingCall *pending); +dbus_bool_t _dbus_pending_call_set_data_unlocked (DBusPendingCall *pending, + dbus_int32_t slot, + void *data, + DBusFreeFunction free_data_func); DBUS_END_DECLS -- cgit