Changeset 01cc7b4 in mainline for uspace/lib/c/generic/stdio/scanf.c

Timestamp:

2018-06-13T10:59:47Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f47a905

Parents:

ed18e14

git-author:

Jiri Svoboda <jiri@…> (2018-06-11 18:54:14)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-13 10:59:47)

Message:

Implement sscanf via virtualizing FILE and implementing string backend for FILE.

File:

• uspace/lib/c/generic/stdio/scanf.c (modified) (2 diffs)

uspace/lib/c/generic/stdio/scanf.c

@@ -46 +46 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "../private/stdio.h"
+#include "../private/sstream.h"
 
 typedef enum {
@@ -1338 +1340 @@
 {
         va_list args;
-        FILE *f;
+        FILE f;
         int rc;
 
-        f = fopen("/tmp/test.tmp", "wt");
-        if (f == NULL)
-                return EOF;
-
-        if (fputs(s, f) == EOF)
-                return EOF;
-
-        if (fclose(f) == EOF)
-                return EOF;
-
-        f = fopen("/tmp/test.tmp", "rt");
-        if (f == NULL) {
-                printf("failed to open for reading\n");
-                return EOF;
-        }
+        __sstream_init(s, &f);
 
         va_start(args, fmt);
-        rc = xxvfscanf(f, fmt, args);
+        rc = xxvfscanf(&f, fmt, args);
         va_end(args);
 
-        fclose(f);
-
         return rc;
 }