Changeset 1008

Timestamp:

Jan 18, 2004, 10:49:32 PM (22 years ago)

Author:

bird

Message:

(ctype:) Review and fixup to meet standards. Added two more BSD calls.

Location:

trunk/src/emx/src/lib

Files:

• libc.def (modified) (1 diff, 1 prop)
• locale/isxxx.c (modified) (1 diff, 1 prop)
• locale/locale_ctype.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/libc.def

@@ -957 +957 @@
     "_regexec" @986
     "_regfree" @987
+    "_isblank" @988
+    "_ishexnumber" @989
+    "_isnumber" @990
+    "___istype" @991
+    "___tolower" @992
+    "___toupper" @993

trunk/src/emx/src/lib/locale/isxxx.c

@@ -10 +10 @@
 */
 
+#define _DONT_USE_CTYPE_INLINE_
 #include "libc-alias.h"
 #include <sys/locale.h>
+#include <ctype.h>
 
-int     isalnum(int);
-int     isalpha(int);
-int     iscntrl(int);
-int     isdigit(int);
-int     isgraph(int);
-int     islower(int);
-int     isprint(int);
-int     ispunct(int);
-int     isspace(int);
-int     isupper(int);
-int     isxdigit(int);
-int     isascii(int);
-int     toascii(int);
-
-int isalnum (int _c)
+#undef isalnum
+int isalnum(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER|__DIGIT); }
 
-int isalpha (int _c)
+#undef isalpha
+int isalpha(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__UPPER|__LOWER); }
 
-int iscntrl (int _c)
+#undef iscntrl
+int iscntrl(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__CNTRL); }
 
-int isdigit (int _c)
+#undef isdigit
+int isdigit(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__DIGIT); }
 
-int isgraph (int _c)
+#undef isgraph
+int isgraph(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__PUNCT|__UPPER|__LOWER|__DIGIT); }
 
-int islower (int _c)
+#undef islower
+int islower(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__LOWER); }
 
-int isprint (int _c)
+#undef isprint
+int isprint(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__PRINT); }
 
-int ispunct (int _c)
+#undef ispunct
+int ispunct(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__PUNCT); }
 
-int isspace (int _c)
+#undef isspace
+int isspace(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__SPACE); }
 
-int isupper (int _c)
+#undef isupper
+int isupper(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__UPPER); }
 
-int isxdigit (int _c)
+#undef isxdigit
+int isxdigit(int _c)
 { return __locale_ctype.cflags [_c & 0xff] & (__XDIGIT); }
 
-int toascii (int _c)
+#undef isblank
+int isblank(int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__BLANK); }
+
+#undef ishexnumber
+int ishexnumber(int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__XDIGIT); }
+
+#undef isnumber
+int isnumber(int _c)
+{ return __locale_ctype.cflags [_c & 0xff] & (__DIGIT); }
+
+#undef toascii
+int toascii(int _c)
 { return _c & 0x7f; }
 
-int isascii (int _c)
+#undef isascii
+int isascii(int _c)
 { return (_c & 0x80) != 0; }
+
+

trunk/src/emx/src/lib/locale/locale_ctype.c

@@ -9 +9 @@
 
 #define __INTERNAL_DEFS
+#define _DONT_USE_CTYPE_INLINE_
 #include "libc-alias.h"
 #include <sys/locale.h>
-#include <string.h>
+#include <ctype.h>
 
 struct __locale_ctype __locale_ctype =
@@ -88 +89 @@
 };
 
-int tolower (int _c);
-int toupper (int _c);
 
-int tolower (int _c)
+#undef tolower
+int tolower(int _c)
+{ return __locale_ctype.locase [_c & 0xff]; }
+int __tolower(int _c)
 { return __locale_ctype.locase [_c & 0xff]; }
 
-int toupper (int _c)
+#undef toupper
+int toupper(int _c)
 { return __locale_ctype.upcase [_c & 0xff]; }
+int __toupper(int _c)
+{ return __locale_ctype.upcase [_c & 0xff]; }
+
+int __istype(int _c, unsigned _f)
+{ return __locale_ctype.cflags [_c & 0xff] & (_f); }
+
+
 
 
@@ -120 +130 @@
            "\n"
            "#define __INTERNAL_DEFS\n"
+           "#define _DONT_USE_CTYPE_INLINE_\n"
            "#include \"libc-alias.h\"\n"
            "#include <sys/locale.h>\n"
-           "#include <string.h>\n"
+           "#include <ctype.h>\n"
            "\n"
            "\n"