summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio/sscanf.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2002-02-19 19:39:35 +0000
committermillert <millert@openbsd.org>2002-02-19 19:39:35 +0000
commite7beb4a7d58a6a0955c07ef9465f5caa3383f928 (patch)
treea90c75bb4a04ab98987b06850cbdffd6c1903e17 /lib/libc/stdio/sscanf.c
parentEvery command should have a manual page. (diff)
downloadwireguard-openbsd-e7beb4a7d58a6a0955c07ef9465f5caa3383f928.tar.xz
wireguard-openbsd-e7beb4a7d58a6a0955c07ef9465f5caa3383f928.zip
We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.
Diffstat (limited to 'lib/libc/stdio/sscanf.c')
-rw-r--r--lib/libc/stdio/sscanf.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index f5bee8f9b70..7a9606e3abb 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -35,16 +35,12 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sscanf.c,v 1.4 2001/07/09 06:57:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sscanf.c,v 1.5 2002/02/19 19:39:37 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
#include <string.h>
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
/* ARGSUSED */
@@ -59,14 +55,7 @@ eofread(cookie, buf, len)
}
int
-#ifdef __STDC__
sscanf(const char *str, char const *fmt, ...)
-#else
-sscanf(str, fmt, va_alist)
- const char *str;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -78,11 +67,7 @@ sscanf(str, fmt, va_alist)
f._read = eofread;
f._ub._base = NULL;
f._lb._base = NULL;
-#ifdef __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
ret = __svfscanf(&f, fmt, ap);
va_end(ap);
return (ret);