mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2277) - Codechange: change sscanf() into stroul() Which Does The Right Thing tm. Thanks tron

release/0.4.5
Darkvater 2005-05-06 22:06:40 +00:00
parent 81474c2623
commit 0618a6d0df
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
console.c
View File

@ -448,17 +448,19 @@ void IConsoleError(const char* string)
*/ */
bool GetArgumentInteger(uint32 *value, const char *arg) bool GetArgumentInteger(uint32 *value, const char *arg)
{ {
int result = sscanf(arg, "%u", value); char *endptr;
/* Hexadecimal numbers start with 0x, so at least the first number has been parsed */ if (strcmp(arg, "on") == 0 || strcmp(arg, "true") == 0) {
if (result == 1 && arg[0] == '0' && (arg[1] == 'x' || arg[1] == 'X')) *value = 1;
result = sscanf(arg, "%x", value); return true;
}
if (strcmp(arg, "off") == 0 || strcmp(arg, "false") == 0) {
*value = 0;
return true;
}
if (result == 0 && (strcmp(arg, "on") == 0 || strcmp(arg, "true") == 0 )) {*value = 1; result = 1;} *value = strtoul(arg, &endptr, 0);
return (arg == endptr) ? false : true;
if (result == 0 && (strcmp(arg, "off") == 0 || strcmp(arg, "false") == 0)) {*value = 0; result = 1;}
return !!result;
} }
/** /**