Attachment 29176 Details for Bug 23117 – Rename DBusConnection *disconnected param to connection

[patch] Rename DBusConnection *disconnected param to connection

0007-Rename-DBusConnection-disconnected-param-to-connecti.patch (text/plain), 3.65 KB, created by Will Thompson on 2009-09-03 07:36:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2009-09-03 07:36:27 UTC

Size: 3.65 KB

patch

obsolete

>From 29eda9770210426316c08140968eb2c8000c8519 Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Thu, 3 Sep 2009 15:33:32 +0100
>Subject: [PATCH] Rename DBusConnection *disconnected param to connection
>
>---
> bus/signals.c |   16 ++++++++--------
> bus/signals.h |    2 +-
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/bus/signals.c b/bus/signals.c
>index 23bf98a..dbfbb5c 100644
>--- a/bus/signals.c
>+++ b/bus/signals.c
>@@ -1446,7 +1446,7 @@ bus_matchmaker_remove_rule_by_value (BusMatchmaker   *matchmaker,
> 
> static void
> rule_list_remove_by_connection (DBusList       **rules,
>-                                DBusConnection  *disconnected)
>+                                DBusConnection  *connection)
> {
>   DBusList *link;
> 
>@@ -1459,7 +1459,7 @@ rule_list_remove_by_connection (DBusList       **rules,
>       rule = link->data;
>       next = _dbus_list_get_next_link (rules, link);
> 
>-      if (rule->matches_go_to == disconnected)
>+      if (rule->matches_go_to == connection)
>         {
>           bus_matchmaker_remove_rule_link (rules, link);
>         }
>@@ -1472,7 +1472,7 @@ rule_list_remove_by_connection (DBusList       **rules,
>            */
>           const char *name;
> 
>-          name = bus_connection_get_name (disconnected);
>+          name = bus_connection_get_name (connection);
>           _dbus_assert (name != NULL); /* because we're an active connection */
> 
>           if (((rule->flags & BUS_MATCH_SENDER) &&
>@@ -1490,7 +1490,7 @@ rule_list_remove_by_connection (DBusList       **rules,
> 
> void
> bus_matchmaker_disconnected (BusMatchmaker   *matchmaker,
>-                             DBusConnection  *disconnected)
>+                             DBusConnection  *connection)
> {
>   int i;
> 
>@@ -1502,23 +1502,23 @@ bus_matchmaker_disconnected (BusMatchmaker   *matchmaker,
>    * the connection we'd need to do something more elaborate.
>    */
> 
>-  _dbus_assert (bus_connection_is_active (disconnected));
>+  _dbus_assert (bus_connection_is_active (connection));
> 
>-  _dbus_verbose ("Removing all rules for connection %p\n", disconnected);
>+  _dbus_verbose ("Removing all rules for connection %p\n", connection);
> 
>   for (i = DBUS_MESSAGE_TYPE_INVALID; i < DBUS_NUM_MESSAGE_TYPES; i++)
>     {
>       RulePool *p = matchmaker->rules_by_type + i;
>       DBusHashIter iter;
> 
>-      rule_list_remove_by_connection (&p->rules_without_iface, disconnected);
>+      rule_list_remove_by_connection (&p->rules_without_iface, connection);
> 
>       _dbus_hash_iter_init (p->rules_by_iface, &iter);
>       while (_dbus_hash_iter_next (&iter))
>         {
>           DBusList **items = _dbus_hash_iter_get_value (&iter);
> 
>-          rule_list_remove_by_connection (items, disconnected);
>+          rule_list_remove_by_connection (items, connection);
> 
>           if (*items == NULL)
>             _dbus_hash_iter_remove_entry (&iter);
>diff --git a/bus/signals.h b/bus/signals.h
>index 4ea1075..eeb1d2d 100644
>--- a/bus/signals.h
>+++ b/bus/signals.h
>@@ -77,7 +77,7 @@ dbus_bool_t bus_matchmaker_remove_rule_by_value (BusMatchmaker   *matchmaker,
> void        bus_matchmaker_remove_rule          (BusMatchmaker   *matchmaker,
>                                                  BusMatchRule    *rule);
> void        bus_matchmaker_disconnected         (BusMatchmaker   *matchmaker,
>-                                                 DBusConnection  *disconnected);
>+                                                 DBusConnection  *connection);
> dbus_bool_t bus_matchmaker_get_recipients       (BusMatchmaker   *matchmaker,
>                                                  BusConnections  *connections,
>                                                  DBusConnection  *sender,
>-- 
>1.6.3.3
>

Actions: View | Splinter Review

Attachments on bug 23117: 28316 | 28317 | 28318 | 28319 | 28320 | 28321 | 28377 | 29176

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.