diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-14 13:15:50 +0000 |
| commit | e2eb44705a8e4886d81b75c12e68aaebe9946439 (patch) | |
| tree | 00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/config/dbus.c | |
| parent | 2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff) | |
| parent | 0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff) | |
| download | vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2 vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/config/dbus.c')
| -rw-r--r-- | xorg-server/config/dbus.c | 8 |
1 files changed, 4 insertions, 4 deletions
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;
|