Attachment 57083 Details for Bug 46095 – [PATCH 04/10] internal_bus_get: centralize error handling

[patch] [PATCH 04/10] internal_bus_get: centralize error handling

0004-internal_bus_get-centralize-error-handling.patch (text/plain), 2.38 KB, created by Simon McVittie on 2012-02-15 04:26:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-15 04:26:19 UTC

Size: 2.38 KB

patch

obsolete

>From 7694faae100ede1ed4cddfb49e65b25061fe36ff Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 22 Feb 2011 18:47:51 +0000
>Subject: [PATCH 04/10] internal_bus_get: centralize error handling
>
>---
> dbus/dbus-bus.c |   30 +++++++++++++-----------------
> 1 files changed, 13 insertions(+), 17 deletions(-)
>
>diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
>index f05ddea..fadc3a8 100644
>--- a/dbus/dbus-bus.c
>+++ b/dbus/dbus-bus.c
>@@ -434,13 +434,14 @@ internal_bus_get (DBusBusType  type,
>   _dbus_return_val_if_fail (type >= 0 && type < N_BUS_TYPES, NULL);
>   _dbus_return_val_if_error_is_set (error, NULL);
> 
>+  connection = NULL;
>+
>   _DBUS_LOCK (bus);
> 
>   if (!init_connections_unlocked ())
>     {
>-      _DBUS_UNLOCK (bus);
>       _DBUS_SET_OOM (error);
>-      return NULL;
>+      goto out;
>     }
> 
>   /* We want to use the activation address even if the
>@@ -462,9 +463,7 @@ internal_bus_get (DBusBusType  type,
>     {
>       connection = bus_connections[type];
>       dbus_connection_ref (connection);
>-      
>-      _DBUS_UNLOCK (bus);
>-      return connection;
>+      goto out;
>     }
> 
>   address = bus_connection_addresses[address_type];
>@@ -472,8 +471,7 @@ internal_bus_get (DBusBusType  type,
>     {
>       dbus_set_error (error, DBUS_ERROR_FAILED,
>                       "Unable to determine the address of the message bus (try 'man dbus-launch' and 'man dbus-daemon' for help)");
>-      _DBUS_UNLOCK (bus);
>-      return NULL;
>+      goto out;
>     }
> 
>   if (private)
>@@ -483,19 +481,15 @@ internal_bus_get (DBusBusType  type,
>   
>   if (!connection)
>     {
>-      _DBUS_ASSERT_ERROR_IS_SET (error);
>-      _DBUS_UNLOCK (bus);
>-      return NULL;
>+      goto out;
>     }
> 
>   if (!dbus_bus_register (connection, error))
>     {
>-      _DBUS_ASSERT_ERROR_IS_SET (error);
>       _dbus_connection_close_possibly_shared (connection);
>       dbus_connection_unref (connection);
>-
>-      _DBUS_UNLOCK (bus);
>-      return NULL;
>+      connection = NULL;
>+      goto out;
>     }
> 
>   if (!private)
>@@ -520,10 +514,12 @@ internal_bus_get (DBusBusType  type,
>   bd->is_well_known = TRUE;
>   _DBUS_UNLOCK (bus_datas);
> 
>-  
>-  _DBUS_UNLOCK (bus);
>+out:
>+  /* Return a reference to the caller, or NULL with error set. */
>+  if (connection == NULL)
>+    _DBUS_ASSERT_ERROR_IS_SET (error);
> 
>-  /* Return a reference to the caller */
>+  _DBUS_UNLOCK (bus);
>   return connection;
> }
> 
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 46095: 57080 | 57081 | 57082 | 57083 | 57084 | 57085 | 57086 | 57087 | 57088 | 57089

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.