encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More fixes for the SDL_scanf code

This commit is contained in:
Sam Lantinga 2017-08-12 00:01:24 -07:00
parent e27dcd1c3b
commit affab6ade5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/stdlib/SDL_string.c
View File

@ -803,7 +803,7 @@ SDL_strtol(const char *string, char **endp, int base)
return strtol(string, endp, base); return strtol(string, endp, base);
#else #else
size_t len; size_t len;
long value; long value = 0;
if (!base) { if (!base) {
if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) { if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
@ -828,7 +828,7 @@ SDL_strtoul(const char *string, char **endp, int base)
return strtoul(string, endp, base); return strtoul(string, endp, base);
#else #else
size_t len; size_t len;
unsigned long value; unsigned long value = 0;
if (!base) { if (!base) {
if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) { if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
@ -853,7 +853,7 @@ SDL_strtoll(const char *string, char **endp, int base)
return strtoll(string, endp, base); return strtoll(string, endp, base);
#else #else
size_t len; size_t len;
Sint64 value; Sint64 value = 0;
if (!base) { if (!base) {
if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) { if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
@ -878,7 +878,7 @@ SDL_strtoull(const char *string, char **endp, int base)
return strtoull(string, endp, base); return strtoull(string, endp, base);
#else #else
size_t len; size_t len;
Uint64 value; Uint64 value = 0;
if (!base) { if (!base) {
if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) { if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
@ -903,7 +903,7 @@ SDL_strtod(const char *string, char **endp)
return strtod(string, endp); return strtod(string, endp);
#else #else
size_t len; size_t len;
double value; double value = 0.0;
len = SDL_ScanFloat(string, &value); len = SDL_ScanFloat(string, &value);
if (endp) { if (endp) {
@ -1128,8 +1128,9 @@ SDL_vsscanf(const char *text, const char *fmt, va_list ap)
case 'd': case 'd':
if (inttype == DO_LONGLONG) { if (inttype == DO_LONGLONG) {
Sint64 value; Sint64 value;
text += SDL_ScanLongLong(text, radix, &value); advance = SDL_ScanLongLong(text, radix, &value);
if (!suppress) { text += advance;
if (advance && !suppress) {
Sint64 *valuep = va_arg(ap, Sint64 *); Sint64 *valuep = va_arg(ap, Sint64 *);
*valuep = value; *valuep = value;
++retval; ++retval;