diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-11-28 09:17:38 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-06 15:59:18 +0000 |
| commit | 854554c3a67b880ac92fa72c476b772cb5968b26 (patch) | |
| tree | 7183d4945a1f7ef833dde7303606efc5df1bb6d0 | |
| parent | b2a517040cd6f0fcc676abe833675d5473820226 (diff) | |
| download | dbus-854554c3a67b880ac92fa72c476b772cb5968b26.tar.gz | |
BusTransaction: remove confusing getter of connections
There is a DBusList* member of BusTransaction named "connections", while
its getter function bus_transaction_get_connections() returns
context->connections which in fact is a BusConnections pointer, this is
quite confusing. Because this is what bus_context_get_connections()
returns.
This patch call out to bus_context_get_connections() directly and remove
the then unused bus_transaction_get_connections().
https://bugs.freedesktop.org/show_bug.cgi?id=71597
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | bus/connection.c | 6 | ||||
| -rw-r--r-- | bus/connection.h | 1 | ||||
| -rw-r--r-- | bus/dispatch.c | 2 | ||||
| -rw-r--r-- | bus/stats.c | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/bus/connection.c b/bus/connection.c index 8d741d6f..ea2d155a 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -2026,12 +2026,6 @@ bus_transaction_get_context (BusTransaction *transaction) return transaction->context; } -BusConnections* -bus_transaction_get_connections (BusTransaction *transaction) -{ - return bus_context_get_connections (transaction->context); -} - dbus_bool_t bus_transaction_send_from_driver (BusTransaction *transaction, DBusConnection *connection, diff --git a/bus/connection.h b/bus/connection.h index 13c8b99f..9f4f9aea 100644 --- a/bus/connection.h +++ b/bus/connection.h @@ -122,7 +122,6 @@ typedef void (* BusTransactionCancelFunction) (void *data); BusTransaction* bus_transaction_new (BusContext *context); BusContext* bus_transaction_get_context (BusTransaction *transaction); -BusConnections* bus_transaction_get_connections (BusTransaction *transaction); dbus_bool_t bus_transaction_send (BusTransaction *transaction, DBusConnection *connection, DBusMessage *message); diff --git a/bus/dispatch.c b/bus/dispatch.c index 5fc0d112..7a61953f 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -133,7 +133,7 @@ bus_dispatch_matches (BusTransaction *transaction, } /* Now dispatch to others who look interested in this message */ - connections = bus_transaction_get_connections (transaction); + connections = bus_context_get_connections (context); dbus_error_init (&tmp_error); matchmaker = bus_context_get_matchmaker (context); diff --git a/bus/stats.c b/bus/stats.c index ec768ec7..2bf86d66 100644 --- a/bus/stats.c +++ b/bus/stats.c @@ -48,7 +48,7 @@ bus_stats_handle_get_stats (DBusConnection *connection, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - connections = bus_transaction_get_connections (transaction); + connections = bus_context_get_connections (transaction->context); reply = _dbus_asv_new_method_return (message, &iter, &arr_iter); |