Attachment 89181 Details for Bug 71597 – [PATCH] BusTransaction: returns its own connections through getter

[patch] [PATCH] BusTransaction: returns its own connections through getter

0001-BusTransaction-returns-its-own-connections-through-g.patch (text/plain), 2.95 KB, created by Chengwei Yang on 2013-11-14 10:46:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-11-14 10:46:55 UTC

Size: 2.95 KB

patch

obsolete

>From 972e498c804a6444ec9712b88f9d2bd5254acbd3 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Thu, 14 Nov 2013 16:43:14 +0800
>Subject: [PATCH] BusTransaction: returns its own connections through getter
>
>There is an 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. So this patch make the
>bus_transaction_get_connections() to return the BusTransaction's
>connections pointer.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=71597
>---
> bus/connection.c |    4 ++--
> bus/connection.h |    2 +-
> bus/dispatch.c   |    2 +-
> bus/stats.c      |    2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/bus/connection.c b/bus/connection.c
>index fddbc78..8c96e49 100644
>--- a/bus/connection.c
>+++ b/bus/connection.c
>@@ -1990,10 +1990,10 @@ bus_transaction_get_context (BusTransaction  *transaction)
>   return transaction->context;
> }
> 
>-BusConnections*
>+DBusList*
> bus_transaction_get_connections (BusTransaction  *transaction)
> {
>-  return bus_context_get_connections (transaction->context);
>+  return transaction->connections;
> }
> 
> dbus_bool_t
>diff --git a/bus/connection.h b/bus/connection.h
>index c936021..1b26a22 100644
>--- a/bus/connection.h
>+++ b/bus/connection.h
>@@ -120,7 +120,7 @@ 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);
>+DBusList*       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 5fc0d11..7a61953 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 ec768ec..2bf86d6 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);
> 
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 71597: 89181 | 89929

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.