Changeset dbbbe75b in mainline

Timestamp:

2018-01-15T21:54:21Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8348846

Parents:

c718bda

Message:

Add missing standard functions to <ctype.h>

Location:

uspace/lib

Files:

• c/include/ctype.h (modified) (2 diffs)
• posix/include/posix/ctype.h (modified) (1 diff)
• posix/source/ctype.c (modified) (3 diffs)
• posix/source/fnmatch.c (modified) (1 diff)
• posix/source/stdlib/strtold.c (modified) (2 diffs)
• uri/internal/ctype.h (moved) (moved from uspace/lib/uri/ctype.h )
• uri/uri.c (modified) (1 diff)

uspace/lib/c/include/ctype.h

@@ -61 +61 @@
 }
 
+static inline int isblank(int c)
+{
+        return c == ' ' || c == '\t';
+}
+
+static inline int iscntrl(int c)
+{
+        return (c >= 0 && c < 0x20) || c == 0x7E;
+}
+
+static inline int isprint(int c)
+{
+        return c >= 0 && c < 0x80 && !iscntrl(c);
+}
+
+static inline int isgraph(int c)
+{
+        return isprint(c) && c != ' ';
+}
+
 static inline int isspace(int c)
 {
@@ -75 +95 @@
                 return 0;
         }
+}
+
+static inline int ispunct(int c)
+{
+        return !isspace(c) && !isalnum(c) && isprint(c);
+}
+
+static inline int isxdigit(int c)
+{
+        return isdigit(c) ||
+            (c >= 'a' && c <= 'f') ||
+            (c >= 'A' && c <= 'F');
 }
 

uspace/lib/posix/include/posix/ctype.h

@@ -43 +43 @@
 #include "libc/ctype.h"
 
-/* Classification of Characters */
-extern int __POSIX_DEF__(isxdigit)(int c);
-extern int __POSIX_DEF__(isblank)(int c);
-extern int __POSIX_DEF__(iscntrl)(int c);
-extern int __POSIX_DEF__(isgraph)(int c);
-extern int __POSIX_DEF__(isprint)(int c);
-extern int __POSIX_DEF__(ispunct)(int c);
+/* Obsolete Functions and Macros */
+extern int isascii(int c);
+extern int toascii(int c);
 
-/* Obsolete Functions and Macros */
-extern int __POSIX_DEF__(isascii)(int c);
-extern int __POSIX_DEF__(toascii)(int c);
-#undef _tolower
 #define _tolower(c) ((c) - 'A' + 'a')
-#undef _toupper
 #define _toupper(c) ((c) - 'a' + 'A')
-
-
 
 #endif /* POSIX_CTYPE_H_ */

uspace/lib/posix/source/ctype.c

@@ -34 +34 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "posix/ctype.h"
-
-/**
- * Checks whether character is a hexadecimal digit.
- *
- * @param c Character to inspect.
- * @return Non-zero if character match the definition, zero otherwise.
- */
-int posix_isxdigit(int c)
-{
-        return isdigit(c) ||
-            (c >= 'a' && c <= 'f') ||
-            (c >= 'A' && c <= 'F');
-}
-
-/**
- * Checks whether character is a word separator.
- *
- * @param c Character to inspect.
- * @return Non-zero if character match the definition, zero otherwise.
- */
-int posix_isblank(int c)
-{
-        return c == ' ' || c == '\t';
-}
-
-/**
- * Checks whether character is a control character.
- *
- * @param c Character to inspect.
- * @return Non-zero if character match the definition, zero otherwise.
- */
-int posix_iscntrl(int c)
-{
-        return c < 0x20 || c == 0x7E;
-}
-
-/**
- * Checks whether character is any printing character except space.
- *
- * @param c Character to inspect.
- * @return Non-zero if character match the definition, zero otherwise.
- */
-int posix_isgraph(int c)
-{
-        return posix_isprint(c) && c != ' ';
-}
-
-/**
- * Checks whether character is a printing character.
- *
- * @param c Character to inspect.
- * @return Non-zero if character match the definition, zero otherwise.
- */
-int posix_isprint(int c)
-{
-        return posix_isascii(c) && !posix_iscntrl(c);
-}
-
-/**
- * Checks whether character is a punctuation.
- *
- * @param c Character to inspect.
- * @return Non-zero if character match the definition, zero otherwise.
- */
-int posix_ispunct(int c)
-{
-        return !isspace(c) && !isalnum(c) && posix_isprint(c);
-}
 
 /**
@@ -113 +42 @@
  * @return Non-zero if character match the definition, zero otherwise.
  */
-int posix_isascii(int c)
+int isascii(int c)
 {
         return c >= 0 && c < 128;
@@ -124 +53 @@
  * @return Coverted character.
  */
-int posix_toascii(int c)
+int toascii(int c)
 {
         return c & 0x7F;

uspace/lib/posix/source/fnmatch.c

@@ -183 +183 @@
         { "alnum", isalnum },
         { "alpha", isalpha },
-        { "blank", posix_isblank },
-        { "cntrl", posix_iscntrl },
+        { "blank", isblank },
+        { "cntrl", iscntrl },
         { "digit", isdigit },
-        { "graph", posix_isgraph },
+        { "graph", isgraph },
         { "lower", islower },
-        { "print", posix_isprint },
-        { "punct", posix_ispunct },
+        { "print", isprint },
+        { "punct", ispunct },
         { "space", isspace },
         { "upper", isupper },
-        { "xdigit", posix_isxdigit }
+        { "xdigit", isxdigit }
 };
 

uspace/lib/posix/source/stdlib/strtold.c

@@ -347 +347 @@
         bool after_decimal = false;
         
-        while (posix_isxdigit(*str) || (!after_decimal && *str == DECIMAL_POINT)) {
+        while (isxdigit(*str) || (!after_decimal && *str == DECIMAL_POINT)) {
                 if (*str == DECIMAL_POINT) {
                         after_decimal = true;
@@ -459 +459 @@
         /* check for a hex number */
         if (nptr[i] == '0' && tolower(nptr[i + 1]) == 'x' &&
-            (posix_isxdigit(nptr[i + 2]) ||
-            (nptr[i + 2] == RADIX && posix_isxdigit(nptr[i + 3])))) {
+            (isxdigit(nptr[i + 2]) ||
+            (nptr[i + 2] == RADIX && isxdigit(nptr[i + 3])))) {
                 i += 2;
                 

uspace/lib/uri/uri.c

@@ -42 +42 @@
 
 #include "uri.h"
-#include "ctype.h"
+#include "internal/ctype.h"
 
 static char *cut_str(const char *start, const char *end)