dbus/bus activation.c,1.29,1.30 activation.h,1.9,1.10 bus.c,1.46,1.47 bus.h,1.20,1.21 config-parser.c,1.25,1.26 config-parser.h,1.11,1.12 connection.c,1.51,1.52 connection.h,1.17,1.18 policy.c,1.16,1.17 policy.h,1.11,1.12 services.c,1.16,1.17 services.h,1.8,1.9 signals.c,1.5,1.6 signals.h,1.2,1.3

Mikael Hallendal micke@pdx.freedesktop.org
Wed, 26 Nov 2003 17:25:51 -0800


Update of /cvs/dbus/dbus/bus
In directory pdx:/tmp/cvs-serv6358/bus

Modified Files:
	activation.c activation.h bus.c bus.h config-parser.c 
	config-parser.h connection.c connection.h policy.c policy.h 
	services.c services.h signals.c signals.h 
Log Message:
2003-11-26  Mikael Hallendal  <micke@imendio.com>

	* bus/*.[ch]:
	* dbus/*.[ch]:
	* glib/*.[ch]: Made ref functions return the pointer



Index: activation.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/activation.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- activation.c	16 Oct 2003 06:34:51 -0000	1.29
+++ activation.c	27 Nov 2003 01:25:49 -0000	1.30
@@ -99,11 +99,13 @@
     _dbus_wait_for_memory ();
 }
 
-static void
+static BusPendingActivation * 
 bus_pending_activation_ref (BusPendingActivation *pending_activation)
 {
   _dbus_assert (pending_activation->refcount > 0);
   pending_activation->refcount += 1;
+
+  return pending_activation;
 }
 
 static void
@@ -445,12 +447,14 @@
   return NULL;
 }
 
-void
+BusActivation *
 bus_activation_ref (BusActivation *activation)
 {
   _dbus_assert (activation->refcount > 0);
   
   activation->refcount += 1;
+
+  return activation;
 }
 
 void

Index: activation.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/activation.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- activation.h	2 Apr 2003 20:14:52 -0000	1.9
+++ activation.h	27 Nov 2003 01:25:49 -0000	1.10
@@ -32,7 +32,7 @@
                                                 const DBusString  *address,
                                                 DBusList         **directories,
                                                 DBusError         *error);
-void           bus_activation_ref              (BusActivation     *activation);
+BusActivation* bus_activation_ref              (BusActivation     *activation);
 void           bus_activation_unref            (BusActivation     *activation);
 dbus_bool_t    bus_activation_activate_service (BusActivation     *activation,
                                                 DBusConnection    *connection,

Index: bus.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/bus.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- bus.c	22 Oct 2003 16:01:08 -0000	1.46
+++ bus.c	27 Nov 2003 01:25:49 -0000	1.47
@@ -670,11 +670,13 @@
     }
 }
 
-void
+BusContext *
 bus_context_ref (BusContext *context)
 {
   _dbus_assert (context->refcount > 0);
   context->refcount += 1;
+
+  return context;
 }
 
 void

Index: bus.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/bus.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bus.h	14 Oct 2003 05:16:56 -0000	1.20
+++ bus.h	27 Nov 2003 01:25:49 -0000	1.21
@@ -66,7 +66,7 @@
                                                                   int               print_pid_fd,
                                                                   DBusError        *error);
 void              bus_context_shutdown                           (BusContext       *context);
-void              bus_context_ref                                (BusContext       *context);
+BusContext*       bus_context_ref                                (BusContext       *context);
 void              bus_context_unref                              (BusContext       *context);
 const char*       bus_context_get_type                           (BusContext       *context);
 const char*       bus_context_get_address                        (BusContext       *context);

Index: config-parser.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-parser.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- config-parser.c	14 Oct 2003 22:16:03 -0000	1.25
+++ config-parser.c	27 Nov 2003 01:25:49 -0000	1.26
@@ -345,12 +345,14 @@
   return parser;
 }
 
-void
+BusConfigParser *
 bus_config_parser_ref (BusConfigParser *parser)
 {
   _dbus_assert (parser->refcount > 0);
 
   parser->refcount += 1;
+
+  return parser;
 }
 
 void

Index: config-parser.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-parser.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config-parser.h	28 Apr 2003 19:29:41 -0000	1.11
+++ config-parser.h	27 Nov 2003 01:25:49 -0000	1.12
@@ -37,7 +37,7 @@
 
 BusConfigParser* bus_config_parser_new           (const DBusString  *basedir,
                                                   dbus_bool_t        is_toplevel);
-void             bus_config_parser_ref           (BusConfigParser   *parser);
+BusConfigParser* bus_config_parser_ref           (BusConfigParser   *parser);
 void             bus_config_parser_unref         (BusConfigParser   *parser);
 dbus_bool_t      bus_config_parser_check_doctype (BusConfigParser   *parser,
                                                   const char        *doctype,

Index: connection.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/connection.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- connection.c	28 Oct 2003 23:51:24 -0000	1.51
+++ connection.c	27 Nov 2003 01:25:49 -0000	1.52
@@ -471,11 +471,13 @@
   return NULL;
 }
 
-void
+BusConnections *
 bus_connections_ref (BusConnections *connections)
 {
   _dbus_assert (connections->refcount > 0);
   connections->refcount += 1;
+
+  return connections;
 }
 
 void

Index: connection.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/connection.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- connection.h	14 Oct 2003 05:16:56 -0000	1.17
+++ connection.h	27 Nov 2003 01:25:49 -0000	1.18
@@ -33,7 +33,7 @@
 
 
 BusConnections* bus_connections_new               (BusContext                   *context);
-void            bus_connections_ref               (BusConnections               *connections);
+BusConnections* bus_connections_ref               (BusConnections               *connections);
 void            bus_connections_unref             (BusConnections               *connections);
 dbus_bool_t     bus_connections_setup_connection  (BusConnections               *connections,
                                                    DBusConnection               *connection);

Index: policy.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/policy.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- policy.c	14 Oct 2003 22:16:03 -0000	1.16
+++ policy.c	27 Nov 2003 01:25:49 -0000	1.17
@@ -68,12 +68,14 @@
   return rule;
 }
 
-void
+BusPolicyRule *
 bus_policy_rule_ref (BusPolicyRule *rule)
 {
   _dbus_assert (rule->refcount > 0);
 
   rule->refcount += 1;
+
+  return rule;
 }
 
 void
@@ -178,12 +180,14 @@
   return NULL;
 }
 
-void
+BusPolicy *
 bus_policy_ref (BusPolicy *policy)
 {
   _dbus_assert (policy->refcount > 0);
 
   policy->refcount += 1;
+
+  return policy;
 }
 
 void
@@ -628,12 +632,14 @@
   return policy;
 }
 
-void
+BusClientPolicy *
 bus_client_policy_ref (BusClientPolicy *policy)
 {
   _dbus_assert (policy->refcount > 0);
 
   policy->refcount += 1;
+
+  return policy;
 }
 
 static void

Index: policy.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/policy.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- policy.h	14 Oct 2003 22:16:03 -0000	1.11
+++ policy.h	27 Nov 2003 01:25:49 -0000	1.12
@@ -101,11 +101,11 @@
 
 BusPolicyRule* bus_policy_rule_new   (BusPolicyRuleType type,
                                       dbus_bool_t       allow);
-void           bus_policy_rule_ref   (BusPolicyRule    *rule);
+BusPolicyRule* bus_policy_rule_ref   (BusPolicyRule    *rule);
 void           bus_policy_rule_unref (BusPolicyRule    *rule);
 
 BusPolicy*       bus_policy_new                   (void);
-void             bus_policy_ref                   (BusPolicy        *policy);
+BusPolicy*       bus_policy_ref                   (BusPolicy        *policy);
 void             bus_policy_unref                 (BusPolicy        *policy);
 BusClientPolicy* bus_policy_create_client_policy  (BusPolicy        *policy,
                                                    DBusConnection   *connection,
@@ -127,7 +127,7 @@
                                                    BusPolicy        *to_absorb);
 
 BusClientPolicy* bus_client_policy_new               (void);
-void             bus_client_policy_ref               (BusClientPolicy  *policy);
+BusClientPolicy* bus_client_policy_ref               (BusClientPolicy  *policy);
 void             bus_client_policy_unref             (BusClientPolicy  *policy);
 dbus_bool_t      bus_client_policy_check_can_send    (BusClientPolicy  *policy,
                                                       BusRegistry      *registry,

Index: services.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/services.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- services.c	30 Sep 2003 02:32:50 -0000	1.16
+++ services.c	27 Nov 2003 01:25:49 -0000	1.17
@@ -82,11 +82,13 @@
   return NULL;
 }
 
-void
+BusRegistry *
 bus_registry_ref (BusRegistry *registry)
 {
   _dbus_assert (registry->refcount > 0);
   registry->refcount += 1;
+
+  return registry;
 }
 
 void
@@ -713,12 +715,14 @@
   return TRUE;
 }
 
-void
+BusService *
 bus_service_ref (BusService *service)
 {
   _dbus_assert (service->refcount > 0);
   
   service->refcount += 1;
+
+  return service;
 }
 
 void

Index: services.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/services.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- services.h	11 Apr 2003 00:03:06 -0000	1.8
+++ services.h	27 Nov 2003 01:25:49 -0000	1.9
@@ -33,7 +33,7 @@
                                             void             *data);
 
 BusRegistry* bus_registry_new             (BusContext                  *context);
-void         bus_registry_ref             (BusRegistry                 *registry);
+BusRegistry* bus_registry_ref             (BusRegistry                 *registry);
 void         bus_registry_unref           (BusRegistry                 *registry);
 BusService*  bus_registry_lookup          (BusRegistry                 *registry,
                                            const DBusString            *service_name);
@@ -56,7 +56,7 @@
                                            BusTransaction              *transaction,
                                            DBusError                   *error);
 
-void            bus_service_ref                      (BusService     *service);
+BusService*     bus_service_ref                      (BusService     *service);
 void            bus_service_unref                    (BusService     *service);
 dbus_bool_t     bus_service_add_owner                (BusService     *service,
                                                       DBusConnection *owner,

Index: signals.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/signals.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- signals.c	16 Oct 2003 06:34:51 -0000	1.5
+++ signals.c	27 Nov 2003 01:25:49 -0000	1.6
@@ -59,12 +59,14 @@
   return rule;
 }
 
-void
+BusMatchRule *
 bus_match_rule_ref (BusMatchRule *rule)
 {
   _dbus_assert (rule->refcount > 0);
 
   rule->refcount += 1;
+
+  return rule;
 }
 
 void
@@ -765,12 +767,14 @@
   return matchmaker;
 }
 
-void
+BusMatchmaker *
 bus_matchmaker_ref (BusMatchmaker *matchmaker)
 {
   _dbus_assert (matchmaker->refcount > 0);
 
   matchmaker->refcount += 1;
+
+  return matchmaker;
 }
 
 void

Index: signals.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/signals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- signals.h	30 Sep 2003 02:32:50 -0000	1.2
+++ signals.h	27 Nov 2003 01:25:49 -0000	1.3
@@ -40,7 +40,7 @@
 } BusMatchFlags;
 
 BusMatchRule* bus_match_rule_new   (DBusConnection *matches_go_to);
-void          bus_match_rule_ref   (BusMatchRule   *rule);
+BusMatchRule* bus_match_rule_ref   (BusMatchRule   *rule);
 void          bus_match_rule_unref (BusMatchRule   *rule);
 
 dbus_bool_t bus_match_rule_set_message_type (BusMatchRule *rule,
@@ -61,7 +61,7 @@
                                     DBusError        *error);
 
 BusMatchmaker* bus_matchmaker_new   (void);
-void           bus_matchmaker_ref   (BusMatchmaker *matchmaker);
+BusMatchmaker* bus_matchmaker_ref   (BusMatchmaker *matchmaker);
 void           bus_matchmaker_unref (BusMatchmaker *matchmaker);
 
 dbus_bool_t bus_matchmaker_add_rule             (BusMatchmaker   *matchmaker,