dbus/dbus dbus-auth.c,1.29,1.30 dbus-auth.h,1.6,1.7 dbus-connection-internal.h,1.14,1.15 dbus-connection.c,1.73,1.74 dbus-connection.h,1.25,1.26 dbus-hash.c,1.15,1.16 dbus-hash.h,1.10,1.11 dbus-keyring.c,1.19,1.20 dbus-keyring.h,1.4,1.5 dbus-mainloop.c,1.13,1.14 dbus-mainloop.h,1.4,1.5 dbus-message-handler.c,1.9,1.10 dbus-message-handler.h,1.1,1.2 dbus-message-internal.h,1.14,1.15 dbus-message.c,1.114,1.115 dbus-message.h,1.47,1.48 dbus-object-tree.c,1.2,1.3 dbus-object-tree.h,1.2,1.3 dbus-pending-call.c,1.4,1.5 dbus-pending-call.h,1.2,1.3 dbus-resources.c,1.1,1.2 dbus-resources.h,1.1,1.2 dbus-server.c,1.30,1.31 dbus-server.h,1.13,1.14 dbus-spawn.c,1.13,1.14 dbus-spawn.h,1.3,1.4 dbus-timeout.c,1.11,1.12 dbus-timeout.h,1.6,1.7 dbus-transport.c,1.35,1.36 dbus-transport.h,1.11,1.12 dbus-userdb.c,1.5,1.6 dbus-userdb.h,1.2,1.3 dbus-watch.c,1.14,1.15 dbus-watch.h,1.4,1.5
Mikael Hallendal
micke@pdx.freedesktop.org
Wed, 26 Nov 2003 17:25:52 -0800
- Previous message: dbus/glib dbus-gidl.c,1.2,1.3 dbus-gidl.h,1.2,1.3 dbus-gmain.c,1.25,1.26 dbus-gparser.c,1.2,1.3 dbus-gparser.h,1.2,1.3 dbus-gproxy.c,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dbus/dbus/dbus
In directory pdx:/tmp/cvs-serv6358/dbus
Modified Files:
dbus-auth.c dbus-auth.h dbus-connection-internal.h
dbus-connection.c dbus-connection.h dbus-hash.c dbus-hash.h
dbus-keyring.c dbus-keyring.h dbus-mainloop.c dbus-mainloop.h
dbus-message-handler.c dbus-message-handler.h
dbus-message-internal.h dbus-message.c dbus-message.h
dbus-object-tree.c dbus-object-tree.h dbus-pending-call.c
dbus-pending-call.h dbus-resources.c dbus-resources.h
dbus-server.c dbus-server.h dbus-spawn.c dbus-spawn.h
dbus-timeout.c dbus-timeout.h dbus-transport.c
dbus-transport.h dbus-userdb.c dbus-userdb.h dbus-watch.c
dbus-watch.h
Log Message:
2003-11-26 Mikael Hallendal <micke@imendio.com>
* bus/*.[ch]:
* dbus/*.[ch]:
* glib/*.[ch]: Made ref functions return the pointer
Index: dbus-auth.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-auth.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- dbus-auth.c 30 Sep 2003 02:32:52 -0000 1.29
+++ dbus-auth.c 27 Nov 2003 01:25:49 -0000 1.30
@@ -1894,13 +1894,16 @@
* Increments the refcount of an auth object.
*
* @param auth the auth conversation
+ * @returns the auth conversation
*/
-void
+DBusAuth *
_dbus_auth_ref (DBusAuth *auth)
{
_dbus_assert (auth != NULL);
auth->refcount += 1;
+
+ return auth;
}
/**
Index: dbus-auth.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-auth.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dbus-auth.h 1 Apr 2003 05:33:01 -0000 1.6
+++ dbus-auth.h 27 Nov 2003 01:25:49 -0000 1.7
@@ -44,7 +44,7 @@
DBusAuth* _dbus_auth_server_new (void);
DBusAuth* _dbus_auth_client_new (void);
-void _dbus_auth_ref (DBusAuth *auth);
+DBusAuth* _dbus_auth_ref (DBusAuth *auth);
void _dbus_auth_unref (DBusAuth *auth);
dbus_bool_t _dbus_auth_set_mechanisms (DBusAuth *auth,
const char **mechanisms);
Index: dbus-connection-internal.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection-internal.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dbus-connection-internal.h 26 Oct 2003 15:36:15 -0000 1.14
+++ dbus-connection-internal.h 27 Nov 2003 01:25:49 -0000 1.15
@@ -46,7 +46,7 @@
void _dbus_connection_lock (DBusConnection *connection);
void _dbus_connection_unlock (DBusConnection *connection);
-void _dbus_connection_ref_unlocked (DBusConnection *connection);
+DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection);
void _dbus_connection_unref_unlocked (DBusConnection *connection);
dbus_bool_t _dbus_connection_queue_received_message (DBusConnection *connection,
DBusMessage *message);
Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- dbus-connection.c 26 Oct 2003 15:36:15 -0000 1.73
+++ dbus-connection.c 27 Nov 2003 01:25:49 -0000 1.74
@@ -219,11 +219,13 @@
DBusDispatchStatus new_status);
static void _dbus_connection_last_unref (DBusConnection *connection);
-static void
+static DBusMessageFilter *
_dbus_message_filter_ref (DBusMessageFilter *filter)
{
_dbus_assert (filter->refcount.value > 0);
_dbus_atomic_inc (&filter->refcount);
+
+ return filter;
}
static void
@@ -963,8 +965,9 @@
* Requires that the caller already holds the connection lock.
*
* @param connection the connection.
+ * @returns the connection.
*/
-void
+DBusConnection *
_dbus_connection_ref_unlocked (DBusConnection *connection)
{
#ifdef DBUS_HAVE_ATOMIC_INT
@@ -973,6 +976,8 @@
_dbus_assert (connection->refcount.value > 0);
connection->refcount.value += 1;
#endif
+
+ return connection;
}
/**
@@ -1117,11 +1122,12 @@
* Increments the reference count of a DBusConnection.
*
* @param connection the connection.
+ * @returns the connection.
*/
-void
+DBusConnection *
dbus_connection_ref (DBusConnection *connection)
{
- _dbus_return_if_fail (connection != NULL);
+ _dbus_return_val_if_fail (connection != NULL, NULL);
/* The connection lock is better than the global
* lock in the atomic increment fallback
@@ -1136,6 +1142,8 @@
connection->refcount.value += 1;
CONNECTION_UNLOCK (connection);
#endif
+
+ return connection;
}
static void
Index: dbus-connection.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dbus-connection.h 30 Sep 2003 02:32:52 -0000 1.25
+++ dbus-connection.h 27 Nov 2003 01:25:49 -0000 1.26
@@ -95,7 +95,7 @@
DBusConnection* dbus_connection_open (const char *address,
DBusError *error);
-void dbus_connection_ref (DBusConnection *connection);
+DBusConnection* dbus_connection_ref (DBusConnection *connection);
void dbus_connection_unref (DBusConnection *connection);
void dbus_connection_disconnect (DBusConnection *connection);
dbus_bool_t dbus_connection_get_is_connected (DBusConnection *connection);
Index: dbus-hash.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-hash.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbus-hash.c 30 Sep 2003 02:32:52 -0000 1.15
+++ dbus-hash.c 27 Nov 2003 01:25:49 -0000 1.16
@@ -348,11 +348,14 @@
* Increments the reference count for a hash table.
*
* @param table the hash table to add a reference to.
+ * @returns the hash table.
*/
-void
+DBusHashTable *
_dbus_hash_table_ref (DBusHashTable *table)
{
table->refcount += 1;
+
+ return table;
}
/**
Index: dbus-hash.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-hash.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-hash.h 30 Sep 2003 02:32:52 -0000 1.10
+++ dbus-hash.h 27 Nov 2003 01:25:49 -0000 1.11
@@ -61,7 +61,7 @@
DBusHashTable* _dbus_hash_table_new (DBusHashType type,
DBusFreeFunction key_free_function,
DBusFreeFunction value_free_function);
-void _dbus_hash_table_ref (DBusHashTable *table);
+DBusHashTable* _dbus_hash_table_ref (DBusHashTable *table);
void _dbus_hash_table_unref (DBusHashTable *table);
void _dbus_hash_iter_init (DBusHashTable *table,
DBusHashIter *iter);
Index: dbus-keyring.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-keyring.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dbus-keyring.c 30 Sep 2003 02:32:52 -0000 1.19
+++ dbus-keyring.c 27 Nov 2003 01:25:49 -0000 1.20
@@ -657,11 +657,14 @@
* Increments reference count of the keyring
*
* @param keyring the keyring
+ * @returns the keyring
*/
-void
+DBusKeyring *
_dbus_keyring_ref (DBusKeyring *keyring)
{
keyring->refcount += 1;
+
+ return keyring;
}
/**
Index: dbus-keyring.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-keyring.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-keyring.h 5 Mar 2003 02:01:34 -0000 1.4
+++ dbus-keyring.h 27 Nov 2003 01:25:49 -0000 1.5
@@ -34,7 +34,7 @@
DBusKeyring* _dbus_keyring_new_homedir (const DBusString *username,
const DBusString *context,
DBusError *error);
-void _dbus_keyring_ref (DBusKeyring *keyring);
+DBusKeyring* _dbus_keyring_ref (DBusKeyring *keyring);
void _dbus_keyring_unref (DBusKeyring *keyring);
dbus_bool_t _dbus_keyring_validate_context (const DBusString *context);
int _dbus_keyring_get_best_key (DBusKeyring *keyring,
Index: dbus-mainloop.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-mainloop.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dbus-mainloop.c 30 Sep 2003 02:32:52 -0000 1.13
+++ dbus-mainloop.c 27 Nov 2003 01:25:49 -0000 1.14
@@ -123,12 +123,14 @@
return cb;
}
-static void
+static Callback *
callback_ref (Callback *cb)
{
_dbus_assert (cb->refcount > 0);
cb->refcount += 1;
+
+ return cb;
}
static void
@@ -204,13 +206,15 @@
return loop;
}
-void
+DBusLoop *
_dbus_loop_ref (DBusLoop *loop)
{
_dbus_assert (loop != NULL);
_dbus_assert (loop->refcount > 0);
loop->refcount += 1;
+
+ return loop;
}
void
Index: dbus-mainloop.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-mainloop.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-mainloop.h 30 Sep 2003 02:32:52 -0000 1.4
+++ dbus-mainloop.h 27 Nov 2003 01:25:49 -0000 1.5
@@ -37,7 +37,7 @@
void *data);
DBusLoop* _dbus_loop_new (void);
-void _dbus_loop_ref (DBusLoop *loop);
+DBusLoop* _dbus_loop_ref (DBusLoop *loop);
void _dbus_loop_unref (DBusLoop *loop);
dbus_bool_t _dbus_loop_add_watch (DBusLoop *loop,
DBusWatch *watch,
Index: dbus-message-handler.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message-handler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus-message-handler.c 12 May 2003 02:44:44 -0000 1.9
+++ dbus-message-handler.c 27 Nov 2003 01:25:49 -0000 1.10
@@ -189,13 +189,16 @@
* Increments the reference count on a message handler.
*
* @param handler the handler
+ * @returns the handler
*/
-void
+DBusMessageHandler *
dbus_message_handler_ref (DBusMessageHandler *handler)
{
_dbus_return_if_fail (handler != NULL);
_dbus_atomic_inc (&handler->refcount);
+
+ return handler;
}
/**
Index: dbus-message-handler.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message-handler.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus-message-handler.h 24 Dec 2002 06:37:32 -0000 1.1
+++ dbus-message-handler.h 27 Nov 2003 01:25:49 -0000 1.2
@@ -43,7 +43,7 @@
DBusFreeFunction free_user_data);
-void dbus_message_handler_ref (DBusMessageHandler *handler);
+DBusMessageHandler* dbus_message_handler_ref (DBusMessageHandler *handler);
void dbus_message_handler_unref (DBusMessageHandler *handler);
Index: dbus-message-internal.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message-internal.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dbus-message-internal.h 12 May 2003 02:44:44 -0000 1.14
+++ dbus-message-internal.h 27 Nov 2003 01:25:49 -0000 1.15
@@ -48,7 +48,7 @@
DBusList **link_return);
DBusMessageLoader* _dbus_message_loader_new (void);
-void _dbus_message_loader_ref (DBusMessageLoader *loader);
+DBusMessageLoader* _dbus_message_loader_ref (DBusMessageLoader *loader);
void _dbus_message_loader_unref (DBusMessageLoader *loader);
void _dbus_message_loader_get_buffer (DBusMessageLoader *loader,
Index: dbus-message.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- dbus-message.c 29 Oct 2003 00:29:52 -0000 1.114
+++ dbus-message.c 27 Nov 2003 01:25:49 -0000 1.115
@@ -1504,17 +1504,20 @@
* Increments the reference count of a DBusMessage.
*
* @param message The message
+ * @returns the message
* @see dbus_message_unref
*/
-void
+DBusMessage *
dbus_message_ref (DBusMessage *message)
{
dbus_int32_t old_refcount;
- _dbus_return_if_fail (message != NULL);
+ _dbus_return_val_if_fail (message != NULL, NULL);
old_refcount = _dbus_atomic_inc (&message->refcount);
_dbus_assert (old_refcount >= 1);
+
+ return message;
}
static void
@@ -4781,11 +4784,14 @@
* Increments the reference count of the loader.
*
* @param loader the loader.
+ * @returns the loader
*/
-void
+DBusMessageLoader *
_dbus_message_loader_ref (DBusMessageLoader *loader)
{
loader->refcount += 1;
+
+ return loader;
}
/**
Index: dbus-message.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- dbus-message.h 21 Oct 2003 05:46:51 -0000 1.47
+++ dbus-message.h 27 Nov 2003 01:25:49 -0000 1.48
@@ -73,9 +73,9 @@
const char *error_name,
const char *error_message);
-DBusMessage *dbus_message_copy (const DBusMessage *message);
+DBusMessage* dbus_message_copy (const DBusMessage *message);
-void dbus_message_ref (DBusMessage *message);
+DBusMessage* dbus_message_ref (DBusMessage *message);
void dbus_message_unref (DBusMessage *message);
int dbus_message_get_type (DBusMessage *message);
dbus_bool_t dbus_message_set_path (DBusMessage *message,
Index: dbus-object-tree.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-object-tree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbus-object-tree.c 30 Sep 2003 02:32:53 -0000 1.2
+++ dbus-object-tree.c 27 Nov 2003 01:25:49 -0000 1.3
@@ -46,7 +46,7 @@
static DBusObjectSubtree* _dbus_object_subtree_new (const char *name,
const DBusObjectPathVTable *vtable,
void *user_data);
-static void _dbus_object_subtree_ref (DBusObjectSubtree *subtree);
+static DBusObjectSubtree* _dbus_object_subtree_ref (DBusObjectSubtree *subtree);
static void _dbus_object_subtree_unref (DBusObjectSubtree *subtree);
/**
@@ -121,13 +121,16 @@
/**
* Increment the reference count
* @param tree the object tree
+ * @returns the object tree
*/
-void
+DBusObjectTree *
_dbus_object_tree_ref (DBusObjectTree *tree)
{
_dbus_assert (tree->refcount > 0);
tree->refcount += 1;
+
+ return tree;
}
/**
@@ -859,11 +862,13 @@
return NULL;
}
-static void
+static DBusObjectSubtree *
_dbus_object_subtree_ref (DBusObjectSubtree *subtree)
{
_dbus_assert (subtree->refcount.value > 0);
_dbus_atomic_inc (&subtree->refcount);
+
+ return subtree;
}
static void
Index: dbus-object-tree.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-object-tree.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbus-object-tree.h 30 Sep 2003 02:32:53 -0000 1.2
+++ dbus-object-tree.h 27 Nov 2003 01:25:49 -0000 1.3
@@ -30,7 +30,7 @@
typedef struct DBusObjectTree DBusObjectTree;
DBusObjectTree* _dbus_object_tree_new (DBusConnection *connection);
-void _dbus_object_tree_ref (DBusObjectTree *tree);
+DBusObjectTree* _dbus_object_tree_ref (DBusObjectTree *tree);
void _dbus_object_tree_unref (DBusObjectTree *tree);
dbus_bool_t _dbus_object_tree_register (DBusObjectTree *tree,
Index: dbus-pending-call.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-pending-call.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-pending-call.c 16 Oct 2003 06:34:51 -0000 1.4
+++ dbus-pending-call.c 27 Nov 2003 01:25:49 -0000 1.5
@@ -138,13 +138,16 @@
* Increments the reference count on a pending call.
*
* @param pending the pending call object
+ * @returns the pending call object
*/
-void
+DBusPendingCall *
dbus_pending_call_ref (DBusPendingCall *pending)
{
_dbus_return_if_fail (pending != NULL);
_dbus_atomic_inc (&pending->refcount);
+
+ return pending;
}
/**
Index: dbus-pending-call.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-pending-call.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbus-pending-call.h 30 Sep 2003 02:32:53 -0000 1.2
+++ dbus-pending-call.h 27 Nov 2003 01:25:49 -0000 1.3
@@ -33,7 +33,7 @@
DBUS_BEGIN_DECLS;
-void dbus_pending_call_ref (DBusPendingCall *pending);
+DBusPendingCall* dbus_pending_call_ref (DBusPendingCall *pending);
void dbus_pending_call_unref (DBusPendingCall *pending);
dbus_bool_t dbus_pending_call_set_notify (DBusPendingCall *pending,
DBusPendingCallNotifyFunction function,
Index: dbus-resources.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-resources.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus-resources.c 19 Jan 2003 03:33:35 -0000 1.1
+++ dbus-resources.c 27 Nov 2003 01:25:49 -0000 1.2
@@ -96,13 +96,16 @@
* Increments refcount of the counter
*
* @param counter the counter
+ * @returns the counter
*/
-void
+DBusCounter *
_dbus_counter_ref (DBusCounter *counter)
{
_dbus_assert (counter->refcount > 0);
counter->refcount += 1;
+
+ return counter;
}
/**
Index: dbus-resources.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-resources.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus-resources.h 19 Jan 2003 03:33:35 -0000 1.1
+++ dbus-resources.h 27 Nov 2003 01:25:49 -0000 1.2
@@ -35,7 +35,7 @@
void *user_data);
DBusCounter* _dbus_counter_new (void);
-void _dbus_counter_ref (DBusCounter *counter);
+DBusCounter* _dbus_counter_ref (DBusCounter *counter);
void _dbus_counter_unref (DBusCounter *counter);
void _dbus_counter_adjust (DBusCounter *counter,
long delta);
Index: dbus-server.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-server.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dbus-server.c 30 Sep 2003 02:32:53 -0000 1.30
+++ dbus-server.c 27 Nov 2003 01:25:49 -0000 1.31
@@ -450,13 +450,16 @@
* Increments the reference count of a DBusServer.
*
* @param server the server.
+ * @returns the server
*/
-void
+DBusServer *
dbus_server_ref (DBusServer *server)
{
_dbus_return_if_fail (server != NULL);
server->refcount += 1;
+
+ return server;
}
/**
Index: dbus-server.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-server.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dbus-server.h 22 Jun 2003 19:39:47 -0000 1.13
+++ dbus-server.h 27 Nov 2003 01:25:49 -0000 1.14
@@ -41,7 +41,7 @@
DBusServer* dbus_server_listen (const char *address,
DBusError *error);
-void dbus_server_ref (DBusServer *server);
+DBusServer* dbus_server_ref (DBusServer *server);
void dbus_server_unref (DBusServer *server);
void dbus_server_disconnect (DBusServer *server);
dbus_bool_t dbus_server_get_is_connected (DBusServer *server);
Index: dbus-spawn.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-spawn.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dbus-spawn.c 30 Sep 2003 02:32:53 -0000 1.13
+++ dbus-spawn.c 27 Nov 2003 01:25:49 -0000 1.14
@@ -235,14 +235,17 @@
* Increment the reference count on the babysitter object.
*
* @param sitter the babysitter
+ * @returns the babysitter
*/
-void
+DBusBabysitter *
_dbus_babysitter_ref (DBusBabysitter *sitter)
{
_dbus_assert (sitter != NULL);
_dbus_assert (sitter->refcount > 0);
sitter->refcount += 1;
+
+ return sitter;
}
/**
Index: dbus-spawn.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-spawn.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dbus-spawn.h 18 Apr 2003 04:18:57 -0000 1.3
+++ dbus-spawn.h 27 Nov 2003 01:25:49 -0000 1.4
@@ -40,7 +40,7 @@
DBusSpawnChildSetupFunc child_setup,
void *user_data,
DBusError *error);
-void _dbus_babysitter_ref (DBusBabysitter *sitter);
+DBusBabysitter* _dbus_babysitter_ref (DBusBabysitter *sitter);
void _dbus_babysitter_unref (DBusBabysitter *sitter);
void _dbus_babysitter_kill_child (DBusBabysitter *sitter);
dbus_bool_t _dbus_babysitter_get_child_exited (DBusBabysitter *sitter);
Index: dbus-timeout.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-timeout.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-timeout.c 30 Sep 2003 02:32:53 -0000 1.11
+++ dbus-timeout.c 27 Nov 2003 01:25:49 -0000 1.12
@@ -86,11 +86,14 @@
* Increments the reference count of a DBusTimeout object.
*
* @param timeout the timeout object.
+ * @returns the timeout object.
*/
-void
+DBusTimeout *
_dbus_timeout_ref (DBusTimeout *timeout)
{
timeout->refcount += 1;
+
+ return timeout;
}
/**
Index: dbus-timeout.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-timeout.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dbus-timeout.h 24 Apr 2003 21:26:25 -0000 1.6
+++ dbus-timeout.h 27 Nov 2003 01:25:49 -0000 1.7
@@ -38,7 +38,7 @@
DBusTimeoutHandler handler,
void *data,
DBusFreeFunction free_data_function);
-void _dbus_timeout_ref (DBusTimeout *timeout);
+DBusTimeout* _dbus_timeout_ref (DBusTimeout *timeout);
void _dbus_timeout_unref (DBusTimeout *timeout);
void _dbus_timeout_set_interval (DBusTimeout *timeout,
int interval);
Index: dbus-transport.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-transport.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- dbus-transport.c 26 Oct 2003 15:36:15 -0000 1.35
+++ dbus-transport.c 27 Nov 2003 01:25:49 -0000 1.36
@@ -365,13 +365,16 @@
* Increments the reference count for the transport.
*
* @param transport the transport.
+ * @returns the transport.
*/
-void
+DBusTransport *
_dbus_transport_ref (DBusTransport *transport)
{
_dbus_assert (transport->refcount > 0);
transport->refcount += 1;
+
+ return transport;
}
/**
Index: dbus-transport.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-transport.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-transport.h 16 Apr 2003 23:01:33 -0000 1.11
+++ dbus-transport.h 27 Nov 2003 01:25:49 -0000 1.12
@@ -32,7 +32,7 @@
DBusTransport* _dbus_transport_open (const char *address,
DBusError *error);
-void _dbus_transport_ref (DBusTransport *transport);
+DBusTransport* _dbus_transport_ref (DBusTransport *transport);
void _dbus_transport_unref (DBusTransport *transport);
void _dbus_transport_disconnect (DBusTransport *transport);
dbus_bool_t _dbus_transport_get_is_connected (DBusTransport *transport);
Index: dbus-userdb.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbus-userdb.c 30 Sep 2003 02:32:53 -0000 1.5
+++ dbus-userdb.c 27 Nov 2003 01:25:49 -0000 1.6
@@ -635,13 +635,16 @@
/**
* Increments refcount of user database.
* @param db the database
+ * @returns the database
*/
-void
+DBusUserDatabase *
_dbus_user_database_ref (DBusUserDatabase *db)
{
_dbus_assert (db->refcount > 0);
db->refcount += 1;
+
+ return db;
}
/**
Index: dbus-userdb.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbus-userdb.h 17 Apr 2003 23:17:04 -0000 1.2
+++ dbus-userdb.h 27 Nov 2003 01:25:49 -0000 1.3
@@ -31,7 +31,7 @@
typedef struct DBusUserDatabase DBusUserDatabase;
DBusUserDatabase* _dbus_user_database_new (void);
-void _dbus_user_database_ref (DBusUserDatabase *db);
+DBusUserDatabase* _dbus_user_database_ref (DBusUserDatabase *db);
void _dbus_user_database_unref (DBusUserDatabase *db);
dbus_bool_t _dbus_user_database_get_groups (DBusUserDatabase *db,
dbus_uid_t uid,
Index: dbus-watch.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-watch.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dbus-watch.c 30 Sep 2003 02:32:53 -0000 1.14
+++ dbus-watch.c 27 Nov 2003 01:25:49 -0000 1.15
@@ -97,11 +97,14 @@
* Increments the reference count of a DBusWatch object.
*
* @param watch the watch object.
+ * @returns the watch object.
*/
-void
+DBusWatch *
_dbus_watch_ref (DBusWatch *watch)
{
watch->refcount += 1;
+
+ return watch;
}
/**
Index: dbus-watch.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-watch.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-watch.h 18 Apr 2003 04:18:57 -0000 1.4
+++ dbus-watch.h 27 Nov 2003 01:25:49 -0000 1.5
@@ -42,7 +42,7 @@
DBusWatchHandler handler,
void *data,
DBusFreeFunction free_data_function);
-void _dbus_watch_ref (DBusWatch *watch);
+DBusWatch* _dbus_watch_ref (DBusWatch *watch);
void _dbus_watch_unref (DBusWatch *watch);
void _dbus_watch_invalidate (DBusWatch *watch);
void _dbus_watch_sanitize_condition (DBusWatch *watch,
- Previous message: dbus/glib dbus-gidl.c,1.2,1.3 dbus-gidl.h,1.2,1.3 dbus-gmain.c,1.25,1.26 dbus-gparser.c,1.2,1.3 dbus-gparser.h,1.2,1.3 dbus-gproxy.c,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]