svn merge ^/branches/released .

4 files changed, 16 insertions, 16 deletions

diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c
index 1ffbdcdad..5a7b0ea17 100644
--- a/xorg-server/config/config.c
+++ b/xorg-server/config/config.c
@@ -133,7 +133,7 @@ add_option(InputOption **options, const char *key, const char *value)
     *options = calloc(sizeof(**options), 1);

     if (!*options) /* Yeesh. */

         return;

-    (*options)->key = xstrdup(key);

-    (*options)->value = xstrdup(value);

+    (*options)->key = strdup(key);

+    (*options)->value = strdup(value);

     (*options)->next = NULL;

 }

diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c
index 5d11feaa1..ec1008a4d 100644
--- a/xorg-server/config/dbus.c
+++ b/xorg-server/config/dbus.c
@@ -86,8 +86,8 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
         return BadAlloc;

     }

 

-    options->key = xstrdup("_source");

-    options->value = xstrdup("client/dbus");

+    options->key = strdup("_source");

+    options->value = strdup("client/dbus");

     if (!options->key || !options->value) {

         ErrorF("[config/dbus] couldn't allocate first key/value pair\n");

         ret = BadAlloc;

@@ -120,7 +120,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
                    tmp);

             MALFORMED_MESSAGE();

         }

-        options->key = xstrdup(tmp);

+        options->key = strdup(tmp);

         if (!options->key) {

             ErrorF("[config/dbus] couldn't duplicate key!\n");

             ret = BadAlloc;

@@ -136,7 +136,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
         dbus_message_iter_get_basic(&subiter, &tmp);

         if (!tmp)

             MALFORMED_MESSAGE();

-        options->value = xstrdup(tmp);

+        options->value = strdup(tmp);

         if (!options->value) {

             ErrorF("[config/dbus] couldn't duplicate option!\n");

             ret = BadAlloc;

diff --git a/xorg-server/config/hal.c b/xorg-server/config/hal.c
index 1245bb192..5ce7d7d48 100644
--- a/xorg-server/config/hal.c
+++ b/xorg-server/config/hal.c
@@ -81,7 +81,7 @@ get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
     prop = libhal_device_get_property_string(hal_ctx, udi, name, NULL);

     LogMessageVerb(X_INFO, 10, "config/hal: getting %s on %s returned %s\n", name, udi, prop ? prop : "(null)");

     if (prop) {

-        ret = xstrdup(prop);

+        ret = strdup(prop);

         libhal_free_string(prop);

     }

     else {

@@ -156,13 +156,13 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         LogMessage(X_WARNING,"config/hal: no driver or path specified for %s\n", udi);

         goto unwind;

     }

-    attrs.device = xstrdup(path);

+    attrs.device = strdup(path);

 

     name = get_prop_string(hal_ctx, udi, "info.product");

     if (!name)

-        name = xstrdup("(unnamed)");

+        name = strdup("(unnamed)");

     else

-        attrs.product = xstrdup(name);

+        attrs.product = strdup(name);

 

     attrs.vendor = get_prop_string(hal_ctx, udi, "info.vendor");

     hal_tags = get_prop_string(hal_ctx, udi, "input.tags");

@@ -211,8 +211,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         goto unwind;

     }

 

-    options->key = xstrdup("_source");

-    options->value = xstrdup("server/hal");

+    options->key = strdup("_source");

+    options->value = strdup("server/hal");

     if (!options->key || !options->value) {

         LogMessage(X_ERROR, "config/hal: couldn't allocate first key/value pair\n");

         goto unwind;

@@ -387,7 +387,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
 

     for (; dev; dev = dev->next){

         free(dev->config_info);

-        dev->config_info = xstrdup(config_info);

+        dev->config_info = strdup(config_info);

     }

 

 unwind:

diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index bf463168e..da4fe15cb 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -86,8 +86,8 @@ device_added(struct udev_device *udev_device)
     if (!options)

         return;

 

-    options->key = xstrdup("_source");

-    options->value = xstrdup("server/udev");

+    options->key = strdup("_source");

+    options->value = strdup("server/udev");

     if (!options->key || !options->value)

         goto unwind;

 

@@ -197,7 +197,7 @@ device_added(struct udev_device *udev_device)
 

     for (; dev; dev = dev->next) {

         free(dev->config_info);

-        dev->config_info = xstrdup(config_info);

+        dev->config_info = strdup(config_info);

     }

 

  unwind: