new scanf implementation and corresponding integer parser/converter

[musl] / src / stdio / vsscanf.c

diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index fd48f70..fbc15e6 100644 (file)
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,21 +1,15 @@
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include "stdio_impl.h"
 
-#include "__scanf.h"
-
-static void s_read(rctx_t *r)
+static size_t do_read(FILE *f, unsigned char *buf, size_t len)
 {
-       unsigned char *s = r->opaque;
-       if (!s[r->l]) r->c = -1;
-       else r->c = s[r->l++];
+       return __string_read(f, buf, len);
 }
 
 int vsscanf(const char *s, const char *fmt, va_list ap)
 {
-       size_t l = strlen(fmt), i;
-       wchar_t fmt2[l+1];
-       rctx_t r = { s_read, (void *)s, 0, isspace };
-       for (i=0; i<=l; i++) fmt2[i] = (unsigned char)fmt[i];
-       return __scanf(&r, fmt2, ap);
+       FILE f = {
+               .buf = (void *)s, .cookie = (void *)s,
+               .read = do_read, .lock = -1
+       };
+       return vfscanf(&f, fmt, ap);
 }