frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Remove an open-coded strtoul() 

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2010-10-14 13:45:31 -04:00
parent 52577ae8ee
commit f8ec71603c
1 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
hw/xfree86/parser/scan.c
View File

@ -115,53 +115,6 @@ static int pushToken = LOCK_TOKEN;
static int eol_seen = 0; /* private state to handle comments */ static int eol_seen = 0; /* private state to handle comments */
LexRec val; LexRec val;
/*
* xf86strToUL --
*
* A portable, but restricted, version of strtoul(). It only understands
* hex, octal, and decimal. But it's good enough for our needs.
*/
static unsigned int
xf86strToUL (char *str)
{
int base = 10;
char *p = str;
unsigned int tot = 0;
if (*p == '0')
{
p++;
if ((*p == 'x') || (*p == 'X'))
{
p++;
base = 16;
}
else
base = 8;
}
while (*p)
{
if ((*p >= '0') && (*p <= ((base == 8) ? '7' : '9')))
{
tot = tot * base + (*p - '0');
}
else if ((base == 16) && (*p >= 'a') && (*p <= 'f'))
{
tot = tot * base + 10 + (*p - 'a');
}
else if ((base == 16) && (*p >= 'A') && (*p <= 'F'))
{
tot = tot * base + 10 + (*p - 'A');
}
else
{
return tot;
}
p++;
}
return tot;
}
/* /*
* xf86getNextLine -- * xf86getNextLine --
* *
@ -434,7 +387,7 @@ again:
configRBuf[i++] = c; configRBuf[i++] = c;
configPos--; /* GJA -- one too far */ configPos--; /* GJA -- one too far */
configRBuf[i] = '\0'; configRBuf[i] = '\0';
val.num = xf86strToUL (configRBuf); val.num = strtoul (configRBuf, NULL, 0);
val.realnum = atof (configRBuf); val.realnum = atof (configRBuf);
return NUMBER; return NUMBER;
} }