Changeset 2b3dd78 in mainline for uspace/lib/posix/src/stdlib/strtold.c

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/stdlib/strtold.c (moved) (moved from uspace/lib/posix/source/stdlib/strtold.c ) (7 diffs)

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

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include "libc/stdbool.h"
@@ -50 +47 @@
 
 #include "posix/float.h"
+
+#include "libc/str.h"
 
 #ifndef HUGE_VALL
@@ -345 +344 @@
         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;
@@ -405 +404 @@
  * @return An approximate representation of the input floating-point number.
  */
-long double posix_strtold(const char *restrict nptr, char **restrict endptr)
+long double strtold(const char *restrict nptr, char **restrict endptr)
 {
         assert(nptr != NULL);
@@ -431 +430 @@
         
         /* check for NaN */
-        if (posix_strncasecmp(&nptr[i], "nan", 3) == 0) {
+        if (strncasecmp(&nptr[i], "nan", 3) == 0) {
                 // FIXME: return NaN
                 // TODO: handle the parenthesised case
@@ -443 +442 @@
         
         /* check for Infinity */
-        if (posix_strncasecmp(&nptr[i], "inf", 3) == 0) {
+        if (strncasecmp(&nptr[i], "inf", 3) == 0) {
                 i += 3;
-                if (posix_strncasecmp(&nptr[i], "inity", 5) == 0) {
+                if (strncasecmp(&nptr[i], "inity", 5) == 0) {
                         i += 5;
                 }
@@ -457 +456 @@
         /* 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;