9 files changed, 23 insertions, 43 deletions
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index 93d708bb434..2af3897fc99 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: localeconv.c,v 1.3 1997/07/23 21:14:40 kstailey Exp $";
+static char *rcsid = "$OpenBSD: localeconv.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/localedef.h>
@@ -26,7 +26,7 @@ int __nlocale_changed = 1;
  * Return the current locale conversion.
  */
 struct lconv *
-localeconv()
+localeconv(void)
 {
     static struct lconv ret;
 
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
index 42e31f37704..f4458a3e583 100644
--- a/lib/libc/locale/nl_langinfo.c
+++ b/lib/libc/locale/nl_langinfo.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: nl_langinfo.c,v 1.3 1997/07/23 21:14:41 kstailey Exp $";
+static char *rcsid = "$OpenBSD: nl_langinfo.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/localedef.h>
@@ -13,8 +13,7 @@ static char *rcsid = "$OpenBSD: nl_langinfo.c,v 1.3 1997/07/23 21:14:41 kstailey
 #include <langinfo.h>
 
 char *
-nl_langinfo(item)
-	nl_item item;
+nl_langinfo(nl_item item)
 {
 	const char *s;
 
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 14ccbd4966a..87ae45c081e 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setlocale.c,v 1.11 2003/06/02 20:18:35 millert Exp $	*/
+/*	$OpenBSD: setlocale.c,v 1.12 2005/03/23 21:13:28 otto Exp $	*/
 /*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setlocale.c,v 1.11 2003/06/02 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: setlocale.c,v 1.12 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/localedef.h>
@@ -83,9 +83,7 @@ static char	*loadlocale(int);
 static const char *__get_locale_env __P((int));
 
 char *
-setlocale(category, locale)
-	int category;
-	const char *locale;
+setlocale(int category, const char *locale)
 {
 	int i, loadlocale_success;
 	size_t len;
@@ -180,7 +178,7 @@ setlocale(category, locale)
 }
 
 static char *
-currentlocale()
+currentlocale(void)
 {
 	int i;
 
@@ -200,8 +198,7 @@ currentlocale()
 }
 
 static char *
-loadlocale(category)
-	int category;
+loadlocale(int category)
 {
 	char name[PATH_MAX];
 
@@ -245,8 +242,7 @@ loadlocale(category)
 }
 
 static const char *
-__get_locale_env(category)
-	int category;
+__get_locale_env(int category)
 {
 	const char *env;
 
diff --git a/lib/libc/nls/_catclose.c b/lib/libc/nls/_catclose.c
index 4fab66e00b1..8e847cf21e5 100644
--- a/lib/libc/nls/_catclose.c
+++ b/lib/libc/nls/_catclose.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catclose.c,v 1.3 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: _catclose.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -18,8 +18,7 @@ __indr_reference(_catclose,catclose);
 extern int _catclose(nl_catd);
 
 int
-catclose(catd)
-	nl_catd catd;
+catclose(nl_catd catd)
 {
 	return _catclose(catd);
 }
diff --git a/lib/libc/nls/_catgets.c b/lib/libc/nls/_catgets.c
index c9bd9a5a347..c342871a60a 100644
--- a/lib/libc/nls/_catgets.c
+++ b/lib/libc/nls/_catgets.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catgets.c,v 1.3 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: _catgets.c,v 1.4 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -18,11 +18,7 @@ __indr_reference(_catgets,catgets);
 extern char * _catgets(nl_catd, int, int, const char *);
 
 char *
-catgets(catd, set_id, msg_id, s)
-	nl_catd catd;
-	int set_id;
-	int msg_id;
-	const char *s;
+catgets(nl_catd catd, int set_id, int msg_id, const char *s)
 {
 	return _catgets(catd, set_id, msg_id, s);
 }
diff --git a/lib/libc/nls/_catopen.c b/lib/libc/nls/_catopen.c
index a9dc798ddce..c0f000bef0e 100644
--- a/lib/libc/nls/_catopen.c
+++ b/lib/libc/nls/_catopen.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catopen.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: _catopen.c,v 1.5 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -18,9 +18,7 @@ __indr_reference(_catopen,catopen);
 extern nl_catd _catopen(const char *, int);
 
 nl_catd
-catopen(name, oflag)
-	const char *name;
-	int oflag;
+catopen(const char *name, int oflag)
 {
 	return _catopen(name, oflag);
 }
diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
index f9fcde982d4..3cc8b9457a4 100644
--- a/lib/libc/nls/catclose.c
+++ b/lib/libc/nls/catclose.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catclose.c,v 1.4 1997/07/09 01:08:57 millert Exp $";
+static char rcsid[] = "$OpenBSD: catclose.c,v 1.5 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #define _NLS_PRIVATE
@@ -47,8 +47,7 @@ static char rcsid[] = "$OpenBSD: catclose.c,v 1.4 1997/07/09 01:08:57 millert Ex
 #include <stdlib.h>
 
 int
-_catclose(catd)
-	nl_catd catd;
+_catclose(nl_catd catd)
 {
 	if (catd == (nl_catd) -1) {
 		errno = EBADF;
diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c
index 1763a782e10..54faf6af253 100644
--- a/lib/libc/nls/catgets.c
+++ b/lib/libc/nls/catgets.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catgets.c,v 1.5 1996/09/15 09:31:22 tholo Exp $";
+static char rcsid[] = "$OpenBSD: catgets.c,v 1.6 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #define _NLS_PRIVATE
@@ -46,11 +46,7 @@ static char rcsid[] = "$OpenBSD: catgets.c,v 1.5 1996/09/15 09:31:22 tholo Exp $
 #include <nl_types.h>
 
 char *
-_catgets(catd, set_id, msg_id, s)
-	nl_catd catd;
-	int set_id;
-	int msg_id;
-	const char *s;
+_catgets(nl_catd catd, int set_id, int msg_id, const char *s)
 {
 	struct _nls_cat_hdr *cat_hdr;
 	struct _nls_set_hdr *set_hdr;
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
index 53b1cec706b..bf316a26841 100644
--- a/lib/libc/nls/catopen.c
+++ b/lib/libc/nls/catopen.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catopen.c,v 1.10 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: catopen.c,v 1.11 2005/03/23 21:13:28 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #define _NLS_PRIVATE
@@ -58,9 +58,7 @@ static nl_catd load_msgcat(const char *);
 
 /* ARGSUSED */
 nl_catd
-_catopen(name, oflag)
-	const char *name;
-	int oflag;
+_catopen(const char *name, int oflag)
 {
 	char tmppath[PATH_MAX];
 	char *nlspath;
@@ -126,8 +124,7 @@ _catopen(name, oflag)
 }
 
 static nl_catd
-load_msgcat(path)
-	const char *path;
+load_msgcat(const char *path)
 {
 	struct stat st;
 	nl_catd catd;