Mercurial > sdl-ios-xcode

diff src/stdlib/SDL_string.c @ 1354:22f39393668a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed build problem with SDL_string.c Officially deprecated SDL_byteorder.h, SDL_getenv.h and SDL_types.h Moved endian-related SDL_rwops code into SDL_rwops.c
author Sam Lantinga <slouken@libsdl.org>
date Thu, 09 Feb 2006 09:38:05 +0000
parents d5c4f8f6855e
children c71e05b4dc2e
line wrap: on
line diff
--- a/src/stdlib/SDL_string.c	Thu Feb 09 09:07:13 2006 +0000
+++ b/src/stdlib/SDL_string.c	Thu Feb 09 09:38:05 2006 +0000
@@ -23,14 +23,11 @@
 
 /* This file contains portable string manipulation functions for SDL */
 
-#include "SDL_types.h"
-#include "SDL_ctype.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 
 
-#define isupperhex(X)   (((X) >= 'A') && ((X) <= 'F'))
-#define islowerhex(X)   (((X) >= 'a') && ((X) <= 'f'))
+#define SDL_isupperhex(X)   (((X) >= 'A') && ((X) <= 'F'))
+#define SDL_islowerhex(X)   (((X) >= 'a') && ((X) <= 'f'))
 
 #if !defined(HAVE_SSCANF) || !defined(HAVE_STRTOL)
 static size_t SDL_ScanLong(const char *text, int radix, long *valuep)
@@ -48,11 +45,11 @@
     }
     for ( ; ; ) {
         int v;
-        if ( isdigit(*text) ) {
+        if ( SDL_isdigit(*text) ) {
             v = *text - '0';
-        } else if ( radix == 16 && isupperhex(*text) ) {
+        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
             v = 10 + (*text - 'A');
-        } else if ( radix == 16 && islowerhex(*text) ) {
+        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
             v = 10 + (*text - 'a');
         } else {
             break;
@@ -83,11 +80,11 @@
     }
     for ( ; ; ) {
         int v;
-        if ( isdigit(*text) ) {
+        if ( SDL_isdigit(*text) ) {
             v = *text - '0';
-        } else if ( radix == 16 && isupperhex(*text) ) {
+        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
             v = 10 + (*text - 'A');
-        } else if ( radix == 16 && islowerhex(*text) ) {
+        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
             v = 10 + (*text - 'a');
         } else {
             break;
@@ -120,11 +117,11 @@
     }
     for ( ; ; ) {
         int v;
-        if ( isdigit(*text) ) {
+        if ( SDL_isdigit(*text) ) {
             v = *text - '0';
-        } else if ( radix == 16 && isupperhex(*text) ) {
+        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
             v = 10 + (*text - 'A');
-        } else if ( radix == 16 && islowerhex(*text) ) {
+        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
             v = 10 + (*text - 'a');
         } else {
             break;
@@ -155,11 +152,11 @@
     }
     for ( ; ; ) {
         int v;
-        if ( isdigit(*text) ) {
+        if ( SDL_isdigit(*text) ) {
             v = *text - '0';
-        } else if ( radix == 16 && isupperhex(*text) ) {
+        } else if ( radix == 16 && SDL_isupperhex(*text) ) {
             v = 10 + (*text - 'A');
-        } else if ( radix == 16 && islowerhex(*text) ) {
+        } else if ( radix == 16 && SDL_islowerhex(*text) ) {
             v = 10 + (*text - 'a');
         } else {
             break;
@@ -193,7 +190,7 @@
     if ( *text == '.' ) {
         int mult = 10;
         ++text;
-        while ( isdigit(*text) ) {
+        while ( SDL_isdigit(*text) ) {
             lvalue = *text - '0';
             value += (double)lvalue / mult;
             mult *= 10;
@@ -632,7 +629,7 @@
     va_start(ap, fmt);
     while ( *fmt ) {
         if ( *fmt == ' ' ) {
-            while ( isspace(*text) ) {
+            while ( SDL_isspace(*text) ) {
                 ++text;
             }
             ++fmt;
@@ -683,7 +680,7 @@
                 continue;
             }
 
-            while ( isspace(*text) ) {
+            while ( SDL_isspace(*text) ) {
                 ++text;
             }
 
@@ -845,7 +842,7 @@
                         break;
                     case 's':
                         if ( suppress ) {
-                            while ( !isspace(*text) ) {
+                            while ( !SDL_isspace(*text) ) {
                                 ++text;
                                 if ( count ) {
                                     if ( --count == 0 ) {
@@ -855,7 +852,7 @@
                             }
                         } else {
                             char *valuep = va_arg(ap, char*);
-                            while ( !isspace(*text) ) {
+                            while ( !SDL_isspace(*text) ) {
                                 *valuep++ = *text++;
                                 if ( count ) {
                                     if ( --count == 0 ) {