static void
rule_list_remove_by_connection (DBusList **rules,
- DBusConnection *disconnected)
+ DBusConnection *connection)
{
DBusList *link;
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);
}
*/
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) &&
void
bus_matchmaker_disconnected (BusMatchmaker *matchmaker,
- DBusConnection *disconnected)
+ DBusConnection *connection)
{
int i;
* 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);
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,