From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 10 Oct 2007 10:40:48 +0000 (+0100)
Subject: _dbus_object_tree_register: don't duplicate check for NULL and use new DBUS_ERROR_OBJ... 
X-Git-Tag: dbus-1.1.3~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df47bd40818683a0567081e7bc71b870ee4ec642;p=thirdparty%2Fdbus.git

_dbus_object_tree_register: don't duplicate check for NULL and use new DBUS_ERROR_OBJECT_PATH_IN_USE error, both as per Havoc's review
---

diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 276ac955c..953aa3bd7 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -383,7 +383,7 @@ static char *flatten_path (const char **path);
  * @param user_data user data to pass to methods in the vtable
  * @param error address where an error can be returned
  * @returns #FALSE if an error (#DBUS_ERROR_NO_MEMORY or
- *    #DBUS_ERROR_ADDRESS_IN_USE) is reported
+ *    #DBUS_ERROR_OBJECT_PATH_IN_USE) is reported
  */
 dbus_bool_t
 _dbus_object_tree_register (DBusObjectTree              *tree,
@@ -402,9 +402,7 @@ _dbus_object_tree_register (DBusObjectTree              *tree,
   subtree = ensure_subtree (tree, path);
   if (subtree == NULL)
     {
-      if (error != NULL)
-        _DBUS_SET_OOM (error);
-
+      _DBUS_SET_OOM (error);
       return FALSE;
     }
 
@@ -414,7 +412,8 @@ _dbus_object_tree_register (DBusObjectTree              *tree,
         {
           char *complete_path = flatten_path (path);
 
-          dbus_set_error (error, DBUS_ERROR_ADDRESS_IN_USE, "A handler is already registered for %s",
+          dbus_set_error (error, DBUS_ERROR_OBJECT_PATH_IN_USE,
+                          "A handler is already registered for %s",
                           complete_path ? complete_path
                                         : "(cannot represent path: out of memory!)");