Changeset 5a6c28d1 in mainline for uspace/lib/c/generic/stdio/scanf.c

Timestamp:

2018-06-13T15:50:53Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

39f84ce4

Parents:

f47a905

git-author:

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

git-committer:

Jiri Svoboda <jiri@…> (2018-06-13 15:50:53)

Message:

Replace libposix scanf with libc scanf.

File:

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

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

@@ -624 +624 @@
         v = 0;
         do {
-                digit = digit_value(c); // XXX
+                digit = digit_value(c);
                 if (digit >= base)
                         break;
@@ -1266 +1266 @@
 }
 
-int xxvfscanf(FILE *f, const char *fmt, va_list ap)
+int vfscanf(FILE *f, const char *fmt, va_list ap)
 {
         const char *cp;
@@ -1323 +1323 @@
 }
 
-int xxfscanf(FILE *f, const char *fmt, ...)
+int fscanf(FILE *f, const char *fmt, ...)
 {
         va_list args;
@@ -1329 +1329 @@
 
         va_start(args, fmt);
-        rc = xxvfscanf(f, fmt, args);
+        rc = vfscanf(f, fmt, args);
         va_end(args);
 
@@ -1335 +1335 @@
 }
 
-int xxvscanf(const char *fmt, va_list ap)
-{
-        return xxvfscanf(stdin, fmt, ap);
-}
-
-int xxscanf(const char *fmt, ...)
+int vscanf(const char *fmt, va_list ap)
+{
+        return vfscanf(stdin, fmt, ap);
+}
+
+int scanf(const char *fmt, ...)
 {
         va_list args;
@@ -1346 +1346 @@
 
         va_start(args, fmt);
-        rc = xxvscanf(fmt, args);
+        rc = vscanf(fmt, args);
         va_end(args);