Changeset fdfb24e in mainline for common

Timestamp:

2023-10-27T17:53:21Z (20 months ago)

Author:

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

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

55c5cb05

Parents:

44e8541

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 17:38:24)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 17:53:21)

Message:

Deduplicate string related functions

Location:

common

Files:

• include/ctype.h (moved) (moved from uspace/lib/c/include/ctype.h )
• include/str.h (moved) (moved from uspace/lib/c/include/str.h ) (2 diffs)
• include/str_error.h (moved) (moved from uspace/lib/c/include/str_error.h )
• stdc/ctype.c (moved) (moved from uspace/lib/c/generic/ctype.c )
• str.c (moved) (moved from uspace/lib/c/generic/str.c )
• str_error.c (moved) (moved from kernel/generic/src/lib/str_error.c ) (4 diffs)
• strtol.c (moved) (moved from uspace/lib/c/generic/strtol.c ) (6 diffs)

common/include/str.h

@@ -45 +45 @@
 #include <mem.h>
 #include <_bits/decls.h>
+#include <_bits/uchar.h>
 
 #ifndef __cplusplus
@@ -50 +51 @@
 /* Common Unicode characters */
 #define U_SPECIAL      '?'
+
+#define U_LEFT_ARROW   0x2190
+#define U_UP_ARROW     0x2191
+#define U_RIGHT_ARROW  0x2192
+#define U_DOWN_ARROW   0x2193
+
+#define U_PAGE_UP      0x21de
+#define U_PAGE_DOWN    0x21df
+
+#define U_HOME_ARROW   0x21f1
+#define U_END_ARROW    0x21f2
+
+#define U_NULL         0x2400
+#define U_ESCAPE       0x241b
+#define U_DELETE       0x2421
+
+#define U_CURSOR       0x2588
 
 /** No size limit constant */

common/str_error.c

@@ -28 +28 @@
  */
 
+#include <str_error.h>
+
 #include <errno.h>
-#include <str.h>
+#include <stddef.h>
+
 
 /*
@@ -64 +67 @@
         /*
          * Just a dumb linear search.
-         * There too few entries to warrant anything smarter.
+         * There are too few entries to warrant anything smarter.
          */
 
@@ -86 +89 @@
         }
 
-        return "(unknown)";
+        return NULL;
 }
 
@@ -97 +100 @@
         }
 
-        return "Unknown error code";
+        return NULL;
 }

common/strtol.c

@@ -269 +269 @@
 long strtol(const char *nptr, char **endptr, int base)
 {
+#if !__STDC_HOSTED__
+        errno_t errno;
+#endif
+
         return _strtosigned(nptr, endptr, base, LONG_MIN, LONG_MAX, &errno, false);
 }
@@ -287 +291 @@
 unsigned long strtoul(const char *nptr, char **endptr, int base)
 {
+#if !__STDC_HOSTED__
+        errno_t errno;
+#endif
+
         return _strtounsigned(nptr, endptr, base, ULONG_MAX, &errno, false);
 }
@@ -292 +300 @@
 long long strtoll(const char *nptr, char **endptr, int base)
 {
+#if !__STDC_HOSTED__
+        errno_t errno;
+#endif
+
         return _strtosigned(nptr, endptr, base, LLONG_MIN, LLONG_MAX, &errno, false);
 }
@@ -297 +309 @@
 unsigned long long strtoull(const char *nptr, char **endptr, int base)
 {
+#if !__STDC_HOSTED__
+        errno_t errno;
+#endif
+
         return _strtounsigned(nptr, endptr, base, ULLONG_MAX, &errno, false);
 }
@@ -302 +318 @@
 intmax_t strtoimax(const char *nptr, char **endptr, int base)
 {
+#if !__STDC_HOSTED__
+        errno_t errno;
+#endif
+
         return _strtosigned(nptr, endptr, base, INTMAX_MIN, INTMAX_MAX, &errno, false);
 }
@@ -307 +327 @@
 uintmax_t strtoumax(const char *nptr, char **endptr, int base)
 {
+#if !__STDC_HOSTED__
+        errno_t errno;
+#endif
+
         return _strtounsigned(nptr, endptr, base, UINTMAX_MAX, &errno, false);
 }