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

Rearrange code in xf86int10ParseBiosLocation to use strncasecmp. This

Browse Source 
eliminates the need for the first use of xstrdup in this function.
The second use of xstrdup was *never* necessary and has also been
eliminated.
This commit is contained in:
Ian Romanick 2006-07-14 15:26:56 -07:00
parent d3ee49bcba
commit 490fb30459
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/xfree86/int10/helper_mem.c
View File

@ -284,36 +284,30 @@ void
xf86int10ParseBiosLocation(void* options,
xf86int10BiosLocationPtr bios)
{
char *s;
char *p;
char *str = NULL;
if (options)
str = xf86GetOptValString(options,OPT_BIOS_LOCATION);
const char *p;
const char *str;
bios->bus = BUS_NONE;
if (!str)
return;
s = xstrdup(str);
p = strtok(s,":");
if (xf86NameCmp(p,"pci") == 0) bios->bus = BUS_PCI;
else
if (xf86NameCmp(p,"primary") == 0) bios->bus = BUS_ISA;
xfree(s);
if ((options == NULL)
|| ((str = xf86GetOptValString(options, OPT_BIOS_LOCATION)) == NULL)) {
return;
}
if (strncasecmp(str, "pci", 3) == 0) {
bios->bus = BUS_PCI;
} else if (strncasecmp(str, "primary", 7) == 0) {
bios->bus = BUS_ISA;
}
else {
return;
}
if (bios->bus == BUS_NONE) return;
s = xstrdup(str);
p = strchr(s, ':');
p = strchr(str, ':');
switch (bios->bus) {
case BUS_ISA:
if (p)
bios->location.legacy = atoi(++p);
else
bios->location.legacy = 0;
bios->location.legacy = (p != NULL) ? atoi(++p) : 0;
break;
case BUS_PCI:
if (p) {
@ -332,7 +326,6 @@ xf86int10ParseBiosLocation(void* options,
default:
break;
}
xfree(s);
}