summaryrefslogtreecommitdiff
path: root/lib/libc/gen
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/gen')
-rw-r--r--lib/libc/gen/disklabel.c4
-rw-r--r--lib/libc/gen/fnmatch.c6
-rw-r--r--lib/libc/gen/fstab.c6
-rw-r--r--lib/libc/gen/fts.c26
-rw-r--r--lib/libc/gen/getcap.c8
-rw-r--r--lib/libc/gen/getgrent.c8
-rw-r--r--lib/libc/gen/getlogin.c6
-rw-r--r--lib/libc/gen/getnetgrent.c12
-rw-r--r--lib/libc/gen/getpwent.c18
-rw-r--r--lib/libc/gen/getttyent.c6
-rw-r--r--lib/libc/gen/getusershell.c4
-rw-r--r--lib/libc/gen/glob.c32
-rw-r--r--lib/libc/gen/login_cap.c10
-rw-r--r--lib/libc/gen/nlist.c4
-rw-r--r--lib/libc/gen/psignal.c4
-rw-r--r--lib/libc/gen/rewinddir.c4
-rw-r--r--lib/libc/gen/scandir.c6
-rw-r--r--lib/libc/gen/seekdir.c4
-rw-r--r--lib/libc/gen/setmode.c10
-rw-r--r--lib/libc/gen/sysctl.c4
-rw-r--r--lib/libc/gen/syslog.c10
-rw-r--r--lib/libc/gen/ttyname.c6
22 files changed, 99 insertions, 99 deletions
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 4ceabf90cf5..f6c8fce726c 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.5 2000/07/19 15:25:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.6 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: disklabel.c,v 1.5 2000/07/19 15:25:13 deraadt E
#include <string.h>
#include <unistd.h>
-static int gettype __P((char *, char **));
+static int gettype(char *, char **);
struct disklabel *
getdiskbyname(name)
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index 3424488af79..53bf7965a37 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $ */
+/* $OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp
#define RANGE_NOMATCH 0
#define RANGE_ERROR (-1)
-static int rangematch __P((const char *, char, int, char **));
+static int rangematch(const char *, char, int, char **);
int
fnmatch(pattern, string, flags)
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 4ed7d62cfb5..431018414fb 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fstab.c,v 1.9 2001/06/27 00:58:54 lebel Exp $";
+static char rcsid[] = "$OpenBSD: fstab.c,v 1.10 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: fstab.c,v 1.9 2001/06/27 00:58:54 lebel Exp $";
static FILE *_fs_fp;
static struct fstab _fs_fstab;
-static void error __P((int));
-static int fstabscan __P((void));
+static void error(int);
+static int fstabscan(void);
static int
fstabscan()
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 60409450cfd..90828ba3b19 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $ */
+/* $OpenBSD: fts.c,v 1.30 2002/02/16 21:27:22 millert Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-static char rcsid[] = "$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: fts.c,v 1.30 2002/02/16 21:27:22 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -52,16 +52,16 @@ static char rcsid[] = "$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $"
#include <string.h>
#include <unistd.h>
-static FTSENT *fts_alloc __P((FTS *, char *, size_t));
-static FTSENT *fts_build __P((FTS *, int));
-static void fts_lfree __P((FTSENT *));
-static void fts_load __P((FTS *, FTSENT *));
-static size_t fts_maxarglen __P((char * const *));
-static void fts_padjust __P((FTS *, FTSENT *));
-static int fts_palloc __P((FTS *, size_t));
-static FTSENT *fts_sort __P((FTS *, FTSENT *, int));
-static u_short fts_stat __P((FTS *, FTSENT *, int));
-static int fts_safe_changedir __P((FTS *, FTSENT *, int, char *));
+static FTSENT *fts_alloc(FTS *, char *, size_t);
+static FTSENT *fts_build(FTS *, int);
+static void fts_lfree(FTSENT *);
+static void fts_load(FTS *, FTSENT *);
+static size_t fts_maxarglen(char * const *);
+static void fts_padjust(FTS *, FTSENT *);
+static int fts_palloc(FTS *, size_t);
+static FTSENT *fts_sort(FTS *, FTSENT *, int);
+static u_short fts_stat(FTS *, FTSENT *, int);
+static int fts_safe_changedir(FTS *, FTSENT *, int, char *);
#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
@@ -80,7 +80,7 @@ FTS *
fts_open(argv, options, compar)
char * const *argv;
int options;
- int (*compar) __P((const FTSENT **, const FTSENT **));
+ int (*compar)(const FTSENT **, const FTSENT **);
{
FTS *sp;
FTSENT *p, *root;
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index e4339cebe04..c7ad4b37f79 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -35,7 +35,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: getcap.c,v 1.19 2001/09/22 18:36:40 millert Exp $";
+static const char rcsid[] = "$OpenBSD: getcap.c,v 1.20 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -64,9 +64,9 @@ static size_t topreclen; /* toprec length */
static char *toprec; /* Additional record specified by cgetset() */
static int gottoprec; /* Flag indicating retrieval of toprecord */
-static int cdbget __P((DB *, char **, const char *));
-static int getent __P((char **, u_int *, char **, int, const char *, int, char *));
-static int nfcmp __P((const char *, char *));
+static int cdbget(DB *, char **, const char *);
+static int getent(char **, u_int *, char **, int, const char *, int, char *);
+static int nfcmp(const char *, char *);
static int usedb = 1;
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 0b2e1b3e8cc..28c5024b5e8 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -33,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrent.c,v 1.14 2001/09/11 04:52:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: getgrent.c,v 1.15 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -67,9 +67,9 @@ _THREAD_PRIVATE_MUTEX(gr);
static FILE *_gr_fp;
static struct group _gr_group;
static int _gr_stayopen;
-static int grscan __P((int, gid_t, const char *, struct group *, struct group_storage *));
-static int start_gr __P((void));
-static void endgrent_basic __P((void));
+static int grscan(int, gid_t, const char *, struct group *, struct group_storage *);
+static int start_gr(void);
+static void endgrent_basic(void);
static struct group *getgrnam_gs(const char *, struct group *,
struct group_storage *);
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index e8094863ec3..ae9e11bc0cf 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getlogin.c,v 1.6 2002/01/23 21:02:41 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: getlogin.c,v 1.7 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -48,8 +48,8 @@ _THREAD_PRIVATE_MUTEX(logname);
static int logname_valid = 0;
static char logname[MAXLOGNAME + 1];
-int _getlogin __P((char *, size_t));
-int _setlogin __P((const char *));
+int _getlogin(char *, size_t);
+int _setlogin(const char *);
char *
getlogin()
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 8af519a8fc9..a4976fc0b05 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getnetgrent.c,v 1.10 2000/12/09 23:04:16 deraadt Exp $ */
+/* $OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.10 2000/12/09 23:04:16 deraadt Exp $";
+static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -68,10 +68,10 @@ struct stringlist {
size_t sl_cur;
};
-static int getstring __P((char **, int, char **));
-static struct netgroup *getnetgroup __P((char **));
-static int lookup __P((const char *, char *, char **, int));
-static void addgroup __P((char *, struct stringlist *, char *));
+static int getstring(char **, int, char **);
+static struct netgroup *getnetgroup(char **);
+static int lookup(const char *, char *, char **, int);
+static void addgroup(char *, struct stringlist *, char *);
static int in_check __P((const char *, const char *,
const char *, struct netgroup *));
static int in_find __P((char *, struct stringlist *,
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index baf37a57a86..aa071665213 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -33,7 +33,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpwent.c,v 1.22 2001/07/10 16:46:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getpwent.c,v 1.23 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -61,8 +61,8 @@ static DB *_pw_db; /* password database */
static int _pw_keynum; /* key counter */
static int _pw_stayopen; /* keep fd's open */
static int _pw_flags; /* password flags */
-static int __hashpw __P((DBT *));
-static int __initdb __P((void));
+static int __hashpw(DBT *);
+static int __initdb(void);
#ifdef YP
enum _ypmode { YPMODE_NONE, YPMODE_FULL, YPMODE_USER, YPMODE_NETGRP };
@@ -76,13 +76,13 @@ static char __ypline[1024];
static long __yppbuf[1024 / sizeof(long)];
static int __yp_override_passwd = 0;
-static int __has_yppw __P((void));
-static int __has_ypmaster __P((void));
+static int __has_yppw(void);
+static int __has_ypmaster(void);
-static int __ypexclude_add __P((const char *));
-static int __ypexclude_is __P((const char *));
-static void __ypexclude_free __P((void));
-static void __ypproto_set __P((void));
+static int __ypexclude_add(const char *);
+static int __ypexclude_is(const char *);
+static void __ypexclude_free(void);
+static void __ypproto_set(void);
/* macro for deciding which YP maps to use. */
#define PASSWD_BYNAME \
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 6638849d460..27a397d1cd9 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getttyent.c,v 1.4 1997/07/09 00:28:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: getttyent.c,v 1.5 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <ttyent.h>
@@ -43,8 +43,8 @@ static char rcsid[] = "$OpenBSD: getttyent.c,v 1.4 1997/07/09 00:28:22 millert E
static char zapchar;
static FILE *tf;
-static char *skip __P((char *));
-static char *value __P((char *));
+static char *skip(char *);
+static char *value(char *);
struct ttyent *
getttynam(tty)
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index b3fe0ed0b57..d987a7da9a8 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getusershell.c,v 1.3 2002/02/16 21:27:22 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo
static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
static char **curshell, **shells, *strings;
-static char **initshells __P((void));
+static char **initshells(void);
/*
* Get a list of shells from _PATH_SHELLS, if it exists.
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 83d3754cda8..3048ee8318f 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.17 2002/02/16 21:27:22 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -130,32 +130,32 @@ typedef char Char;
#define ismeta(c) (((c)&M_QUOTE) != 0)
-static int compare __P((const void *, const void *));
-static int g_Ctoc __P((const Char *, char *, u_int));
-static int g_lstat __P((Char *, struct stat *, glob_t *));
-static DIR *g_opendir __P((Char *, glob_t *));
-static Char *g_strchr __P((Char *, int));
-static int g_stat __P((Char *, struct stat *, glob_t *));
-static int glob0 __P((const Char *, glob_t *));
-static int glob1 __P((Char *, Char *, glob_t *, size_t *));
+static int compare(const void *, const void *);
+static int g_Ctoc(const Char *, char *, u_int);
+static int g_lstat(Char *, struct stat *, glob_t *);
+static DIR *g_opendir(Char *, glob_t *);
+static Char *g_strchr(Char *, int);
+static int g_stat(Char *, struct stat *, glob_t *);
+static int glob0(const Char *, glob_t *);
+static int glob1(Char *, Char *, glob_t *, size_t *);
static int glob2 __P((Char *, Char *, Char *, Char *, Char *, Char *,
glob_t *, size_t *));
static int glob3 __P((Char *, Char *, Char *, Char *, Char *, Char *,
Char *, Char *, glob_t *, size_t *));
-static int globextend __P((const Char *, glob_t *, size_t *));
+static int globextend(const Char *, glob_t *, size_t *);
static const Char *
- globtilde __P((const Char *, Char *, size_t, glob_t *));
-static int globexp1 __P((const Char *, glob_t *));
-static int globexp2 __P((const Char *, const Char *, glob_t *, int *));
-static int match __P((Char *, Char *, Char *));
+ globtilde(const Char *, Char *, size_t, glob_t *);
+static int globexp1(const Char *, glob_t *);
+static int globexp2(const Char *, const Char *, glob_t *, int *);
+static int match(Char *, Char *, Char *);
#ifdef DEBUG
-static void qprintf __P((const char *, Char *));
+static void qprintf(const char *, Char *);
#endif
int
glob(pattern, flags, errfunc, pglob)
const char *pattern;
- int flags, (*errfunc) __P((const char *, int));
+ int flags, (*errfunc)(const char *, int);
glob_t *pglob;
{
const u_char *patnext;
diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index d4da2b573cc..4ac866e3102 100644
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_cap.c,v 1.9 2002/01/29 08:08:57 mpech Exp $ */
+/* $OpenBSD: login_cap.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */
/*-
* Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -53,10 +53,10 @@
static char *_authtypes[] = { LOGIN_DEFSTYLE, 0 };
-static int setuserpath __P((login_cap_t *, char *));
-static u_quad_t multiply __P((u_quad_t, u_quad_t));
-static u_quad_t strtolimit __P((char *, char **, int));
-static u_quad_t strtosize __P((char *, char **, int));
+static int setuserpath(login_cap_t *, char *);
+static u_quad_t multiply(u_quad_t, u_quad_t);
+static u_quad_t strtolimit(char *, char **, int);
+static u_quad_t strtosize(char *, char **, int);
login_cap_t *
login_getclass(class)
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index bad454b25c6..f0d8b992ea2 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.40 2001/07/09 06:57:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: nlist.c,v 1.41 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -485,7 +485,7 @@ elf_done:
static struct nlist_handlers {
- int (*fn) __P((int fd, struct nlist *list));
+ int (*fn)(int fd, struct nlist *list);
} nlist_fn[] = {
#ifdef _NLIST_DO_AOUT
{ __aout_fdnlist },
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index c248a4a3251..75a87161b48 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: psignal.c,v 1.3 1999/09/16 19:06:00 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: psignal.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: psignal.c,v 1.3 1999/09/16 19:06:00 deraadt Exp
#include <unistd.h>
#include <limits.h>
-extern char *__strsignal __P((int , char *));
+extern char *__strsignal(int , char *);
void
psignal(sig, s)
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index b863e719078..9f3d3d2e7d0 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -32,13 +32,13 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.3 1997/07/09 00:28:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <dirent.h>
-void __seekdir __P((DIR *, long));
+void __seekdir(DIR *, long);
void
rewinddir(dirp)
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index d4c2281a438..10ab99dd52c 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: scandir.c,v 1.4 1998/08/14 21:39:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: scandir.c,v 1.5 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -63,8 +63,8 @@ int
scandir(dirname, namelist, select, dcomp)
const char *dirname;
struct dirent ***namelist;
- int (*select) __P((struct dirent *));
- int (*dcomp) __P((const void *, const void *));
+ int (*select)(struct dirent *);
+ int (*dcomp)(const void *, const void *);
{
register struct dirent *d, *p, **names;
register size_t nitems;
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index a2049ee8a9d..cead0047897 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -32,13 +32,13 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: seekdir.c,v 1.3 1997/09/22 05:09:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: seekdir.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
#include <dirent.h>
-void __seekdir __P((DIR *, long));
+void __seekdir(DIR *, long);
/*
* Seek to an entry in a directory.
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index c33521496f7..228a046560d 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setmode.c,v 1.9 1998/11/18 23:28:34 deraadt Exp $ */
+/* $OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */
/* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */
/*
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
#else
-static char rcsid[] = "$OpenBSD: setmode.c,v 1.9 1998/11/18 23:28:34 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -73,10 +73,10 @@ typedef struct bitcmd {
#define CMD2_OBITS 0x08
#define CMD2_UBITS 0x10
-static BITCMD *addcmd __P((BITCMD *, int, int, int, u_int));
-static void compress_mode __P((BITCMD *));
+static BITCMD *addcmd(BITCMD *, int, int, int, u_int);
+static void compress_mode(BITCMD *);
#ifdef SETMODE_DEBUG
-static void dumpmode __P((BITCMD *));
+static void dumpmode(BITCMD *);
#endif
/*
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 02fbf85befa..fc59f586613 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sysctl.c,v 1.3 1997/08/24 21:25:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: sysctl.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -45,7 +45,7 @@ static char rcsid[] = "$OpenBSD: sysctl.c,v 1.3 1997/08/24 21:25:46 millert Exp
#include <string.h>
#include <unistd.h>
-int __sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+int __sysctl(int *, u_int, void *, size_t *, void *, size_t);
int
sysctl(name, namelen, oldp, oldlenp, newp, newlen)
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 3ad279804fa..cb646e29785 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: syslog.c,v 1.13 2001/10/31 14:24:11 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: syslog.c,v 1.14 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -60,10 +60,10 @@ static struct syslog_data sdata = SYSLOG_DATA_INIT;
extern char *__progname; /* Program name, from crt0. */
-static void disconnectlog __P((void)); /* disconnect from syslogd */
-static void connectlog __P((void)); /* (re)connect to syslogd */
-static void disconnectlog_r __P((struct syslog_data *));
-static void connectlog_r __P((struct syslog_data *));
+static void disconnectlog(void); /* disconnect from syslogd */
+static void connectlog(void); /* (re)connect to syslogd */
+static void disconnectlog_r(struct syslog_data *);
+static void connectlog_r(struct syslog_data *);
/*
* syslog, vsyslog --
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 0a1a9208585..5d0fb5759a4 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -32,7 +32,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ttyname.c,v 1.7 2000/01/06 08:24:16 d Exp $";
+static char rcsid[] = "$OpenBSD: ttyname.c,v 1.8 2002/02/16 21:27:23 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -49,8 +49,8 @@ static char rcsid[] = "$OpenBSD: ttyname.c,v 1.7 2000/01/06 08:24:16 d Exp $";
#include "thread_private.h"
static char buf[TTY_NAME_MAX];
-static int oldttyname __P((int, struct stat *, char *, size_t));
-static int __ttyname_r_basic __P((int, char *, size_t));
+static int oldttyname(int, struct stat *, char *, size_t);
+static int __ttyname_r_basic(int, char *, size_t);
int
ttyname_r(int fd, char *buf, size_t buflen)