andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: reduce calls to input_option_get_key/value

Browse Source 
No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
Peter Hutterer 2011-10-25 11:49:26 +10:00
parent 005ab41986
commit 63e87b8639
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xfree86/common/xf86Xinput.c
View File

@ -910,35 +910,38 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
return BadAlloc; return BadAlloc;
nt_list_for_each_entry(option, options, list.next) { nt_list_for_each_entry(option, options, list.next) {
if (strcasecmp(input_option_get_key(option), "driver") == 0) { const char *key = input_option_get_key(option);
const char *value = input_option_get_value(option);
if (strcasecmp(key, "driver") == 0) {
if (pInfo->driver) { if (pInfo->driver) {
rval = BadRequest; rval = BadRequest;
goto unwind; goto unwind;
} }
pInfo->driver = xstrdup(input_option_get_value(option)); pInfo->driver = xstrdup(value);
if (!pInfo->driver) { if (!pInfo->driver) {
rval = BadAlloc; rval = BadAlloc;
goto unwind; goto unwind;
} }
} }
if (strcasecmp(input_option_get_key(option), "name") == 0 || if (strcasecmp(key, "name") == 0 ||
strcasecmp(input_option_get_key(option), "identifier") == 0) { strcasecmp(key, "identifier") == 0) {
if (pInfo->name) { if (pInfo->name) {
rval = BadRequest; rval = BadRequest;
goto unwind; goto unwind;
} }
pInfo->name = xstrdup(input_option_get_value(option)); pInfo->name = xstrdup(value);
if (!pInfo->name) { if (!pInfo->name) {
rval = BadAlloc; rval = BadAlloc;
goto unwind; goto unwind;
} }
} }
if (strcmp(input_option_get_key(option), "_source") == 0 && if (strcmp(key, "_source") == 0 &&
(strcmp(input_option_get_value(option), "server/hal") == 0 || (strcmp(value, "server/hal") == 0 ||
strcmp(input_option_get_value(option), "server/udev") == 0 || strcmp(value, "server/udev") == 0 ||
strcmp(input_option_get_value(option), "server/wscons") == 0)) { strcmp(value, "server/wscons") == 0)) {
is_auto = 1; is_auto = 1;
if (!xf86Info.autoAddDevices) { if (!xf86Info.autoAddDevices) {
rval = BadMatch; rval = BadMatch;