pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r2979:2980 from branches/SDL-1.2: unsigned char in ctype funcs.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402272
This commit is contained in:
Ryan C. Gordon 2007-02-15 11:14:24 +00:00
parent 5b011c88f0
commit f9ed7eaeb3
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/stdlib/SDL_string.c
View file

@ -46,7 +46,7 @@ SDL_ScanLong(const char *text, int radix, long *valuep)
} }
for (;;) { for (;;) {
int v; int v;
if (SDL_isdigit(*text)) { if (SDL_isdigit((unsigned char) *text)) {
v = *text - '0'; v = *text - '0';
} else if (radix == 16 && SDL_isupperhex(*text)) { } else if (radix == 16 && SDL_isupperhex(*text)) {
v = 10 + (*text - 'A'); v = 10 + (*text - 'A');
@ -82,7 +82,7 @@ SDL_ScanUnsignedLong(const char *text, int radix, unsigned long *valuep)
} }
for (;;) { for (;;) {
int v; int v;
if (SDL_isdigit(*text)) { if (SDL_isdigit((unsigned char) *text)) {
v = *text - '0'; v = *text - '0';
} else if (radix == 16 && SDL_isupperhex(*text)) { } else if (radix == 16 && SDL_isupperhex(*text)) {
v = 10 + (*text - 'A'); v = 10 + (*text - 'A');
@ -114,7 +114,7 @@ SDL_ScanUintPtrT(const char *text, int radix, uintptr_t * valuep)
} }
for (;;) { for (;;) {
int v; int v;
if (SDL_isdigit(*text)) { if (SDL_isdigit((unsigned char) *text)) {
v = *text - '0'; v = *text - '0';
} else if (radix == 16 && SDL_isupperhex(*text)) { } else if (radix == 16 && SDL_isupperhex(*text)) {
v = 10 + (*text - 'A'); v = 10 + (*text - 'A');
@ -152,7 +152,7 @@ SDL_ScanLongLong(const char *text, int radix, Sint64 * valuep)
} }
for (;;) { for (;;) {
int v; int v;
if (SDL_isdigit(*text)) { if (SDL_isdigit((unsigned char) *text)) {
v = *text - '0'; v = *text - '0';
} else if (radix == 16 && SDL_isupperhex(*text)) { } else if (radix == 16 && SDL_isupperhex(*text)) {
v = 10 + (*text - 'A'); v = 10 + (*text - 'A');
@ -188,7 +188,7 @@ SDL_ScanUnsignedLongLong(const char *text, int radix, Uint64 * valuep)
} }
for (;;) { for (;;) {
int v; int v;
if (SDL_isdigit(*text)) { if (SDL_isdigit((unsigned char) *text)) {
v = *text - '0'; v = *text - '0';
} else if (radix == 16 && SDL_isupperhex(*text)) { } else if (radix == 16 && SDL_isupperhex(*text)) {
v = 10 + (*text - 'A'); v = 10 + (*text - 'A');
@ -227,7 +227,7 @@ SDL_ScanFloat(const char *text, double *valuep)
if (*text == '.') { if (*text == '.') {
int mult = 10; int mult = 10;
++text; ++text;
while (SDL_isdigit(*text)) { while (SDL_isdigit((unsigned char) *text)) {
lvalue = *text - '0'; lvalue = *text - '0';
value += (double) lvalue / mult; value += (double) lvalue / mult;
mult *= 10; mult *= 10;
@ -411,7 +411,7 @@ SDL_strupr(char *string)
{ {
char *bufp = string; char *bufp = string;
while (*bufp) { while (*bufp) {
*bufp = SDL_toupper(*bufp); *bufp = SDL_toupper((unsigned char) *bufp);
++bufp; ++bufp;
} }
return string; return string;
@ -424,7 +424,7 @@ SDL_strlwr(char *string)
{ {
char *bufp = string; char *bufp = string;
while (*bufp) { while (*bufp) {
*bufp = SDL_tolower(*bufp); *bufp = SDL_tolower((unsigned char) *bufp);
++bufp; ++bufp;
} }
return string; return string;
@ -743,8 +743,8 @@ SDL_strcasecmp(const char *str1, const char *str2)
char a = 0; char a = 0;
char b = 0; char b = 0;
while (*str1 && *str2) { while (*str1 && *str2) {
a = SDL_tolower(*str1); a = SDL_tolower((unsigned char) *str1);
b = SDL_tolower(*str2); b = SDL_tolower((unsigned char) *str2);
if (a != b) if (a != b)
break; break;
++str1; ++str1;
@ -763,8 +763,8 @@ SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen)
char a = 0; char a = 0;
char b = 0; char b = 0;
while (*str1 && *str2 && maxlen) { while (*str1 && *str2 && maxlen) {
a = SDL_tolower(*str1); a = SDL_tolower((unsigned char) *str1);
b = SDL_tolower(*str2); b = SDL_tolower((unsigned char) *str2);
if (a != b) if (a != b)
break; break;
++str1; ++str1;
@ -787,7 +787,7 @@ SDL_sscanf(const char *text, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
while (*fmt) { while (*fmt) {
if (*fmt == ' ') { if (*fmt == ' ') {
while (SDL_isspace(*text)) { while (SDL_isspace((unsigned char) *text)) {
++text; ++text;
} }
++fmt; ++fmt;
@ -839,7 +839,7 @@ SDL_sscanf(const char *text, const char *fmt, ...)
continue; continue;
} }
while (SDL_isspace(*text)) { while (SDL_isspace((unsigned char) *text)) {
++text; ++text;
} }
@ -872,7 +872,7 @@ SDL_sscanf(const char *text, const char *fmt, ...)
++index; ++index;
} }
if (text[index] == '0') { if (text[index] == '0') {
if (SDL_tolower(text[index + 1]) == 'x') { if (SDL_tolower((unsigned char) text[index + 1]) == 'x') {
radix = 16; radix = 16;
} else { } else {
radix = 8; radix = 8;
@ -1005,7 +1005,7 @@ SDL_sscanf(const char *text, const char *fmt, ...)
break; break;
case 's': case 's':
if (suppress) { if (suppress) {
while (!SDL_isspace(*text)) { while (!SDL_isspace((unsigned char) *text)) {
++text; ++text;
if (count) { if (count) {
if (--count == 0) { if (--count == 0) {
@ -1015,7 +1015,7 @@ SDL_sscanf(const char *text, const char *fmt, ...)
} }
} else { } else {
char *valuep = va_arg(ap, char *); char *valuep = va_arg(ap, char *);
while (!SDL_isspace(*text)) { while (!SDL_isspace((unsigned char) *text)) {
*valuep++ = *text++; *valuep++ = *text++;
if (count) { if (count) {
if (--count == 0) { if (--count == 0) {