summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc/stdio/asprintf.c6
-rw-r--r--lib/libc/stdio/fscanf.c4
-rw-r--r--lib/libc/stdio/local.h4
-rw-r--r--lib/libc/stdio/printf.c4
-rw-r--r--lib/libc/stdio/puts.c4
-rw-r--r--lib/libc/stdio/scanf.c4
-rw-r--r--lib/libc/stdio/snprintf.c4
-rw-r--r--lib/libc/stdio/sprintf.c4
-rw-r--r--lib/libc/stdio/sscanf.c4
-rw-r--r--lib/libc/stdio/stdio.c4
-rw-r--r--lib/libc/stdio/vfscanf.c4
-rw-r--r--lib/libc/stdio/vprintf.c4
12 files changed, 25 insertions, 25 deletions
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 65b4927a42f..f93d2cd7fad 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asprintf.c,v 1.10 2003/06/17 21:56:24 millert Exp $ */
+/* $OpenBSD: asprintf.c,v 1.11 2005/03/31 18:36:29 pat Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -17,7 +17,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: asprintf.c,v 1.10 2003/06/17 21:56:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: asprintf.c,v 1.11 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -26,7 +26,7 @@ static char rcsid[] = "$OpenBSD: asprintf.c,v 1.10 2003/06/17 21:56:24 millert E
#include <stdarg.h>
int
-asprintf(char **str, char const *fmt, ...)
+asprintf(char **str, const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index c56c54ae928..2094d0a769b 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -31,14 +31,14 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fscanf.c,v 1.6 2003/06/02 20:18:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: fscanf.c,v 1.7 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
#include <stdarg.h>
int
-fscanf(FILE *fp, char const *fmt, ...)
+fscanf(FILE *fp, const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 1183eed3f60..085cad26234 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: local.h,v 1.8 2005/03/30 18:51:49 pat Exp $ */
+/* $OpenBSD: local.h,v 1.9 2005/03/31 18:36:29 pat Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@ int __sflush(FILE *);
FILE *__sfp(void);
int __srefill(FILE *);
int __sread(void *, char *, int);
-int __swrite(void *, char const *, int);
+int __swrite(void *, const char *, int);
fpos_t __sseek(void *, fpos_t, int);
int __sclose(void *);
void __sinit(void);
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index 60acffa7d5b..69d36fffc3a 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -31,14 +31,14 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: printf.c,v 1.5 2003/06/02 20:18:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.6 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
#include <stdarg.h>
int
-printf(char const *fmt, ...)
+printf(const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index c1e35d628e6..27acf84fab5 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: puts.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
+static char rcsid[] = "$OpenBSD: puts.c,v 1.6 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -42,7 +42,7 @@ static char rcsid[] = "$OpenBSD: puts.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
* Write the given string to stdout, appending a newline.
*/
int
-puts(char const *s)
+puts(const char *s)
{
size_t c = strlen(s);
struct __suio uio;
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 9bf5e9baee4..05393c172c1 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -31,14 +31,14 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: scanf.c,v 1.6 2003/06/02 20:18:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: scanf.c,v 1.7 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
#include <stdarg.h>
int
-scanf(char const *fmt, ...)
+scanf(const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index ab44d6128d9..738232abc30 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: snprintf.c,v 1.9 2004/04/10 19:34:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: snprintf.c,v 1.10 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <limits.h>
@@ -39,7 +39,7 @@ static char rcsid[] = "$OpenBSD: snprintf.c,v 1.9 2004/04/10 19:34:44 millert Ex
#include <stdarg.h>
int
-snprintf(char *str, size_t n, char const *fmt, ...)
+snprintf(char *str, size_t n, const char *fmt, ...)
{
va_list ap;
int ret;
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index c7f2da2d970..68e8f54896c 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sprintf.c,v 1.9 2003/07/24 01:15:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sprintf.c,v 1.10 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -45,7 +45,7 @@ __warn_references(sprintf,
#endif
int
-sprintf(char *str, char const *fmt, ...)
+sprintf(char *str, const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index 3115b297d02..b529cb762a6 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sscanf.c,v 1.7 2004/09/28 18:12:44 otto Exp $";
+static char rcsid[] = "$OpenBSD: sscanf.c,v 1.8 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -48,7 +48,7 @@ eofread(void *cookie, char *buf, int len)
}
int
-sscanf(const char *str, char const *fmt, ...)
+sscanf(const char *str, const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 0b8dea835a0..2b3a25d6312 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: stdio.c,v 1.7 2005/03/30 19:59:03 pat Exp $";
+static char rcsid[] = "$OpenBSD: stdio.c,v 1.8 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <fcntl.h>
@@ -59,7 +59,7 @@ __sread(void *cookie, char *buf, int n)
}
int
-__swrite(void *cookie, char const *buf, int n)
+__swrite(void *cookie, const char *buf, int n)
{
FILE *fp = cookie;
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 2bf5161a989..27e8b575bca 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.10 2004/09/28 18:12:44 otto Exp $";
+static char rcsid[] = "$OpenBSD: vfscanf.c,v 1.11 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
@@ -89,7 +89,7 @@ static u_char *__sccl(char *, u_char *);
* vfscanf
*/
int
-__svfscanf(FILE *fp, char const *fmt0, _BSD_VA_LIST_ ap)
+__svfscanf(FILE *fp, const char *fmt0, _BSD_VA_LIST_ ap)
{
u_char *fmt = (u_char *)fmt0;
int c; /* character from format, or conversion */
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index e72af0fd2ab..304f5352672 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -31,13 +31,13 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vprintf.c,v 1.5 2004/09/28 18:12:44 otto Exp $";
+static char rcsid[] = "$OpenBSD: vprintf.c,v 1.6 2005/03/31 18:36:29 pat Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
int
-vprintf(char const *fmt, _BSD_VA_LIST_ ap)
+vprintf(const char *fmt, _BSD_VA_LIST_ ap)
{
return (vfprintf(stdout, fmt, ap));
}