summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdio
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2013-04-17 17:40:35 +0000
committertedu <tedu@openbsd.org>2013-04-17 17:40:35 +0000
commit928cef96820a77291fe483e919fcbcc7abcb3319 (patch)
tree6d2f17e88a0caab51454d7a136558371549f03ca /lib/libc/stdio
parentsilence some warnings by adding prototypes, casts, and headers as (diff)
downloadwireguard-openbsd-928cef96820a77291fe483e919fcbcc7abcb3319.tar.xz
wireguard-openbsd-928cef96820a77291fe483e919fcbcc7abcb3319.zip
add some prototypes, casts, includes, parenthesis, and whatnot to
silence some warnings.
Diffstat (limited to 'lib/libc/stdio')
-rw-r--r--lib/libc/stdio/fputws.c4
-rw-r--r--lib/libc/stdio/vfscanf.c3
-rw-r--r--lib/libc/stdio/vfwprintf.c4
-rw-r--r--lib/libc/stdio/wcio.h4
4 files changed, 10 insertions, 5 deletions
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index ee76c5bebb8..c4c2d8ea068 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fputws.c,v 1.5 2009/11/09 00:18:27 kurt Exp $ */
+/* $OpenBSD: fputws.c,v 1.6 2013/04/17 17:40:35 tedu Exp $ */
/* $NetBSD: fputws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $ */
/*-
@@ -35,6 +35,8 @@
#include <wchar.h>
#include "local.h"
+wint_t __fputwc_unlock(wchar_t wc, FILE *fp);
+
int
fputws(ws, fp)
const wchar_t * __restrict ws;
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 10aac0002e4..c2996a971a0 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfscanf.c,v 1.29 2012/01/18 14:01:38 stsp Exp $ */
+/* $OpenBSD: vfscanf.c,v 1.30 2013/04/17 17:40:35 tedu Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,6 +32,7 @@
*/
#include <ctype.h>
+#include <wctype.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stddef.h>
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index 0619772323d..f76eed3e24c 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfwprintf.c,v 1.5 2012/06/26 14:53:23 matthew Exp $ */
+/* $OpenBSD: vfwprintf.c,v 1.6 2013/04/17 17:40:35 tedu Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -54,6 +54,8 @@
#include "local.h"
#include "fvwrite.h"
+wint_t __fputwc_unlock(wchar_t wc, FILE *fp);
+
union arg {
int intarg;
unsigned int uintarg;
diff --git a/lib/libc/stdio/wcio.h b/lib/libc/stdio/wcio.h
index 1b41ec971d2..584a3f209ed 100644
--- a/lib/libc/stdio/wcio.h
+++ b/lib/libc/stdio/wcio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wcio.h,v 1.1 2005/06/17 20:40:32 espie Exp $ */
+/* $OpenBSD: wcio.h,v 1.2 2013/04/17 17:40:35 tedu Exp $ */
/* $NetBSD: wcio.h,v 1.3 2003/01/18 11:30:00 thorpej Exp $ */
/*-
@@ -76,6 +76,6 @@ do {\
} while (0)
#define WCIO_INIT(fp) \
- memset(WCIO_GET(fp), 0, sizeof(struct wchar_io_data))
+ memset(&(_EXT(fp)->_wcio), 0, sizeof(struct wchar_io_data))
#endif /*_WCIO_H_*/