Changeset 2b3dd78 in mainline for uspace/lib/posix/src/stdio/scanf.c

Timestamp:

2018-01-31T12:02:00Z (7 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/stdio/scanf.c (moved) (moved from uspace/lib/posix/source/stdio/scanf.c ) (17 diffs)

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

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include <assert.h>
 
@@ -119 +116 @@
         /* Initialize internal structures. */
         self->consumed = 0;
-        ssize_t fetched = posix_getline(
+        ssize_t fetched = getline(
             &self->window, &self->window_size, self->source.stream);
         if (fetched != -1) {
@@ -140 +137 @@
         /* Initialize internal structures. */
         self->consumed = 0;
-        self->fetched = posix_strlen(self->source.string);
+        self->fetched = strlen(self->source.string);
         self->window = (char *) self->source.string;
         self->window_size = self->fetched + 1;
@@ -158 +155 @@
                 /* Do we need to fetch a new line from the source? */
                 if (*self->cursor == '\0') {
-                        ssize_t fetched = posix_getline(&self->window,
+                        ssize_t fetched = getline(&self->window,
                             &self->window_size, self->source.stream);
                         if (fetched != -1) {
@@ -208 +205 @@
                  * containing newline, while at the same time newline is the character
                  * that breaks the matching process. */
-                int rc = posix_fseek(
-                    self->source.stream, -1, SEEK_CUR);
+                int rc = fseek(self->source.stream, -1, SEEK_CUR);
                 if (rc == -1) {
                         /* Seek failed.  */
                         return 0;
                 }
-                ssize_t fetched = posix_getline(&self->window,
+                ssize_t fetched = getline(&self->window,
                     &self->window_size, self->source.stream);
                 if (fetched != -1) {
@@ -266 +262 @@
         if (*self->cursor == '\0') {
                 /* Window was completely consumed, fetch new data. */
-                ssize_t fetched = posix_getline(&self->window,
+                ssize_t fetched = getline(&self->window,
                     &self->window_size, self->source.stream);
                 if (fetched != -1) {
@@ -298 +294 @@
         /* Try to correct the difference between the stream position and what was
          * actually consumed. If it is not possible, continue anyway. */
-        posix_fseek(self->source.stream, self->consumed - self->fetched, SEEK_CUR);
+        fseek(self->source.stream, self->consumed - self->fetched, SEEK_CUR);
 
         /* Destruct internal structures. */
@@ -563 +559 @@
                                 }
                                 char *fmt_new = NULL;
-                                width = posix_strtol(fmt, &fmt_new, 10);
+                                width = strtol(fmt, &fmt_new, 10);
                                 if (width != 0) {
                                         fmt = fmt_new;
@@ -625 +621 @@
 
                                 const char *cur_borrowed = NULL;
+                                char *cur_duplicated = NULL;
                                 const char *cur_limited = NULL;
-                                char *cur_updated = NULL;
+                                const char *cur_updated = NULL;
 
                                 /* Borrow the cursor. Until it is returned to the provider
@@ -637 +634 @@
                                  * than allowed by width. */
                                 if (width != -1) {
-                                        cur_limited = posix_strndup(cur_borrowed, width);
+                                        cur_duplicated = strndup(cur_borrowed, width);
+                                        cur_limited = cur_duplicated;
                                 } else {
                                         cur_limited = cur_borrowed;
                                 }
-                                cur_updated = (char *) cur_limited;
+                                cur_updated = cur_limited;
 
                                 long long sres = 0;
@@ -648 +646 @@
                                 /* Try to convert the integer. */
                                 if (int_conv_unsigned) {
-                                        ures = posix_strtoull(cur_limited, &cur_updated, int_conv_base);
+                                        ures = strtoull(cur_limited, (char **) &cur_updated, int_conv_base);
                                 } else {
-                                        sres = posix_strtoll(cur_limited, &cur_updated, int_conv_base);
+                                        sres = strtoll(cur_limited, (char **) &cur_updated, int_conv_base);
                                 }
 
                                 /* Update the cursor so it can be returned to the provider. */
                                 cur_borrowed += cur_updated - cur_limited;
-                                if (width != -1 && cur_limited != NULL) {
+                                if (cur_duplicated != NULL) {
                                         /* Deallocate duplicated part of the cursor view. */
-                                        free(cur_limited);
+                                        free(cur_duplicated);
                                 }
                                 cur_limited = NULL;
                                 cur_updated = NULL;
+                                cur_duplicated = NULL;
                                 /* Return the cursor to the provider. Input consistency is again
                                  * the job of the provider, so we can report errors from
@@ -797 +796 @@
                                 const char *cur_borrowed = NULL;
                                 const char *cur_limited = NULL;
-                                char *cur_updated = NULL;
+                                char *cur_duplicated = NULL;
+                                const char *cur_updated = NULL;
 
                                 /* Borrow the cursor. Until it is returned to the provider
@@ -808 +808 @@
                                  * than allowed by width. */
                                 if (width != -1) {
-                                        cur_limited = posix_strndup(cur_borrowed, width);
+                                        cur_duplicated = strndup(cur_borrowed, width);
+                                        cur_limited = cur_duplicated;
                                 } else {
                                         cur_limited = cur_borrowed;
                                 }
-                                cur_updated = (char *) cur_limited;
+                                cur_updated = cur_limited;
 
                                 float fres = 0.0;
@@ -821 +822 @@
                                 switch (length_mod) {
                                 case LMOD_NONE:
-                                        fres = posix_strtof(cur_limited, &cur_updated);
+                                        fres = strtof(cur_limited, (char **) &cur_updated);
                                         break;
                                 case LMOD_l:
-                                        dres = posix_strtod(cur_limited, &cur_updated);
+                                        dres = strtod(cur_limited, (char **) &cur_updated);
                                         break;
                                 case LMOD_L:
-                                        ldres = posix_strtold(cur_limited, &cur_updated);
+                                        ldres = strtold(cur_limited, (char **) &cur_updated);
                                         break;
                                 default:
@@ -835 +836 @@
                                 /* Update the cursor so it can be returned to the provider. */
                                 cur_borrowed += cur_updated - cur_limited;
-                                if (width != -1 && cur_limited != NULL) {
+                                if (cur_duplicated != NULL) {
                                         /* Deallocate duplicated part of the cursor view. */
-                                        free(cur_limited);
+                                        free(cur_duplicated);
                                 }
                                 cur_limited = NULL;
@@ -1189 +1190 @@
  * @return The number of converted output items or EOF on failure.
  */
-int posix_vfscanf(
+int vfscanf(
     FILE *restrict stream, const char *restrict format, va_list arg)
 {
@@ -1209 +1210 @@
  * @return The number of converted output items or EOF on failure.
  */
-int posix_vsscanf(
+int vsscanf(
     const char *restrict s, const char *restrict format, va_list arg)
 {