Changeset f47a905 in mainline

Timestamp:

2018-06-13T11:16:01Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5a6c28d1

Parents:

01cc7b4

git-author:

Jiri Svoboda <jiri@…> (2018-06-12 17:14:36)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-13 11:16:01)

Message:

scanf, vscanf, vsscanf.

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/stdio/scanf.c (modified) (3 diffs)
• generic/stdio/sscanf.c (added)
• include/stdio.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -132 +132 @@
         generic/malloc.c \
         generic/stdio/scanf.c \
+        generic/stdio/sscanf.c \
         generic/stdio/sstream.c \
         generic/sysinfo.c \

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 {
@@ -1268 +1266 @@
 }
 
-static int xxvfscanf(FILE *f, const char *fmt, va_list ap)
+int xxvfscanf(FILE *f, const char *fmt, va_list ap)
 {
         const char *cp;
@@ -1337 +1335 @@
 }
 
-int xxsscanf(const char *s, const char *fmt, ...)
+int xxvscanf(const char *fmt, va_list ap)
+{
+        return xxvfscanf(stdin, fmt, ap);
+}
+
+int xxscanf(const char *fmt, ...)
 {
         va_list args;
-        FILE f;
         int rc;
 
-        __sstream_init(s, &f);
-
         va_start(args, fmt);
-        rc = xxvfscanf(&f, fmt, args);
+        rc = xxvscanf(fmt, args);
         va_end(args);
 
         return rc;
 }
+
+/** @}
+ */

uspace/lib/c/include/stdio.h

@@ -101 +101 @@
 extern int vsnprintf(char *, size_t, const char *, va_list);
 
+extern int xxscanf(const char *, ...);
+extern int xxvscanf(const char *, va_list);
 extern int xxfscanf(FILE *, const char *, ...);
+extern int xxvfscanf(FILE *, const char *, va_list);
 extern int xxsscanf(const char *, const char *, ...);
+extern int xxvsscanf(const char *, const char *, va_list);
 
 /* File stream functions */