From 16158366954d945db6263f6de505fc02ee03c6cd Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Fri, 4 Jun 2010 17:00:15 +0700 Subject: dmx: Get rid of xstrdup when argument is definitely non-NULL ditto for DMX Signed-off-by: Mikhail Gusarov Reviewed-by: Alan Coopersmith --- hw/dmx/input/dmxinputinit.c | 4 ++-- hw/dmx/input/usb-keyboard.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/dmx') diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index b2e16fba4..83a2abbb8 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -885,7 +885,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI) && dmxL->deviceId < 0) { dmxL->deviceId = devices[i].id; dmxL->deviceName = (devices[i].name - ? xstrdup(devices[i].name) + ? strdup(devices[i].name) : NULL); } } @@ -918,7 +918,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI) dmxLocal->sendsCore = FALSE; dmxLocal->deviceId = devices[i].id; dmxLocal->deviceName = (devices[i].name - ? xstrdup(devices[i].name) + ? strdup(devices[i].name) : NULL); } } diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c index dc575fef7..9db1adbfc 100644 --- a/hw/dmx/input/usb-keyboard.c +++ b/hw/dmx/input/usb-keyboard.c @@ -439,6 +439,6 @@ void kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info) kbdUSBGetMap(pDev, &info->keySyms, info->modMap); info->focusClass = 1; info->kbdFeedbackClass = 1; - info->names.keycodes = xstrdup("powerpcps2"); + info->names.keycodes = strdup("powerpcps2"); info->force = 1; } -- cgit v1.2.3