Changeset d39c46e0 in mainline for uspace/lib/posix

Timestamp:

2018-01-16T19:12:36Z (8 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:

33b8d024

Parents:

aec41c8

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-16 19:04:19)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-16 19:12:36)

Message:

Implement the full suite of standard string-to-int conversion functions in libc.

Location:

uspace/lib/posix

Files:

• Makefile (modified) (1 diff)
• include/posix/inttypes.h (modified) (1 diff)
• include/posix/stdlib.h (modified) (1 diff)
• source/stdio/scanf.c (modified) (2 diffs)
• source/stdlib/strtol.c (deleted)

uspace/lib/posix/Makefile

@@ -76 +76 @@
         source/stdio/scanf.c \
         source/stdlib.c \
-        source/stdlib/strtol.c \
         source/stdlib/strtold.c \
         source/string.c \

uspace/lib/posix/include/posix/inttypes.h

@@ -43 +43 @@
 #include "libc/inttypes.h"
 
-extern intmax_t __POSIX_DEF__(strtoimax)(const char *__restrict__ nptr,
-    char **__restrict__ endptr, int base);
-extern uintmax_t __POSIX_DEF__(strtoumax)(const char *__restrict__ nptr,
-    char **__restrict__ endptr, int base);
-
-
 #endif /* POSIX_INTTYPES_H_ */
 

uspace/lib/posix/include/posix/stdlib.h

@@ -101 +101 @@
 
 /* Integer Conversion */
-extern int __POSIX_DEF__(atoi)(const char *nptr);
-extern long int __POSIX_DEF__(atol)(const char *nptr);
-extern long long int __POSIX_DEF__(atoll)(const char *nptr);
-extern long int __POSIX_DEF__(strtol)(const char *__restrict__ nptr,
+extern int atoi(const char *nptr);
+extern long int atol(const char *nptr);
+extern long long int atoll(const char *nptr);
+extern long int strtol(const char *__restrict__ nptr,
     char **__restrict__ endptr, int base);
-extern long long int __POSIX_DEF__(strtoll)(const char *__restrict__ nptr,
+extern long long int strtoll(const char *__restrict__ nptr,
     char **__restrict__ endptr, int base);
-extern unsigned long int __POSIX_DEF__(strtoul)(const char *__restrict__ nptr,
+extern unsigned long int strtoul(const char *__restrict__ nptr,
     char **__restrict__ endptr, int base);
-extern unsigned long long int __POSIX_DEF__(strtoull)(
+extern unsigned long long int strtoull(
     const char *__restrict__ nptr, char **__restrict__ endptr, int base);
 

uspace/lib/posix/source/stdio/scanf.c

@@ -563 +563 @@
                                 }
                                 char *fmt_new = NULL;
-                                width = posix_strtol(fmt, &fmt_new, 10);
+                                width = strtol(fmt, &fmt_new, 10);
                                 if (width != 0) {
                                         fmt = fmt_new;
@@ -648 +648 @@
                                 /* Try to convert the integer. */
                                 if (int_conv_unsigned) {
-                                        ures = posix_strtoull(cur_limited, &cur_updated, int_conv_base);
+                                        ures = strtoull(cur_limited, &cur_updated, int_conv_base);
                                 } else {
-                                        sres = posix_strtoll(cur_limited, &cur_updated, int_conv_base);
+                                        sres = strtoll(cur_limited, &cur_updated, int_conv_base);
                                 }