Attachment 132168 Details for Bug 101567 – bus_driver_send_ack_reply: Make available to other modules

[patch] bus_driver_send_ack_reply: Make available to other modules

0010-bus_driver_send_ack_reply-Make-available-to-other-mo.patch (text/plain), 3.71 KB, created by Simon McVittie on 2017-06-23 16:24:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-06-23 16:24:37 UTC

Size: 3.71 KB

patch

obsolete

>From 543055c3510f18f3ed08d032993d5af8b397225b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 21 Jun 2017 16:25:01 +0100
>Subject: [PATCH 10/49] bus_driver_send_ack_reply: Make available to other
> modules
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> bus/driver.c | 23 ++++++++++-------------
> bus/driver.h |  4 ++++
> 2 files changed, 14 insertions(+), 13 deletions(-)
>
>diff --git a/bus/driver.c b/bus/driver.c
>index 964a943c..cd0a714d 100644
>--- a/bus/driver.c
>+++ b/bus/driver.c
>@@ -966,11 +966,11 @@ bus_driver_handle_activate_service (DBusConnection *connection,
>   return retval;
> }
> 
>-static dbus_bool_t
>-send_ack_reply (DBusConnection *connection,
>-                BusTransaction *transaction,
>-                DBusMessage    *message,
>-                DBusError      *error)
>+dbus_bool_t
>+bus_driver_send_ack_reply (DBusConnection *connection,
>+                           BusTransaction *transaction,
>+                           DBusMessage    *message,
>+                           DBusError      *error)
> {
>   DBusMessage *reply;
> 
>@@ -1266,8 +1266,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
>         }
>     }
> 
>-  if (!send_ack_reply (connection, transaction,
>-                       message, error))
>+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
>     goto out;
> 
>   retval = TRUE;
>@@ -1354,8 +1353,7 @@ bus_driver_handle_add_match (DBusConnection *connection,
>       goto failed;
>     }
> 
>-  if (!send_ack_reply (connection, transaction,
>-                       message, error))
>+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
>     {
>       bus_matchmaker_remove_rule (matchmaker, rule);
>       goto failed;
>@@ -1405,8 +1403,7 @@ bus_driver_handle_remove_match (DBusConnection *connection,
>   /* Send the ack before we remove the rule, since the ack is undone
>    * on transaction cancel, but rule removal isn't.
>    */
>-  if (!send_ack_reply (connection, transaction,
>-                       message, error))
>+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
>     goto failed;
> 
>   matchmaker = bus_connection_get_matchmaker (connection);
>@@ -2249,7 +2246,7 @@ bus_driver_handle_become_monitor (DBusConnection *connection,
>   /* Send the ack before we remove the rule, since the ack is undone
>    * on transaction cancel, but becoming a monitor isn't.
>    */
>-  if (!send_ack_reply (connection, transaction, message, error))
>+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
>     goto out;
> 
>   if (!bus_connection_be_monitor (connection, transaction, &rules, error))
>@@ -2337,7 +2334,7 @@ bus_driver_handle_ping (DBusConnection *connection,
>                         DBusMessage *message,
>                         DBusError *error)
> {
>-  return send_ack_reply (connection, transaction, message, error);
>+  return bus_driver_send_ack_reply (connection, transaction, message, error);
> }
> 
> static dbus_bool_t bus_driver_handle_get (DBusConnection *connection,
>diff --git a/bus/driver.h b/bus/driver.h
>index 36a1db91..ac1289da 100644
>--- a/bus/driver.h
>+++ b/bus/driver.h
>@@ -62,5 +62,9 @@ BusDriverFound bus_driver_get_conn_helper (DBusConnection  *connection,
>                                            const char     **name_p,
>                                            DBusConnection **peer_conn_p,
>                                            DBusError       *error);
>+dbus_bool_t bus_driver_send_ack_reply     (DBusConnection  *connection,
>+                                           BusTransaction  *transaction,
>+                                           DBusMessage     *message,
>+                                           DBusError       *error);
> 
> #endif /* BUS_DRIVER_H */
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 101567: 132159 | 132160 | 132164 | 132168 | 132345 | 132346 | 132347

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.