diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-06-04 17:00:15 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-06-11 19:04:23 +0700 |
| commit | 16158366954d945db6263f6de505fc02ee03c6cd (patch) | |
| tree | 0cf7b5b86ae5e7ca516388dec052e2a3a80e9dd7 /hw | |
| parent | 6592db6bb526f0c43b4c7b55859c629709e039b4 (diff) | |
dmx: Get rid of xstrdup when argument is definitely non-NULL
ditto for DMX
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 4 | ||||
| -rw-r--r-- | hw/dmx/input/usb-keyboard.c | 2 |
2 files changed, 3 insertions, 3 deletions
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; } |