summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-12-21 19:56:03 +0000
committerdelphij <delphij@FreeBSD.org>2009-12-21 19:56:03 +0000
commit45f47d9a5ff5b0b541b5a0bbbea010553ff5e743 (patch)
tree74320f9dfaa0993811e32a01f77d85ce317a120d
parent71977347f2ff3650a930308e5154ffc9096f72c8 (diff)
downloadFreeBSD-src-45f47d9a5ff5b0b541b5a0bbbea010553ff5e743.zip
FreeBSD-src-45f47d9a5ff5b0b541b5a0bbbea010553ff5e743.tar.gz
Use vsscanf instead of rolling our own.
PR: bin/140530 Submitted by: Jeremy Huddleston <jeremyhu apple.com> MFC after: 1 month
-rw-r--r--lib/libc/stdio/sscanf.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index 3c792e0..c793b86 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -41,37 +41,14 @@ __FBSDID("$FreeBSD$");
#include <stdarg.h>
#include "local.h"
-static int eofread(void *, char *, int);
-
-/* ARGSUSED */
-static int
-eofread(cookie, buf, len)
- void *cookie;
- char *buf;
- int len;
-{
-
- return (0);
-}
-
int
sscanf(const char * __restrict str, char const * __restrict fmt, ...)
{
int ret;
va_list ap;
- FILE f;
- f._file = -1;
- f._flags = __SRD;
- f._bf._base = f._p = (unsigned char *)str;
- f._bf._size = f._r = strlen(str);
- f._read = eofread;
- f._ub._base = NULL;
- f._lb._base = NULL;
- f._orientation = 0;
- memset(&f._mbstate, 0, sizeof(mbstate_t));
va_start(ap, fmt);
- ret = __svfscanf(&f, fmt, ap);
+ ret = vsscanf(str, fmt, ap);
va_end(ap);
return (ret);
}
OpenPOWER on IntegriCloud