xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 config/dbus.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
diff-tree 3f42af8c0ef1e5379bc836f589e0cbee43c02ac5 (from 0fcde83d94507eadd9f99d4e6a63584b221c989c)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Thu Aug 30 18:22:12 2007 +0930

    config: Use [config/dbus] consistently for error messages.

diff --git a/config/dbus.c b/config/dbus.c
index d437994..c867512 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -139,7 +139,7 @@ add_device(DBusMessage *message, DBusMes
             MALFORMED_MESSAGE();
         options->value = xstrdup(tmp);
         if (!options->value) {
-            ErrorF("[config] couldn't duplicate option!\n");
+            ErrorF("[config/dbus] couldn't duplicate option!\n");
             ret = BadAlloc;
             goto unwind;
         }
@@ -204,7 +204,7 @@ remove_device(DBusMessage *message, DBus
     dbus_message_iter_init_append(reply, &reply_iter);
 
     if (!dbus_message_iter_init(message, &iter)) {
-        ErrorF("[config] failed to init iterator\n");
+        ErrorF("[config/dbus] failed to init iterator\n");
         MALFORMED_MESSAGE();
     }
 
@@ -215,12 +215,12 @@ remove_device(DBusMessage *message, DBus
 
     dev = LookupDeviceIntRec(deviceid);
     if (!dev) {
-        DebugF("[config] bogus device id %d given\n", deviceid);
+        DebugF("[config/dbus] bogus device id %d given\n", deviceid);
         ret = BadMatch;
         goto unwind;
     }
 
-    DebugF("[config] removing device %s (id %d)\n", dev->name, deviceid);
+    DebugF("[config/dbus] removing device %s (id %d)\n", dev->name, deviceid);
 
     /* Call PIE here so we don't try to dereference a device that's
      * already been removed. */
diff-tree 0fcde83d94507eadd9f99d4e6a63584b221c989c (from 87495fc7064d5e0a7575a0713b6895a4172df0fa)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Thu Aug 30 18:20:20 2007 +0930

    config: return BadValue to caller if add/remove doesn't have parameters.
    
    If message iterator cannot be created, the caller didn't supply any
    parameters. Return BadValue, instead of dying a horrible death while being
    stuck in an endless loop.

diff --git a/config/dbus.c b/config/dbus.c
index c6f4af0..d437994 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -74,11 +74,12 @@ add_device(DBusMessage *message, DBusMes
     int ret, err;
     DeviceIntPtr dev = NULL;
 
+    dbus_message_iter_init_append(reply, &reply_iter);
+
     if (!dbus_message_iter_init(message, &iter)) {
         ErrorF("[config/dbus] couldn't initialise iterator\n");
-        return BadAlloc;
+        MALFORMED_MESSAGE();
     }
-    dbus_message_iter_init_append(reply, &reply_iter);
 
     options = xcalloc(sizeof(*options), 1);
     if (!options) {
@@ -200,11 +201,12 @@ remove_device(DBusMessage *message, DBus
     DeviceIntPtr dev;
     DBusMessageIter iter, reply_iter;
 
+    dbus_message_iter_init_append(reply, &reply_iter);
+
     if (!dbus_message_iter_init(message, &iter)) {
         ErrorF("[config] failed to init iterator\n");
-        return BadAlloc;
+        MALFORMED_MESSAGE();
     }
-    dbus_message_iter_init_append(reply, &reply_iter);
 
     if (!dbus_message_get_args(message, error, DBUS_TYPE_UINT32,
                                &deviceid, DBUS_TYPE_INVALID)) {