summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-03-21 22:49:10 +0000
committerobrien <obrien@FreeBSD.org>2002-03-21 22:49:10 +0000
commit3b73ce2319e249cf2795cf4b0d0c624134f01e77 (patch)
tree8e16a65843d0b07cf60b7fb748e2ac4890d6f1fd /lib
parent5da7065f3d4fe05102865926b09192cffa03a251 (diff)
downloadFreeBSD-src-3b73ce2319e249cf2795cf4b0d0c624134f01e77.zip
FreeBSD-src-3b73ce2319e249cf2795cf4b0d0c624134f01e77.tar.gz
Remove __P() usage.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/db/btree/bt_close.c2
-rw-r--r--lib/libc/db/btree/bt_conv.c4
-rw-r--r--lib/libc/db/btree/bt_delete.c12
-rw-r--r--lib/libc/db/btree/bt_open.c6
-rw-r--r--lib/libc/db/btree/bt_put.c4
-rw-r--r--lib/libc/db/btree/bt_search.c6
-rw-r--r--lib/libc/db/btree/bt_seq.c8
-rw-r--r--lib/libc/db/btree/bt_split.c16
-rw-r--r--lib/libc/db/btree/btree.h9
-rw-r--r--lib/libc/db/btree/extern.h55
-rw-r--r--lib/libc/db/hash/extern.h45
-rw-r--r--lib/libc/db/hash/hash.c32
-rw-r--r--lib/libc/db/hash/hash.h2
-rw-r--r--lib/libc/db/hash/hash_bigkey.c4
-rw-r--r--lib/libc/db/hash/hash_buf.c2
-rw-r--r--lib/libc/db/hash/hash_func.c8
-rw-r--r--lib/libc/db/hash/hash_page.c14
-rw-r--r--lib/libc/db/mpool/mpool.c10
-rw-r--r--lib/libc/db/recno/extern.h35
-rw-r--r--lib/libc/db/recno/rec_delete.c4
-rw-r--r--lib/libc/db/test/btree.tests/main.c50
-rw-r--r--lib/libc/db/test/dbtest.c30
-rw-r--r--lib/libc/gen/pw_scan.h2
-rw-r--r--lib/libc/include/spinlock.h6
-rw-r--r--lib/libc/locale/big5.c4
-rw-r--r--lib/libc/locale/collate.h12
-rw-r--r--lib/libc/locale/euc.c4
-rw-r--r--lib/libc/locale/mskanji.c4
-rw-r--r--lib/libc/locale/none.c4
-rw-r--r--lib/libc/locale/setlocale.c4
-rw-r--r--lib/libc/locale/setrunelocale.c12
-rw-r--r--lib/libc/locale/table.c6
-rw-r--r--lib/libc/locale/utf2.c4
-rw-r--r--lib/libc/net/getaddrinfo.c36
-rw-r--r--lib/libc/net/gethostbydns.c4
-rw-r--r--lib/libc/net/getnameinfo.c2
-rw-r--r--lib/libc/net/getservent.c2
-rw-r--r--lib/libc/net/hesiod.c8
-rw-r--r--lib/libc/net/inet_pton.c4
-rw-r--r--lib/libc/net/name6.c2
-rw-r--r--lib/libc/net/nsdispatch.c4
-rw-r--r--lib/libc/net/nsparser.y2
-rw-r--r--lib/libc/net/rcmd.c4
-rw-r--r--lib/libc/net/res_init.c4
-rw-r--r--lib/libc/net/res_send.c6
-rw-r--r--lib/libc/quad/quad.h10
-rw-r--r--lib/libc/regex/engine.c18
-rwxr-xr-xlib/libc/regex/grot/mkh2
-rw-r--r--lib/libc/regex/regcomp.c86
-rw-r--r--lib/libc/regex/regerror.c2
-rw-r--r--lib/libc/rpc/clnt_bcast.c6
-rw-r--r--lib/libc/rpc/clnt_dg.c16
-rw-r--r--lib/libc/rpc/clnt_perror.c4
-rw-r--r--lib/libc/rpc/clnt_raw.c12
-rw-r--r--lib/libc/rpc/clnt_simple.c2
-rw-r--r--lib/libc/rpc/clnt_vc.c18
-rw-r--r--lib/libc/rpc/des_crypt.c4
-rw-r--r--lib/libc/rpc/getnetconfig.c6
-rw-r--r--lib/libc/rpc/getnetpath.c2
-rw-r--r--lib/libc/rpc/getrpcent.c4
-rw-r--r--lib/libc/rpc/key_call.c2
-rw-r--r--lib/libc/rpc/netnamer.c4
-rw-r--r--lib/libc/rpc/rpc_com.h28
-rw-r--r--lib/libc/rpc/rpc_dtablesize.c2
-rw-r--r--lib/libc/rpc/rpc_generic.c4
-rw-r--r--lib/libc/rpc/rpc_prot.c4
-rw-r--r--lib/libc/rpc/rpc_soc.c6
-rw-r--r--lib/libc/rpc/rpcb_clnt.c8
-rw-r--r--lib/libc/rpc/rtime.c4
-rw-r--r--lib/libc/rpc/svc.c6
-rw-r--r--lib/libc/rpc/svc_auth.c4
-rw-r--r--lib/libc/rpc/svc_dg.c22
-rw-r--r--lib/libc/rpc/svc_generic.c6
-rw-r--r--lib/libc/rpc/svc_raw.c16
-rw-r--r--lib/libc/rpc/svc_simple.c6
-rw-r--r--lib/libc/rpc/svc_vc.c28
-rw-r--r--lib/libc/sparc64/fpu/fpu_extern.h44
-rw-r--r--lib/libc/sparc64/fpu/fpu_implode.c4
-rw-r--r--lib/libc/stdio/findfp.c2
-rw-r--r--lib/libc/stdio/fseek.c2
-rw-r--r--lib/libc/stdio/local.h46
-rw-r--r--lib/libc/stdio/mktemp.c4
-rw-r--r--lib/libc/stdio/refill.c2
-rw-r--r--lib/libc/stdio/sscanf.c2
-rw-r--r--lib/libc/stdio/tempnam.c2
-rw-r--r--lib/libc/stdio/tmpnam.c2
-rw-r--r--lib/libc/stdio/ungetc.c2
-rw-r--r--lib/libc/stdio/vfprintf.c12
-rw-r--r--lib/libc/stdio/vsscanf.c2
-rw-r--r--lib/libc/stdlib/bsearch.c2
-rw-r--r--lib/libc/stdlib/getenv.c2
-rw-r--r--lib/libc/stdlib/heapsort.c2
-rw-r--r--lib/libc/stdlib/malloc.c2
-rw-r--r--lib/libc/stdlib/merge.c10
-rw-r--r--lib/libc/stdlib/qsort.c6
-rw-r--r--lib/libc/stdlib/radixsort.c4
-rw-r--r--lib/libc/stdlib/random.c2
-rw-r--r--lib/libc/stdlib/setenv.c2
-rw-r--r--lib/libc/stdlib/tdelete.c2
-rw-r--r--lib/libc/stdlib/tfind.c2
-rw-r--r--lib/libc/stdlib/tsearch.c2
-rw-r--r--lib/libc/stdlib/twalk.c4
-rw-r--r--lib/libc/sys/sigaction.22
-rw-r--r--lib/libc/xdr/xdr_mem.c22
-rw-r--r--lib/libc/xdr/xdr_rec.c36
-rw-r--r--lib/libc/xdr/xdr_stdio.c16
106 files changed, 552 insertions, 532 deletions
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 878c4c4..e8bb11c 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94";
#include <db.h>
#include "btree.h"
-static int bt_meta __P((BTREE *));
+static int bt_meta(BTREE *);
/*
* BT_CLOSE -- Close a btree.
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index 1cb208b1..18f3774 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/param.h>
@@ -45,7 +47,7 @@ static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94";
#include <db.h>
#include "btree.h"
-static void mswap __P((PAGE *));
+static void mswap(PAGE *);
/*
* __BT_BPGIN, __BT_BPGOUT --
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index ece1ab6..13e43df 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
@@ -47,11 +49,11 @@ static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94";
#include <db.h>
#include "btree.h"
-static int __bt_bdelete __P((BTREE *, const DBT *));
-static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int));
-static int __bt_pdelete __P((BTREE *, PAGE *));
-static int __bt_relink __P((BTREE *, PAGE *));
-static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *));
+static int __bt_bdelete(BTREE *, const DBT *);
+static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int);
+static int __bt_pdelete(BTREE *, PAGE *);
+static int __bt_relink(BTREE *, PAGE *);
+static int __bt_stkacq(BTREE *, PAGE **, CURSOR *);
/*
* __bt_delete
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index e2e9a24..20cce2d 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -70,9 +70,9 @@ static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94";
#define MINPSIZE 128
#endif
-static int byteorder __P((void));
-static int nroot __P((BTREE *));
-static int tmp __P((void));
+static int byteorder(void);
+static int nroot(BTREE *);
+static int tmp(void);
/*
* __BT_OPEN -- Open a btree.
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index 952be09..4e1e89b 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
@@ -48,7 +50,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
#include <db.h>
#include "btree.h"
-static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
+static EPG *bt_fast(BTREE *, const DBT *, const DBT *, int *);
/*
* __BT_PUT -- Add a btree item to the tree.
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index 485afcb..4fc39e9 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
@@ -45,8 +47,8 @@ static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94";
#include <db.h>
#include "btree.h"
-static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
-static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *));
+static int __bt_snext(BTREE *, PAGE *, const DBT *, int *);
+static int __bt_sprev(BTREE *, PAGE *, const DBT *, int *);
/*
* __bt_search --
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index 76e6275..8b0dae2 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
@@ -48,9 +50,9 @@ static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94";
#include <db.h>
#include "btree.h"
-static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));
-static int __bt_seqadv __P((BTREE *, EPG *, int));
-static int __bt_seqset __P((BTREE *, EPG *, DBT *, int));
+static int __bt_first(BTREE *, const DBT *, EPG *, int *);
+static int __bt_seqadv(BTREE *, EPG *, int);
+static int __bt_seqset(BTREE *, EPG *, DBT *, int);
/*
* Sequential scan support.
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index c7779b8..1d47ac3 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
@@ -48,16 +50,16 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
#include <db.h>
#include "btree.h"
-static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));
+static int bt_broot(BTREE *, PAGE *, PAGE *, PAGE *);
static PAGE *bt_page
- __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int bt_preserve __P((BTREE *, pgno_t));
+(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int bt_preserve(BTREE *, pgno_t);
static PAGE *bt_psplit
- __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t));
+(BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
static PAGE *bt_root
- __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *));
-static recno_t rec_total __P((PAGE *));
+(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int bt_rroot(BTREE *, PAGE *, PAGE *, PAGE *);
+static recno_t rec_total(PAGE *);
#ifdef STATISTICS
u_long bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 36d35c9..251dd3f 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -36,6 +36,9 @@
* @(#)btree.h 8.11 (Berkeley) 8/17/94
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/* Macros to set/clear/test flags. */
#define F_SET(p, f) (p)->flags |= (f)
#define F_CLR(p, f) (p)->flags &= ~(f)
@@ -335,11 +338,11 @@ typedef struct _btree {
EPGNO bt_last; /* last insert */
/* B: key comparison function */
- int (*bt_cmp) __P((const DBT *, const DBT *));
+ int (*bt_cmp)(const DBT *, const DBT *);
/* B: prefix comparison function */
- size_t (*bt_pfx) __P((const DBT *, const DBT *));
+ size_t (*bt_pfx)(const DBT *, const DBT *);
/* R: recno input function */
- int (*bt_irec) __P((struct _btree *, recno_t));
+ int (*bt_irec)(struct _btree *, recno_t);
FILE *bt_rfp; /* R: record FILE pointer */
int bt_rfd; /* R: record file descriptor */
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index ebd9c54..e9def6d 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -31,40 +31,41 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.10 (Berkeley) 7/20/94
+ * $FreeBSD$
*/
-int __bt_close __P((DB *));
-int __bt_cmp __P((BTREE *, const DBT *, EPG *));
-int __bt_crsrdel __P((BTREE *, EPGNO *));
-int __bt_defcmp __P((const DBT *, const DBT *));
-size_t __bt_defpfx __P((const DBT *, const DBT *));
-int __bt_delete __P((const DB *, const DBT *, u_int));
-int __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int));
-int __bt_fd __P((const DB *));
-int __bt_free __P((BTREE *, PAGE *));
-int __bt_get __P((const DB *, const DBT *, DBT *, u_int));
-PAGE *__bt_new __P((BTREE *, pgno_t *));
-void __bt_pgin __P((void *, pgno_t, void *));
-void __bt_pgout __P((void *, pgno_t, void *));
-int __bt_push __P((BTREE *, pgno_t, int));
-int __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int));
-EPG *__bt_search __P((BTREE *, const DBT *, int *));
-int __bt_seq __P((const DB *, DBT *, DBT *, u_int));
-void __bt_setcur __P((BTREE *, pgno_t, u_int));
+int __bt_close(DB *);
+int __bt_cmp(BTREE *, const DBT *, EPG *);
+int __bt_crsrdel(BTREE *, EPGNO *);
+int __bt_defcmp(const DBT *, const DBT *);
+size_t __bt_defpfx(const DBT *, const DBT *);
+int __bt_delete(const DB *, const DBT *, u_int);
+int __bt_dleaf(BTREE *, const DBT *, PAGE *, u_int);
+int __bt_fd(const DB *);
+int __bt_free(BTREE *, PAGE *);
+int __bt_get(const DB *, const DBT *, DBT *, u_int);
+PAGE *__bt_new(BTREE *, pgno_t *);
+void __bt_pgin(void *, pgno_t, void *);
+void __bt_pgout(void *, pgno_t, void *);
+int __bt_push(BTREE *, pgno_t, int);
+int __bt_put(const DB *dbp, DBT *, const DBT *, u_int);
+int __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
+EPG *__bt_search(BTREE *, const DBT *, int *);
+int __bt_seq(const DB *, DBT *, DBT *, u_int);
+void __bt_setcur(BTREE *, pgno_t, u_int);
int __bt_split __P((BTREE *, PAGE *,
const DBT *, const DBT *, int, size_t, u_int32_t));
-int __bt_sync __P((const DB *, u_int));
+int __bt_sync(const DB *, u_int);
-int __ovfl_delete __P((BTREE *, void *));
-int __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *));
-int __ovfl_put __P((BTREE *, const DBT *, pgno_t *));
+int __ovfl_delete(BTREE *, void *);
+int __ovfl_get(BTREE *, void *, size_t *, void **, size_t *);
+int __ovfl_put(BTREE *, const DBT *, pgno_t *);
#ifdef DEBUG
-void __bt_dnpage __P((DB *, pgno_t));
-void __bt_dpage __P((PAGE *));
-void __bt_dump __P((DB *));
+void __bt_dnpage(DB *, pgno_t);
+void __bt_dpage(PAGE *);
+void __bt_dump(DB *);
#endif
#ifdef STATISTICS
-void __bt_stat __P((DB *));
+void __bt_stat(DB *);
#endif
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index 3167e6d..82bff42 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -31,34 +31,35 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.4 (Berkeley) 6/16/94
+ * $FreeBSD$
*/
-BUFHEAD *__add_ovflpage __P((HTAB *, BUFHEAD *));
-int __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int __big_delete __P((HTAB *, BUFHEAD *));
-int __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int));
-int __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int));
+BUFHEAD *__add_ovflpage(HTAB *, BUFHEAD *);
+int __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int __big_delete(HTAB *, BUFHEAD *);
+int __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
+int __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
int __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
int, u_int32_t, SPLIT_RETURN *));
-int __buf_free __P((HTAB *, int, int));
-void __buf_init __P((HTAB *, int));
-u_int32_t __call_hash __P((HTAB *, char *, int));
-int __delpair __P((HTAB *, BUFHEAD *, int));
-int __expand_table __P((HTAB *));
-int __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int));
-u_int16_t __find_last_page __P((HTAB *, BUFHEAD **));
-void __free_ovflpage __P((HTAB *, BUFHEAD *));
-BUFHEAD *__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int));
-int __get_page __P((HTAB *, char *, u_int32_t, int, int, int));
-int __ibitmap __P((HTAB *, int, int, int));
-u_int32_t __log2 __P((u_int32_t));
-int __put_page __P((HTAB *, char *, u_int32_t, int, int));
-void __reclaim_buf __P((HTAB *, BUFHEAD *));
-int __split_page __P((HTAB *, u_int32_t, u_int32_t));
+int __buf_free(HTAB *, int, int);
+void __buf_init(HTAB *, int);
+u_int32_t __call_hash(HTAB *, char *, int);
+int __delpair(HTAB *, BUFHEAD *, int);
+int __expand_table(HTAB *);
+int __find_bigpair(HTAB *, BUFHEAD *, int, char *, int);
+u_int16_t __find_last_page(HTAB *, BUFHEAD **);
+void __free_ovflpage(HTAB *, BUFHEAD *);
+BUFHEAD *__get_buf(HTAB *, u_int32_t, BUFHEAD *, int);
+int __get_page(HTAB *, char *, u_int32_t, int, int, int);
+int __ibitmap(HTAB *, int, int, int);
+u_int32_t __log2(u_int32_t);
+int __put_page(HTAB *, char *, u_int32_t, int, int);
+void __reclaim_buf(HTAB *, BUFHEAD *);
+int __split_page(HTAB *, u_int32_t, u_int32_t);
/* Default hash routine. */
-extern u_int32_t (*__default_hash) __P((const void *, size_t));
+extern u_int32_t (*__default_hash)(const void *, size_t);
#ifdef HASH_STATISTICS
extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index cb69744..d29d7d0 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -60,23 +60,23 @@ __FBSDID("$FreeBSD$");
#include "page.h"
#include "extern.h"
-static int alloc_segs __P((HTAB *, int));
-static int flush_meta __P((HTAB *));
-static int hash_access __P((HTAB *, ACTION, DBT *, DBT *));
-static int hash_close __P((DB *));
-static int hash_delete __P((const DB *, const DBT *, u_int32_t));
-static int hash_fd __P((const DB *));
-static int hash_get __P((const DB *, const DBT *, DBT *, u_int32_t));
-static int hash_put __P((const DB *, DBT *, const DBT *, u_int32_t));
-static void *hash_realloc __P((SEGMENT **, int, int));
-static int hash_seq __P((const DB *, DBT *, DBT *, u_int32_t));
-static int hash_sync __P((const DB *, u_int32_t));
-static int hdestroy __P((HTAB *));
-static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *));
-static int init_htab __P((HTAB *, int));
+static int alloc_segs(HTAB *, int);
+static int flush_meta(HTAB *);
+static int hash_access(HTAB *, ACTION, DBT *, DBT *);
+static int hash_close(DB *);
+static int hash_delete(const DB *, const DBT *, u_int32_t);
+static int hash_fd(const DB *);
+static int hash_get(const DB *, const DBT *, DBT *, u_int32_t);
+static int hash_put(const DB *, DBT *, const DBT *, u_int32_t);
+static void *hash_realloc(SEGMENT **, int, int);
+static int hash_seq(const DB *, DBT *, DBT *, u_int32_t);
+static int hash_sync(const DB *, u_int32_t);
+static int hdestroy(HTAB *);
+static HTAB *init_hash(HTAB *, const char *, HASHINFO *);
+static int init_htab(HTAB *, int);
#if BYTE_ORDER == LITTLE_ENDIAN
-static void swap_header __P((HTAB *));
-static void swap_header_copy __P((HASHHDR *, HASHHDR *));
+static void swap_header(HTAB *);
+static void swap_header_copy(HASHHDR *, HASHHDR *);
#endif
/* Fast arithmetic, relying on powers of 2, */
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
index 1462a6a..2c0a542 100644
--- a/lib/libc/db/hash/hash.h
+++ b/lib/libc/db/hash/hash.h
@@ -96,7 +96,7 @@ typedef struct htab { /* Memory resident data structure */
int exsegs; /* Number of extra allocated
* segments */
u_int32_t /* Hash function */
- (*hash)__P((const void *, size_t));
+ (*hash)(const void *, size_t);
int flags; /* Flag values */
int fp; /* File pointer */
char *tmp_buf; /* Temporary Buffer for BIG data */
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index f49e77f..3465802 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -74,8 +74,8 @@ __FBSDID("$FreeBSD$");
#include "page.h"
#include "extern.h"
-static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int));
-static int collect_data __P((HTAB *, BUFHEAD *, int, int));
+static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int);
+static int collect_data(HTAB *, BUFHEAD *, int, int);
/*
* Big_insert
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 401b682..1ec6b11 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
#include "page.h"
#include "extern.h"
-static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *));
+static BUFHEAD *newbuf(HTAB *, u_int32_t, BUFHEAD *);
/* Unlink B from its place in the lru */
#define BUF_REMOVE(B) { \
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index d7f84bb..aeb34b2 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
#include "page.h"
#include "extern.h"
-static u_int32_t hash1 __P((const void *, size_t));
-static u_int32_t hash2 __P((const void *, size_t));
-static u_int32_t hash3 __P((const void *, size_t));
-static u_int32_t hash4 __P((const void *, size_t));
+static u_int32_t hash1(const void *, size_t);
+static u_int32_t hash2(const void *, size_t);
+static u_int32_t hash3(const void *, size_t);
+static u_int32_t hash4(const void *, size_t);
/* Global default hash function */
u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index 65358a2..f0739fb 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -76,14 +76,14 @@ __FBSDID("$FreeBSD$");
#include "page.h"
#include "extern.h"
-static u_int32_t *fetch_bitmap __P((HTAB *, int));
-static u_int32_t first_free __P((u_int32_t));
-static int open_temp __P((HTAB *));
-static u_int16_t overflow_page __P((HTAB *));
-static void putpair __P((char *, const DBT *, const DBT *));
-static void squeeze_key __P((u_int16_t *, const DBT *, const DBT *));
+static u_int32_t *fetch_bitmap(HTAB *, int);
+static u_int32_t first_free(u_int32_t);
+static int open_temp(HTAB *);
+static u_int16_t overflow_page(HTAB *);
+static void putpair(char *, const DBT *, const DBT *);
+static void squeeze_key(u_int16_t *, const DBT *, const DBT *);
static int ugly_split
- __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int));
+(HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int);
#define PAGE_INIT(P) { \
((u_int16_t *)(P))[0] = 0; \
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index 303d8c0..63a9947 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -54,9 +54,9 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
#define __MPOOLINTERFACE_PRIVATE
#include <mpool.h>
-static BKT *mpool_bkt __P((MPOOL *));
-static BKT *mpool_look __P((MPOOL *, pgno_t));
-static int mpool_write __P((MPOOL *, BKT *));
+static BKT *mpool_bkt(MPOOL *);
+static BKT *mpool_look(MPOOL *, pgno_t);
+static int mpool_write(MPOOL *, BKT *);
/*
* mpool_open --
@@ -105,8 +105,8 @@ mpool_open(key, fd, pagesize, maxcache)
void
mpool_filter(mp, pgin, pgout, pgcookie)
MPOOL *mp;
- void (*pgin) __P((void *, pgno_t, void *));
- void (*pgout) __P((void *, pgno_t, void *));
+ void (*pgin)(void *, pgno_t, void *);
+ void (*pgout)(void *, pgno_t, void *);
void *pgcookie;
{
mp->pgin = pgin;
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
index feed434..ffa7243 100644
--- a/lib/libc/db/recno/extern.h
+++ b/lib/libc/db/recno/extern.h
@@ -31,24 +31,25 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.3 (Berkeley) 6/4/94
+ * $FreeBSD$
*/
#include "../btree/extern.h"
-int __rec_close __P((DB *));
-int __rec_delete __P((const DB *, const DBT *, u_int));
-int __rec_dleaf __P((BTREE *, PAGE *, u_int32_t));
-int __rec_fd __P((const DB *));
-int __rec_fmap __P((BTREE *, recno_t));
-int __rec_fout __P((BTREE *));
-int __rec_fpipe __P((BTREE *, recno_t));
-int __rec_get __P((const DB *, const DBT *, DBT *, u_int));
-int __rec_iput __P((BTREE *, recno_t, const DBT *, u_int));
-int __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *));
-EPG *__rec_search __P((BTREE *, recno_t, enum SRCHOP));
-int __rec_seq __P((const DB *, DBT *, DBT *, u_int));
-int __rec_sync __P((const DB *, u_int));
-int __rec_vmap __P((BTREE *, recno_t));
-int __rec_vout __P((BTREE *));
-int __rec_vpipe __P((BTREE *, recno_t));
+int __rec_close(DB *);
+int __rec_delete(const DB *, const DBT *, u_int);
+int __rec_dleaf(BTREE *, PAGE *, u_int32_t);
+int __rec_fd(const DB *);
+int __rec_fmap(BTREE *, recno_t);
+int __rec_fout(BTREE *);
+int __rec_fpipe(BTREE *, recno_t);
+int __rec_get(const DB *, const DBT *, DBT *, u_int);
+int __rec_iput(BTREE *, recno_t, const DBT *, u_int);
+int __rec_put(const DB *dbp, DBT *, const DBT *, u_int);
+int __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *);
+EPG *__rec_search(BTREE *, recno_t, enum SRCHOP);
+int __rec_seq(const DB *, DBT *, DBT *, u_int);
+int __rec_sync(const DB *, u_int);
+int __rec_vmap(BTREE *, recno_t);
+int __rec_vout(BTREE *);
+int __rec_vpipe(BTREE *, recno_t);
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index a16593d..9996c2d 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -37,6 +37,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include <sys/types.h>
@@ -47,7 +49,7 @@ static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94";
#include <db.h>
#include "recno.h"
-static int rec_rdelete __P((BTREE *, recno_t));
+static int rec_rdelete(BTREE *, recno_t);
/*
* __REC_DELETE -- Delete the item(s) referenced by a key.
diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c
index 5fd0b27..6308dcb 100644
--- a/lib/libc/db/test/btree.tests/main.c
+++ b/lib/libc/db/test/btree.tests/main.c
@@ -54,37 +54,37 @@ typedef struct cmd_table {
char *cmd;
int nargs;
int rconv;
- void (*func) __P((DB *, char **));
+ void (*func)(DB *, char **);
char *usage, *descrip;
} cmd_table;
int stopstop;
DB *globaldb;
-void append __P((DB *, char **));
-void bstat __P((DB *, char **));
-void cursor __P((DB *, char **));
-void delcur __P((DB *, char **));
-void delete __P((DB *, char **));
-void dump __P((DB *, char **));
-void first __P((DB *, char **));
-void get __P((DB *, char **));
-void help __P((DB *, char **));
-void iafter __P((DB *, char **));
-void ibefore __P((DB *, char **));
-void icursor __P((DB *, char **));
-void insert __P((DB *, char **));
-void keydata __P((DBT *, DBT *));
-void last __P((DB *, char **));
-void list __P((DB *, char **));
-void load __P((DB *, char **));
-void mstat __P((DB *, char **));
-void next __P((DB *, char **));
-int parse __P((char *, char **, int));
-void previous __P((DB *, char **));
-void show __P((DB *, char **));
-void usage __P((void));
-void user __P((DB *));
+void append(DB *, char **);
+void bstat(DB *, char **);
+void cursor(DB *, char **);
+void delcur(DB *, char **);
+void delete(DB *, char **);
+void dump(DB *, char **);
+void first(DB *, char **);
+void get(DB *, char **);
+void help(DB *, char **);
+void iafter(DB *, char **);
+void ibefore(DB *, char **);
+void icursor(DB *, char **);
+void insert(DB *, char **);
+void keydata(DBT *, DBT *);
+void last(DB *, char **);
+void list(DB *, char **);
+void load(DB *, char **);
+void mstat(DB *, char **);
+void next(DB *, char **);
+int parse(char *, char **, int);
+void previous(DB *, char **);
+void show(DB *, char **);
+void usage(void);
+void user(DB *);
cmd_table commands[] = {
"?", 0, 0, help, "help", NULL,
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index 8627572..b403bc1 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -61,22 +61,22 @@ static const char rcsid[] =
enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
-void compare __P((DBT *, DBT *));
-DBTYPE dbtype __P((char *));
-void dump __P((DB *, int));
+void compare(DBT *, DBT *);
+DBTYPE dbtype(char *);
+void dump(DB *, int);
void err __P((const char *, ...)) __printflike(1, 2);
-void get __P((DB *, DBT *));
-void getdata __P((DB *, DBT *, DBT *));
-void put __P((DB *, DBT *, DBT *));
-void rem __P((DB *, DBT *));
-char *sflags __P((int));
-void synk __P((DB *));
-void *rfile __P((char *, size_t *));
-void seq __P((DB *, DBT *));
-u_int setflags __P((char *));
-void *setinfo __P((DBTYPE, char *));
-void usage __P((void));
-void *xmalloc __P((char *, size_t));
+void get(DB *, DBT *);
+void getdata(DB *, DBT *, DBT *);
+void put(DB *, DBT *, DBT *);
+void rem(DB *, DBT *);
+char *sflags(int);
+void synk(DB *);
+void *rfile(char *, size_t *);
+void seq(DB *, DBT *);
+u_int setflags(char *);
+void *setinfo(DBTYPE, char *);
+void usage(void);
+void *xmalloc(char *, size_t);
DBTYPE type; /* Database type. */
void *infop; /* Iflags. */
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
index 3bc6201..954854b 100644
--- a/lib/libc/gen/pw_scan.h
+++ b/lib/libc/gen/pw_scan.h
@@ -38,4 +38,4 @@
#define _PWSCAN_MASTER 0x01
#define _PWSCAN_WARN 0x02
-extern int __pw_scan __P((char *, struct passwd *, int));
+extern int __pw_scan(char *, struct passwd *, int);
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index d81615d..d661ecf 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -63,9 +63,9 @@ typedef struct {
* Thread function prototype definitions:
*/
__BEGIN_DECLS
-long _atomic_lock __P((volatile long *));
-void _spinlock __P((spinlock_t *));
-void _spinlock_debug __P((spinlock_t *, char *, int));
+long _atomic_lock(volatile long *);
+void _spinlock(spinlock_t *);
+void _spinlock_debug(spinlock_t *, char *, int);
__END_DECLS
#endif /* _SPINLOCK_H_ */
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c
index dcbe168..0013e6d 100644
--- a/lib/libc/locale/big5.c
+++ b/lib/libc/locale/big5.c
@@ -46,8 +46,8 @@ static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#include <stdlib.h>
#include <sys/types.h>
-rune_t _BIG5_sgetrune __P((const char *, size_t, char const **));
-int _BIG5_sputrune __P((rune_t, char *, size_t, char **));
+rune_t _BIG5_sgetrune(const char *, size_t, char const **);
+int _BIG5_sputrune(rune_t, char *, size_t, char **);
int
_BIG5_init(rl)
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 05aeee9..d8dd045 100644
--- a/lib/libc/locale/collate.h
+++ b/lib/libc/locale/collate.h
@@ -54,13 +54,13 @@ extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE];
__BEGIN_DECLS
-u_char *__collate_strdup __P((u_char *));
-u_char *__collate_substitute __P((const u_char *));
-int __collate_load_tables __P((char *));
-void __collate_lookup __P((const u_char *, int *, int *, int *));
-int __collate_range_cmp __P((int, int));
+u_char *__collate_strdup(u_char *);
+u_char *__collate_substitute(const u_char *);
+int __collate_load_tables(char *);
+void __collate_lookup(const u_char *, int *, int *, int *);
+int __collate_range_cmp(int, int);
#ifdef COLLATE_DEBUG
-void __collate_print_tables __P((void));
+void __collate_print_tables(void);
#endif
__END_DECLS
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
index 3c81012..e9ac0db 100644
--- a/lib/libc/locale/euc.c
+++ b/lib/libc/locale/euc.c
@@ -49,8 +49,8 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93";
#include <stdlib.h>
#include <string.h>
-rune_t _EUC_sgetrune __P((const char *, size_t, char const **));
-int _EUC_sputrune __P((rune_t, char *, size_t, char **));
+rune_t _EUC_sgetrune(const char *, size_t, char const **);
+int _EUC_sputrune(rune_t, char *, size_t, char **);
typedef struct {
int count[4];
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
index 0b6ced8..0a41d18 100644
--- a/lib/libc/locale/mskanji.c
+++ b/lib/libc/locale/mskanji.c
@@ -44,8 +44,8 @@ static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
#include <stdio.h>
#include <stdlib.h>
-rune_t _MSKanji_sgetrune __P((const char *, size_t, char const **));
-int _MSKanji_sputrune __P((rune_t, char *, size_t, char **));
+rune_t _MSKanji_sgetrune(const char *, size_t, char const **);
+int _MSKanji_sputrune(rune_t, char *, size_t, char **);
int
_MSKanji_init(rl)
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
index ff736ff..9eb178f 100644
--- a/lib/libc/locale/none.c
+++ b/lib/libc/locale/none.c
@@ -45,8 +45,8 @@ static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93";
#include <rune.h>
#include <stdlib.h>
-rune_t _none_sgetrune __P((const char *, size_t, char const **));
-int _none_sputrune __P((rune_t, char *, size_t, char **));
+rune_t _none_sgetrune(const char *, size_t, char const **);
+int _none_sputrune(rune_t, char *, size_t, char **);
int
_none_init(rl)
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index b4c520a..16211f5 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -93,8 +93,8 @@ static char saved_categories[_LC_LAST][ENCODING_LEN + 1];
static char current_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)];
-static char *currentlocale __P((void));
-static char *loadlocale __P((int));
+static char *currentlocale(void);
+static char *loadlocale(int);
char *
setlocale(category, locale)
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index 55d6ba9..f9b4bf6 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -45,12 +45,12 @@
#include <unistd.h>
#include "setlocale.h"
-extern int _none_init __P((_RuneLocale *));
-extern int _UTF2_init __P((_RuneLocale *));
-extern int _EUC_init __P((_RuneLocale *));
-extern int _BIG5_init __P((_RuneLocale *));
-extern int _MSKanji_init __P((_RuneLocale *));
-extern _RuneLocale *_Read_RuneMagi __P((FILE *));
+extern int _none_init(_RuneLocale *);
+extern int _UTF2_init(_RuneLocale *);
+extern int _EUC_init(_RuneLocale *);
+extern int _BIG5_init(_RuneLocale *);
+extern int _MSKanji_init(_RuneLocale *);
+extern _RuneLocale *_Read_RuneMagi(FILE *);
int
setrunelocale(encoding)
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 1c81e80..ebb0750 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -43,9 +43,9 @@ static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/27/93";
#include <ctype.h>
#include <rune.h>
-extern rune_t _none_sgetrune __P((const char *, size_t, char const **));
-extern int _none_sputrune __P((rune_t, char *, size_t, char **));
-extern int _none_init __P((char *, char **));
+extern rune_t _none_sgetrune(const char *, size_t, char const **);
+extern int _none_sputrune(rune_t, char *, size_t, char **);
+extern int _none_init(char *, char **);
_RuneLocale _DefaultRuneLocale = {
_RUNE_MAGIC_1,
diff --git a/lib/libc/locale/utf2.c b/lib/libc/locale/utf2.c
index 3fbe9c5..6639baf 100644
--- a/lib/libc/locale/utf2.c
+++ b/lib/libc/locale/utf2.c
@@ -45,8 +45,8 @@ static char sccsid[] = "@(#)utf2.c 8.1 (Berkeley) 6/4/93";
#include <stdio.h>
#include <stdlib.h>
-rune_t _UTF2_sgetrune __P((const char *, size_t, char const **));
-int _UTF2_sputrune __P((rune_t, char *, size_t, char **));
+rune_t _UTF2_sgetrune(const char *, size_t, char const **);
+int _UTF2_sputrune(rune_t, char *, size_t, char **);
static int _utf_count[16] = {
1, 1, 1, 1, 1, 1, 1, 1,
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 6f83ec4..e598bdb 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -217,7 +217,7 @@ struct res_target {
int n; /* result length */
};
-static int str_isnumber __P((const char *));
+static int str_isnumber(const char *);
static int explore_fqdn __P((const struct addrinfo *, const char *,
const char *, struct addrinfo **));
static int explore_null __P((const struct addrinfo *,
@@ -230,29 +230,29 @@ static int get_canonname __P((const struct addrinfo *,
struct addrinfo *, const char *));
static struct addrinfo *get_ai __P((const struct addrinfo *,
const struct afd *, const char *));
-static int get_portmatch __P((const struct addrinfo *, const char *));
-static int get_port __P((struct addrinfo *, const char *, int));
-static const struct afd *find_afd __P((int));
-static int addrconfig __P((struct addrinfo *));
+static int get_portmatch(const struct addrinfo *, const char *);
+static int get_port(struct addrinfo *, const char *, int);
+static const struct afd *find_afd(int);
+static int addrconfig(struct addrinfo *);
#ifdef INET6
-static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *));
+static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
#endif
static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int,
const struct addrinfo *));
-static int _dns_getaddrinfo __P((void *, void *, va_list));
-static void _sethtent __P((void));
-static void _endhtent __P((void));
-static struct addrinfo *_gethtent __P((const char *, const struct addrinfo *));
-static int _files_getaddrinfo __P((void *, void *, va_list));
+static int _dns_getaddrinfo(void *, void *, va_list);
+static void _sethtent(void);
+static void _endhtent(void);
+static struct addrinfo *_gethtent(const char *, const struct addrinfo *);
+static int _files_getaddrinfo(void *, void *, va_list);
#ifdef YP
-static struct addrinfo *_yphostent __P((char *, const struct addrinfo *));
-static int _yp_getaddrinfo __P((void *, void *, va_list));
-extern int _yp_check __P((char **));
+static struct addrinfo *_yphostent(char *, const struct addrinfo *);
+static int _yp_getaddrinfo(void *, void *, va_list);
+extern int _yp_check(char **);
#endif
-static int res_queryN __P((const char *, struct res_target *));
-static int res_searchN __P((const char *, struct res_target *));
+static int res_queryN(const char *, struct res_target *);
+static int res_searchN(const char *, struct res_target *);
static int res_querydomainN __P((const char *, const char *,
struct res_target *));
@@ -1144,7 +1144,7 @@ getanswer(answer, anslen, qname, qtype, pai)
int type, class, buflen, ancount, qdcount;
int haveanswer, had_error;
char tbuf[MAXDNAME];
- int (*name_ok) __P((const char *));
+ int (*name_ok)(const char *);
char hostbuf[8*1024];
memset(&sentinel, 0, sizeof(sentinel));
@@ -1671,7 +1671,7 @@ _yp_getaddrinfo(rv, cb_data, ap)
/* resolver logic */
-extern const char *__hostalias __P((const char *));
+extern const char *__hostalias(const char *);
extern int h_errno;
/*
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index f232dc9..b41a7a0 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -95,7 +95,7 @@ static char hostbuf[8*1024];
static u_char host_addr[16]; /* IPv4 or IPv6 */
#ifdef RESOLVSORT
-static void addrsort __P((char **, int));
+static void addrsort(char **, int);
#endif
#ifdef DEBUG
@@ -172,7 +172,7 @@ gethostanswer(answer, anslen, qname, qtype)
int toobig = 0;
char tbuf[MAXDNAME];
const char *tname;
- int (*name_ok) __P((const char *));
+ int (*name_ok)(const char *);
tname = qname;
host.h_name = NULL;
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index 06d4d00..f83cb91 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -83,7 +83,7 @@ struct sockinet {
#ifdef INET6
static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
size_t, int));
-static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
+static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
#endif
/* 2553bis: use EAI_xx for getnameinfo */
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
index 53a03f6..8397bfc 100644
--- a/lib/libc/net/getservent.c
+++ b/lib/libc/net/getservent.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <rpcsvc/yp_prot.h>
#include <rpcsvc/ypclnt.h>
static int serv_stepping_yp = 0;
-extern int _yp_check __P(( char ** ));
+extern int _yp_check( char ** );
#endif
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index e28d8a5..f94c316 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -72,10 +72,10 @@ struct hesiod_p {
#define MAX_HESRESP 1024
-static int read_config_file __P((struct hesiod_p *, const char *));
-static char **get_txt_records __P((int, const char *));
-static int init_context __P((void));
-static void translate_errors __P((void));
+static int read_config_file(struct hesiod_p *, const char *);
+static char **get_txt_records(int, const char *);
+static int init_context(void);
+static void translate_errors(void);
/*
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index 488ac7f..32b3ab7 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -32,8 +32,8 @@ static char rcsid[] = "$FreeBSD$";
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
*/
-static int inet_pton4 __P((const char *src, u_char *dst));
-static int inet_pton6 __P((const char *src, u_char *dst));
+static int inet_pton4(const char *src, u_char *dst);
+static int inet_pton6(const char *src, u_char *dst);
/* int
* inet_pton(af, src, dst)
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 6beaa2c..405deda 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -1000,7 +1000,7 @@ getanswer(answer, anslen, qname, qtype, template, errp)
int haveanswer, had_error;
char tbuf[MAXDNAME];
const char *tname;
- int (*name_ok) __P((const char *));
+ int (*name_ok)(const char *);
static char *h_addr_ptrs[MAXADDRS + 1];
static char *host_aliases[MAXALIASES];
static char hostbuf[8*1024];
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index 166db77..cedbd90 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -73,7 +73,7 @@ static ns_dbt *_nsmap = NULL;
#define NSELEMSPERCHUNK 8
-int _nscmp __P((const void *, const void *));
+int _nscmp(const void *, const void *);
int
@@ -140,7 +140,7 @@ _nsdbtget(name)
ns_dbt dbt;
extern FILE *_nsyyin;
- extern int _nsyyparse __P((void));
+ extern int _nsyyparse(void);
dbt.name = name;
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
index 79d5185..dc3be2a 100644
--- a/lib/libc/net/nsparser.y
+++ b/lib/libc/net/nsparser.y
@@ -50,7 +50,7 @@ static char *rcsid =
#include <string.h>
-static void _nsaddsrctomap __P((const char *));
+static void _nsaddsrctomap(const char *);
static ns_dbt curdbt;
static ns_src cursrc;
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index f64fa2c..91bdf28 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -68,11 +68,11 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
#define NI_WITHSCOPEID 0
#endif
-extern int innetgr __P(( const char *, const char *, const char *, const char * ));
+extern int innetgr( const char *, const char *, const char *, const char * );
#define max(a, b) ((a > b) ? a : b)
-int __ivaliduser __P((FILE *, u_int32_t, const char *, const char *));
+int __ivaliduser(FILE *, u_int32_t, const char *, const char *);
int __ivaliduser_af __P((FILE *,const void *, const char *, const char *,
int, int));
int __ivaliduser_sa __P((FILE *, const struct sockaddr *, socklen_t,
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index 46bf3a9..68796ba 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -91,12 +91,12 @@ static char rcsid[] = "$FreeBSD$";
#include "res_config.h"
-static void res_setoptions __P((char *, char *));
+static void res_setoptions(char *, char *);
#ifdef RESOLVSORT
static const char sort_mask[] = "/&";
#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static u_int32_t net_mask(struct in_addr);
#endif
#if !defined(isascii) /* XXX - could be a function */
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index 1155ba2..47146e8 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -124,8 +124,8 @@ static res_send_rhook Rhook = NULL;
} else {}
static char abuf[NI_MAXHOST];
static char pbuf[NI_MAXSERV];
-static void Aerror __P((FILE *, char *, int, struct sockaddr *));
-static void Perror __P((FILE *, char *, int));
+static void Aerror(FILE *, char *, int, struct sockaddr *);
+static void Perror(FILE *, char *, int);
static void
Aerror(file, string, error, address)
@@ -180,7 +180,7 @@ res_send_setrhook(hook)
Rhook = hook;
}
-static struct sockaddr * get_nsaddr __P((size_t));
+static struct sockaddr * get_nsaddr(size_t);
/*
* pick appropriate nsaddr_list for use. see res_init() for initialization.
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index 65f0f12..fd1f5cc 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -96,11 +96,11 @@ union uu {
#define LHALF(x) ((x) & ((1 << HALF_BITS) - 1))
#define LHUP(x) ((x) << HALF_BITS)
-quad_t __divdi3 __P((quad_t a, quad_t b));
-quad_t __moddi3 __P((quad_t a, quad_t b));
-u_quad_t __qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem));
-u_quad_t __udivdi3 __P((u_quad_t a, u_quad_t b));
-u_quad_t __umoddi3 __P((u_quad_t a, u_quad_t b));
+quad_t __divdi3(quad_t a, quad_t b);
+quad_t __moddi3(quad_t a, quad_t b);
+u_quad_t __qdivrem(u_quad_t u, u_quad_t v, u_quad_t *rem);
+u_quad_t __udivdi3(u_quad_t a, u_quad_t b);
+u_quad_t __umoddi3(u_quad_t a, u_quad_t b);
/*
* XXX
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index ce0a39d..2274c02 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -92,12 +92,12 @@ extern "C" {
#endif
/* === engine.c === */
-static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags));
-static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev));
-static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft));
+static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
+static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
+static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static states step(struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
#define BOL (OUT+1)
#define EOL (BOL+1)
#define BOLEOL (BOL+2)
@@ -108,13 +108,13 @@ static states step __P((struct re_guts *g, sopno start, sopno stop, states bef,
#define NONCHAR(c) ((c) > CHAR_MAX)
#define NNONCHAR (CODEMAX-CHAR_MAX)
#ifdef REDEBUG
-static void print __P((struct match *m, char *caption, states st, int ch, FILE *d));
+static void print(struct match *m, char *caption, states st, int ch, FILE *d);
#endif
#ifdef REDEBUG
-static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst));
+static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
#endif
#ifdef REDEBUG
-static char *pchar __P((int ch));
+static char *pchar(int ch);
#endif
#ifdef __cplusplus
diff --git a/lib/libc/regex/grot/mkh b/lib/libc/regex/grot/mkh
index 1deba79..ffa852d 100755
--- a/lib/libc/regex/grot/mkh
+++ b/lib/libc/regex/grot/mkh
@@ -28,7 +28,7 @@ do
;;
-b) # funny Berkeley __P macro
peel="$peel
- "'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1 __P((\2));'
+ "'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1(\2);'
shift
;;
-s) # compiler doesn't like `static foo();'
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index f522e40..54cd771 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -83,51 +83,51 @@ extern "C" {
#endif
/* === regcomp.c === */
-static void p_ere __P((struct parse *p, int stop));
-static void p_ere_exp __P((struct parse *p));
-static void p_str __P((struct parse *p));
-static void p_bre __P((struct parse *p, int end1, int end2));
-static int p_simp_re __P((struct parse *p, int starordinary));
-static int p_count __P((struct parse *p));
-static void p_bracket __P((struct parse *p));
-static void p_b_term __P((struct parse *p, cset *cs));
-static void p_b_cclass __P((struct parse *p, cset *cs));
-static void p_b_eclass __P((struct parse *p, cset *cs));
-static char p_b_symbol __P((struct parse *p));
-static char p_b_coll_elem __P((struct parse *p, int endc));
-static char othercase __P((int ch));
-static void bothcases __P((struct parse *p, int ch));
-static void ordinary __P((struct parse *p, int ch));
-static void nonnewline __P((struct parse *p));
-static void repeat __P((struct parse *p, sopno start, int from, int to));
-static int seterr __P((struct parse *p, int e));
-static cset *allocset __P((struct parse *p));
-static void freeset __P((struct parse *p, cset *cs));
-static int freezeset __P((struct parse *p, cset *cs));
-static int firstch __P((struct parse *p, cset *cs));
-static int nch __P((struct parse *p, cset *cs));
-static void mcadd __P((struct parse *p, cset *cs, char *cp));
+static void p_ere(struct parse *p, int stop);
+static void p_ere_exp(struct parse *p);
+static void p_str(struct parse *p);
+static void p_bre(struct parse *p, int end1, int end2);
+static int p_simp_re(struct parse *p, int starordinary);
+static int p_count(struct parse *p);
+static void p_bracket(struct parse *p);
+static void p_b_term(struct parse *p, cset *cs);
+static void p_b_cclass(struct parse *p, cset *cs);
+static void p_b_eclass(struct parse *p, cset *cs);
+static char p_b_symbol(struct parse *p);
+static char p_b_coll_elem(struct parse *p, int endc);
+static char othercase(int ch);
+static void bothcases(struct parse *p, int ch);
+static void ordinary(struct parse *p, int ch);
+static void nonnewline(struct parse *p);
+static void repeat(struct parse *p, sopno start, int from, int to);
+static int seterr(struct parse *p, int e);
+static cset *allocset(struct parse *p);
+static void freeset(struct parse *p, cset *cs);
+static int freezeset(struct parse *p, cset *cs);
+static int firstch(struct parse *p, cset *cs);
+static int nch(struct parse *p, cset *cs);
+static void mcadd(struct parse *p, cset *cs, char *cp);
#if used
-static void mcsub __P((cset *cs, char *cp));
-static int mcin __P((cset *cs, char *cp));
-static char *mcfind __P((cset *cs, char *cp));
+static void mcsub(cset *cs, char *cp);
+static int mcin(cset *cs, char *cp);
+static char *mcfind(cset *cs, char *cp);
#endif
-static void mcinvert __P((struct parse *p, cset *cs));
-static void mccase __P((struct parse *p, cset *cs));
-static int isinsets __P((struct re_guts *g, int c));
-static int samesets __P((struct re_guts *g, int c1, int c2));
-static void categorize __P((struct parse *p, struct re_guts *g));
-static sopno dupl __P((struct parse *p, sopno start, sopno finish));
-static void doemit __P((struct parse *p, sop op, size_t opnd));
-static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos));
-static void dofwd __P((struct parse *p, sopno pos, sop value));
-static void enlarge __P((struct parse *p, sopno size));
-static void stripsnug __P((struct parse *p, struct re_guts *g));
-static void findmust __P((struct parse *p, struct re_guts *g));
-static int altoffset __P((sop *scan, int offset, int mccs));
-static void computejumps __P((struct parse *p, struct re_guts *g));
-static void computematchjumps __P((struct parse *p, struct re_guts *g));
-static sopno pluscount __P((struct parse *p, struct re_guts *g));
+static void mcinvert(struct parse *p, cset *cs);
+static void mccase(struct parse *p, cset *cs);
+static int isinsets(struct re_guts *g, int c);
+static int samesets(struct re_guts *g, int c1, int c2);
+static void categorize(struct parse *p, struct re_guts *g);
+static sopno dupl(struct parse *p, sopno start, sopno finish);
+static void doemit(struct parse *p, sop op, size_t opnd);
+static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
+static void dofwd(struct parse *p, sopno pos, sop value);
+static void enlarge(struct parse *p, sopno size);
+static void stripsnug(struct parse *p, struct re_guts *g);
+static void findmust(struct parse *p, struct re_guts *g);
+static int altoffset(sop *scan, int offset, int mccs);
+static void computejumps(struct parse *p, struct re_guts *g);
+static void computematchjumps(struct parse *p, struct re_guts *g);
+static sopno pluscount(struct parse *p, struct re_guts *g);
#ifdef __cplusplus
}
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 97080df..eb233d9 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -58,7 +58,7 @@ extern "C" {
#endif
/* === regerror.c === */
-static char *regatoi __P((const regex_t *preg, char *localbuf));
+static char *regatoi(const regex_t *preg, char *localbuf);
#ifdef __cplusplus
}
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index 7917c06..112350f 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -114,9 +114,9 @@ struct broadif {
typedef TAILQ_HEAD(, broadif) broadlist_t;
-int __rpc_getbroadifs __P((int, int, int, broadlist_t *));
-void __rpc_freebroadifs __P((broadlist_t *));
-int __rpc_broadenable __P((int, int, struct broadif *));
+int __rpc_getbroadifs(int, int, int, broadlist_t *);
+void __rpc_freebroadifs(broadlist_t *);
+int __rpc_broadenable(int, int, struct broadif *);
int __rpc_lowvers = 0;
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index 5ca88d3..fdc9c87 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -67,16 +67,16 @@ static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
#define RPC_MAX_BACKOFF 30 /* seconds */
-static struct clnt_ops *clnt_dg_ops __P((void));
-static bool_t time_not_ok __P((struct timeval *));
+static struct clnt_ops *clnt_dg_ops(void);
+static bool_t time_not_ok(struct timeval *);
static enum clnt_stat clnt_dg_call __P((CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval));
-static void clnt_dg_geterr __P((CLIENT *, struct rpc_err *));
-static bool_t clnt_dg_freeres __P((CLIENT *, xdrproc_t, caddr_t));
-static void clnt_dg_abort __P((CLIENT *));
-static bool_t clnt_dg_control __P((CLIENT *, u_int, char *));
-static void clnt_dg_destroy __P((CLIENT *));
-static int __rpc_timeval_to_msec __P((struct timeval *));
+static void clnt_dg_geterr(CLIENT *, struct rpc_err *);
+static bool_t clnt_dg_freeres(CLIENT *, xdrproc_t, caddr_t);
+static void clnt_dg_abort(CLIENT *);
+static bool_t clnt_dg_control(CLIENT *, u_int, char *);
+static void clnt_dg_destroy(CLIENT *);
+static int __rpc_timeval_to_msec(struct timeval *);
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index f277f9e..fbbdc98 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -57,8 +57,8 @@ static char *rcsid = "$FreeBSD$";
static char *buf;
-static char *_buf __P((void));
-static char *auth_errmsg __P((enum auth_stat));
+static char *_buf(void);
+static char *auth_errmsg(enum auth_stat);
#define CLNT_PERROR_BUFLEN 256
static char *
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index 5dc39b1..1492e48 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -78,12 +78,12 @@ static struct clntraw_private {
static enum clnt_stat clnt_raw_call __P((CLIENT *, rpcproc_t, xdrproc_t,
caddr_t, xdrproc_t, caddr_t, struct timeval));
-static void clnt_raw_geterr __P((CLIENT *, struct rpc_err *));
-static bool_t clnt_raw_freeres __P((CLIENT *, xdrproc_t, caddr_t));
-static void clnt_raw_abort __P((CLIENT *));
-static bool_t clnt_raw_control __P((CLIENT *, u_int, char *));
-static void clnt_raw_destroy __P((CLIENT *));
-static struct clnt_ops *clnt_raw_ops __P((void));
+static void clnt_raw_geterr(CLIENT *, struct rpc_err *);
+static bool_t clnt_raw_freeres(CLIENT *, xdrproc_t, caddr_t);
+static void clnt_raw_abort(CLIENT *);
+static bool_t clnt_raw_control(CLIENT *, u_int, char *);
+static void clnt_raw_destroy(CLIENT *);
+static struct clnt_ops *clnt_raw_ops(void);
/*
* Create a client handle for memory based rpc.
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index f8c29d0..9bf811b 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -75,7 +75,7 @@ struct rpc_call_private {
};
static struct rpc_call_private *rpc_call_private_main;
-static void rpc_call_destroy __P((void *));
+static void rpc_call_destroy(void *);
static void
rpc_call_destroy(void *vp)
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index b96822e..27f14d9 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -89,15 +89,15 @@ struct cmessage {
static enum clnt_stat clnt_vc_call __P((CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
xdrproc_t, caddr_t, struct timeval));
-static void clnt_vc_geterr __P((CLIENT *, struct rpc_err *));
-static bool_t clnt_vc_freeres __P((CLIENT *, xdrproc_t, caddr_t));
-static void clnt_vc_abort __P((CLIENT *));
-static bool_t clnt_vc_control __P((CLIENT *, u_int, char *));
-static void clnt_vc_destroy __P((CLIENT *));
-static struct clnt_ops *clnt_vc_ops __P((void));
-static bool_t time_not_ok __P((struct timeval *));
-static int read_vc __P((caddr_t, caddr_t, int));
-static int write_vc __P((caddr_t, caddr_t, int));
+static void clnt_vc_geterr(CLIENT *, struct rpc_err *);
+static bool_t clnt_vc_freeres(CLIENT *, xdrproc_t, caddr_t);
+static void clnt_vc_abort(CLIENT *);
+static bool_t clnt_vc_control(CLIENT *, u_int, char *);
+static void clnt_vc_destroy(CLIENT *);
+static struct clnt_ops *clnt_vc_ops(void);
+static bool_t time_not_ok(struct timeval *);
+static int read_vc(caddr_t, caddr_t, int);
+static int write_vc(caddr_t, caddr_t, int);
static int __msgwrite(int, void *, size_t);
static int __msgread(int, void *, size_t);
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index d7012e7..01d441d 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -40,9 +40,9 @@
static const char rcsid[] = "$FreeBSD$";
#endif
-static int common_crypt __P(( char *, char *, unsigned, unsigned, struct desparams * ));
+static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
int (*__des_crypt_LOCAL)() = 0;
-extern int _des_crypt_call __P((char *, int, struct desparams *));
+extern int _des_crypt_call(char *, int, struct desparams *);
/*
* Copy 8 bytes
*/
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index c41402b..f4b4ece 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -123,9 +123,9 @@ struct netconfig_vars {
#define NC_INVALID 0
-static int *__nc_error __P((void));
-static int parse_ncp __P((char *, struct netconfig *));
-static struct netconfig *dup_ncp __P((struct netconfig *));
+static int *__nc_error(void);
+static int parse_ncp(char *, struct netconfig *);
+static struct netconfig *dup_ncp(struct netconfig *);
static FILE *nc_file; /* for netconfig db */
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index 132a510..133bbbc 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -70,7 +70,7 @@ struct netpath_vars {
#define NP_VALID 0xf00d
#define NP_INVALID 0
-char *_get_next_token __P((char *, int));
+char *_get_next_token(char *, int);
/*
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index d200103..9af5bf7 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -76,7 +76,7 @@ static struct rpcdata {
#endif
} *rpcdata;
-static struct rpcent *interpret __P((char *val, size_t len));
+static struct rpcent *interpret(char *val, size_t len);
#ifdef YP
static int __yp_nomap = 0;
@@ -85,7 +85,7 @@ extern int _yp_check(char **);
#define RPCDB "/etc/rpc"
-static struct rpcdata *_rpcdata __P((void));
+static struct rpcdata *_rpcdata(void);
static struct rpcdata *
_rpcdata()
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index 642d6fd..1b76e49 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -88,7 +88,7 @@ cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
des_block *(*__key_gendes_LOCAL)() = 0;
-static int key_call __P(( u_long, xdrproc_t, char *, xdrproc_t, char * ));
+static int key_call( u_long, xdrproc_t, char *, xdrproc_t, char * );
int
key_setsecret(secretkey)
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 5816441..3a0631f 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -59,8 +59,8 @@ static char *OPSYS = "unix";
static char *NETID = "netid.byname";
static char *NETIDFILE = "/etc/netid";
-static int getnetid __P(( char *, char * ));
-static int _getgroups __P(( char *, gid_t * ));
+static int getnetid( char *, char * );
+static int _getgroups( char *, gid_t * );
#ifndef NGROUPS
#define NGROUPS 16
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
index 8a12693..a52332d 100644
--- a/lib/libc/rpc/rpc_com.h
+++ b/lib/libc/rpc/rpc_com.h
@@ -59,26 +59,26 @@
(u_int32_t)(now)->tv_usec)
__BEGIN_DECLS
-extern u_int __rpc_get_a_size __P((int));
-extern int __rpc_dtbsize __P((void));
-extern struct netconfig * __rpcgettp __P((int));
-extern int __rpc_get_default_domain __P((char **));
+extern u_int __rpc_get_a_size(int);
+extern int __rpc_dtbsize(void);
+extern struct netconfig * __rpcgettp(int);
+extern int __rpc_get_default_domain(char **);
-char *__rpc_taddr2uaddr_af __P((int, const struct netbuf *));
-struct netbuf *__rpc_uaddr2taddr_af __P((int, const char *));
-int __rpc_fixup_addr __P((struct netbuf *, const struct netbuf *));
-int __rpc_sockinfo2netid __P((struct __rpc_sockinfo *, const char **));
-int __rpc_seman2socktype __P((int));
-int __rpc_socktype2seman __P((int));
-void *rpc_nullproc __P((CLIENT *));
-int __rpc_sockisbound __P((int));
+char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
+struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
+int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
+int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
+int __rpc_seman2socktype(int);
+int __rpc_socktype2seman(int);
+void *rpc_nullproc(CLIENT *);
+int __rpc_sockisbound(int);
struct netbuf *__rpcb_findaddr __P((rpcprog_t, rpcvers_t,
const struct netconfig *,
const char *, CLIENT **));
-bool_t __rpc_control __P((int,void *));
+bool_t __rpc_control(int,void *);
-char *_get_next_token __P((char *, int));
+char *_get_next_token(char *, int);
__END_DECLS
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 16e0a2b..b4c2a67 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -40,7 +40,7 @@ static char *rcsid = "$FreeBSD$";
#include <unistd.h>
#include "un-namespace.h"
-int _rpc_dtablesize __P((void)); /* XXX */
+int _rpc_dtablesize(void); /* XXX */
/*
* Cache the result of getdtablesize(), so we don't have to do an
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index ee233bb..e2492b4 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -101,9 +101,9 @@ static const struct netid_af na_cvt[] = {
};
#if 0
-static char *strlocase __P((char *));
+static char *strlocase(char *);
#endif
-static int getnettype __P((const char *));
+static int getnettype(const char *);
/*
* Cache the result of getrlimit(), so we don't have to do an
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index 4dbfe19..010f93b 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -57,8 +57,8 @@ static char *rcsid = "$FreeBSD$";
#include <rpc/rpc.h>
#include "un-namespace.h"
-static void accepted __P((enum accept_stat, struct rpc_err *));
-static void rejected __P((enum reject_stat, struct rpc_err *));
+static void accepted(enum accept_stat, struct rpc_err *);
+static void rejected(enum reject_stat, struct rpc_err *);
/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 35fd983..9618de1 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -80,8 +80,8 @@ extern mutex_t rpcsoc_lock;
static CLIENT *clnt_com_create __P((struct sockaddr_in *, rpcprog_t, rpcvers_t,
int *, u_int, u_int, char *));
-static SVCXPRT *svc_com_create __P((int, u_int, u_int, char *));
-static bool_t rpc_wrap_bcast __P((char *, struct netbuf *, struct netconfig *));
+static SVCXPRT *svc_com_create(int, u_int, u_int, char *);
+static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *);
/* XXX */
#define IN4_LOCALHOST_STRING "127.0.0.1"
@@ -348,7 +348,7 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
int
registerrpc(prognum, versnum, procnum, progname, inproc, outproc)
int prognum, versnum, procnum;
- char *(*progname) __P((char [UDPMSGSIZE]));
+ char *(*progname)(char [UDPMSGSIZE]);
xdrproc_t inproc, outproc;
{
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index e1400cc..156cbe8 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
static struct timeval tottimeout = { 60, 0 };
static const struct timeval rmttimeout = { 3, 0 };
-extern bool_t xdr_wrapstring __P((XDR *, char **));
+extern bool_t xdr_wrapstring(XDR *, char **);
static const char nullstring[] = "\000";
@@ -100,13 +100,13 @@ static int cachesize;
extern int __rpc_lowvers;
-static struct address_cache *check_cache __P((const char *, const char *));
-static void delete_cache __P((struct netbuf *));
+static struct address_cache *check_cache(const char *, const char *);
+static void delete_cache(struct netbuf *);
static void add_cache __P((const char *, const char *, struct netbuf *,
char *));
static CLIENT *getclnthandle __P((const char *, const struct netconfig *,
char **));
-static CLIENT *local_rpcb __P((void));
+static CLIENT *local_rpcb(void);
static struct netbuf *got_entry __P((rpcb_entry_list_ptr,
const struct netconfig *));
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 61d0e86..55baa1a 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -59,12 +59,12 @@
static const char rcsid[] = "$FreeBSD$";
#endif
-extern int _rpc_dtablesize __P(( void ));
+extern int _rpc_dtablesize( void );
#define NYEARS (unsigned long)(1970 - 1900)
#define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
-static void do_close __P(( int ));
+static void do_close( int );
int
rtime(addrp, timep, timeout)
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index fe4d37d..c201c0c 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -82,7 +82,7 @@ static struct svc_callout {
rpcprog_t sc_prog;
rpcvers_t sc_vers;
char *sc_netid;
- void (*sc_dispatch) __P((struct svc_req *, SVCXPRT *));
+ void (*sc_dispatch)(struct svc_req *, SVCXPRT *);
} *svc_head;
extern rwlock_t svc_lock;
@@ -158,7 +158,7 @@ svc_reg(xprt, prog, vers, dispatch, nconf)
SVCXPRT *xprt;
const rpcprog_t prog;
const rpcvers_t vers;
- void (*dispatch) __P((struct svc_req *, SVCXPRT *));
+ void (*dispatch)(struct svc_req *, SVCXPRT *);
const struct netconfig *nconf;
{
bool_t dummy;
@@ -265,7 +265,7 @@ svc_register(xprt, prog, vers, dispatch, protocol)
SVCXPRT *xprt;
u_long prog;
u_long vers;
- void (*dispatch) __P((struct svc_req *, SVCXPRT *));
+ void (*dispatch)(struct svc_req *, SVCXPRT *);
int protocol;
{
struct svc_callout *prev;
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index d36ea79..56d23b1 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -71,7 +71,7 @@ static const char rcsid[] = "$FreeBSD$";
/* declarations to allow servers to specify new authentication flavors */
struct authsvc {
int flavor;
- enum auth_stat (*handler) __P((struct svc_req *, struct rpc_msg *));
+ enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
struct authsvc *next;
};
static struct authsvc *Auths = NULL;
@@ -171,7 +171,7 @@ _svcauth_null(rqst, msg)
int
svc_auth_reg(cred_flavor, handler)
int cred_flavor;
- enum auth_stat (*handler) __P((struct svc_req *, struct rpc_msg *));
+ enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
{
struct authsvc *asp;
extern mutex_t authsvc_lock;
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index cf828a4..8eee24f 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -70,17 +70,17 @@
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
-static void svc_dg_ops __P((SVCXPRT *));
-static enum xprt_stat svc_dg_stat __P((SVCXPRT *));
-static bool_t svc_dg_recv __P((SVCXPRT *, struct rpc_msg *));
-static bool_t svc_dg_reply __P((SVCXPRT *, struct rpc_msg *));
-static bool_t svc_dg_getargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static bool_t svc_dg_freeargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static void svc_dg_destroy __P((SVCXPRT *));
-static bool_t svc_dg_control __P((SVCXPRT *, const u_int, void *));
-static int cache_get __P((SVCXPRT *, struct rpc_msg *, char **, size_t *));
-static void cache_set __P((SVCXPRT *, size_t));
-int svc_dg_enablecache __P((SVCXPRT *, u_int));
+static void svc_dg_ops(SVCXPRT *);
+static enum xprt_stat svc_dg_stat(SVCXPRT *);
+static bool_t svc_dg_recv(SVCXPRT *, struct rpc_msg *);
+static bool_t svc_dg_reply(SVCXPRT *, struct rpc_msg *);
+static bool_t svc_dg_getargs(SVCXPRT *, xdrproc_t, caddr_t);
+static bool_t svc_dg_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
+static void svc_dg_destroy(SVCXPRT *);
+static bool_t svc_dg_control(SVCXPRT *, const u_int, void *);
+static int cache_get(SVCXPRT *, struct rpc_msg *, char **, size_t *);
+static void cache_set(SVCXPRT *, size_t);
+int svc_dg_enablecache(SVCXPRT *, u_int);
/*
* Usage:
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 13ab43d..224725b 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -64,7 +64,7 @@ static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
#include "rpc_com.h"
-extern int __svc_vc_setflag __P((SVCXPRT *, int));
+extern int __svc_vc_setflag(SVCXPRT *, int);
/*
* The highest level interface for server creation.
@@ -77,7 +77,7 @@ extern int __svc_vc_setflag __P((SVCXPRT *, int));
*/
int
svc_create(dispatch, prognum, versnum, nettype)
- void (*dispatch) __P((struct svc_req *, SVCXPRT *));
+ void (*dispatch)(struct svc_req *, SVCXPRT *);
rpcprog_t prognum; /* Program number */
rpcvers_t versnum; /* Version number */
const char *nettype; /* Networktype token */
@@ -149,7 +149,7 @@ svc_create(dispatch, prognum, versnum, nettype)
*/
SVCXPRT *
svc_tp_create(dispatch, prognum, versnum, nconf)
- void (*dispatch) __P((struct svc_req *, SVCXPRT *));
+ void (*dispatch)(struct svc_req *, SVCXPRT *);
rpcprog_t prognum; /* Program number */
rpcvers_t versnum; /* Version number */
const struct netconfig *nconf; /* Netconfig structure for the network */
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index b1e143a..2a75f4e 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -73,14 +73,14 @@ static struct svc_raw_private {
extern mutex_t svcraw_lock;
-static enum xprt_stat svc_raw_stat __P((SVCXPRT *));
-static bool_t svc_raw_recv __P((SVCXPRT *, struct rpc_msg *));
-static bool_t svc_raw_reply __P((SVCXPRT *, struct rpc_msg *));
-static bool_t svc_raw_getargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static bool_t svc_raw_freeargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static void svc_raw_destroy __P((SVCXPRT *));
-static void svc_raw_ops __P((SVCXPRT *));
-static bool_t svc_raw_control __P((SVCXPRT *, const u_int, void *));
+static enum xprt_stat svc_raw_stat(SVCXPRT *);
+static bool_t svc_raw_recv(SVCXPRT *, struct rpc_msg *);
+static bool_t svc_raw_reply(SVCXPRT *, struct rpc_msg *);
+static bool_t svc_raw_getargs(SVCXPRT *, xdrproc_t, caddr_t);
+static bool_t svc_raw_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
+static void svc_raw_destroy(SVCXPRT *);
+static void svc_raw_ops(SVCXPRT *);
+static bool_t svc_raw_control(SVCXPRT *, const u_int, void *);
char *__rpc_rawcombuf = NULL;
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 7760039..d579b08 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -60,10 +60,10 @@
#include "rpc_com.h"
-static void universal __P((struct svc_req *, SVCXPRT *));
+static void universal(struct svc_req *, SVCXPRT *);
static struct proglst {
- char *(*p_progname) __P((char *));
+ char *(*p_progname)(char *);
rpcprog_t p_prognum;
rpcvers_t p_versnum;
rpcproc_t p_procnum;
@@ -98,7 +98,7 @@ rpc_reg(prognum, versnum, procnum, progname, inproc, outproc, nettype)
rpcprog_t prognum; /* program number */
rpcvers_t versnum; /* version number */
rpcproc_t procnum; /* procedure number */
- char *(*progname) __P((char *)); /* Server routine */
+ char *(*progname)(char *); /* Server routine */
xdrproc_t inproc, outproc; /* in/out XDR procedures */
char *nettype; /* nettype */
{
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index a7cb080..731f5c7 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -73,20 +73,20 @@ struct cmessage {
struct cmsgcred cmcred;
};
-static SVCXPRT *makefd_xprt __P((int, u_int, u_int));
-static bool_t rendezvous_request __P((SVCXPRT *, struct rpc_msg *));
-static enum xprt_stat rendezvous_stat __P((SVCXPRT *));
-static void svc_vc_destroy __P((SVCXPRT *));
-static int read_vc __P((caddr_t, caddr_t, int));
-static int write_vc __P((caddr_t, caddr_t, int));
-static enum xprt_stat svc_vc_stat __P((SVCXPRT *));
-static bool_t svc_vc_recv __P((SVCXPRT *, struct rpc_msg *));
-static bool_t svc_vc_getargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static bool_t svc_vc_freeargs __P((SVCXPRT *, xdrproc_t, caddr_t));
-static bool_t svc_vc_reply __P((SVCXPRT *, struct rpc_msg *));
-static void svc_vc_rendezvous_ops __P((SVCXPRT *));
-static void svc_vc_ops __P((SVCXPRT *));
-static bool_t svc_vc_control __P((SVCXPRT *xprt, const u_int rq, void *in));
+static SVCXPRT *makefd_xprt(int, u_int, u_int);
+static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
+static enum xprt_stat rendezvous_stat(SVCXPRT *);
+static void svc_vc_destroy(SVCXPRT *);
+static int read_vc(caddr_t, caddr_t, int);
+static int write_vc(caddr_t, caddr_t, int);
+static enum xprt_stat svc_vc_stat(SVCXPRT *);
+static bool_t svc_vc_recv(SVCXPRT *, struct rpc_msg *);
+static bool_t svc_vc_getargs(SVCXPRT *, xdrproc_t, caddr_t);
+static bool_t svc_vc_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
+static bool_t svc_vc_reply(SVCXPRT *, struct rpc_msg *);
+static void svc_vc_rendezvous_ops(SVCXPRT *);
+static void svc_vc_ops(SVCXPRT *);
+static bool_t svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in);
static int __msgread_withcred(int, void *, size_t, struct cmessage *);
static int __msgwrite(int, void *, size_t);
diff --git a/lib/libc/sparc64/fpu/fpu_extern.h b/lib/libc/sparc64/fpu/fpu_extern.h
index 862ca59..4f9de88 100644
--- a/lib/libc/sparc64/fpu/fpu_extern.h
+++ b/lib/libc/sparc64/fpu/fpu_extern.h
@@ -49,39 +49,39 @@ struct fpemu;
struct fpn;
/* fpu.c */
-void __fpu_exception __P((struct utrapframe *tf));
-void __fpu_panic __P((char *msg));
+void __fpu_exception(struct utrapframe *tf);
+void __fpu_panic(char *msg);
/* fpu_add.c */
-struct fpn *__fpu_add __P((struct fpemu *));
+struct fpn *__fpu_add(struct fpemu *);
/* fpu_compare.c */
-void __fpu_compare __P((struct fpemu *, int, int));
+void __fpu_compare(struct fpemu *, int, int);
/* fpu_div.c */
-struct fpn *__fpu_div __P((struct fpemu *));
+struct fpn *__fpu_div(struct fpemu *);
/* fpu_explode.c */
-int __fpu_itof __P((struct fpn *, u_int));
-int __fpu_xtof __P((struct fpn *, u_int64_t));
-int __fpu_stof __P((struct fpn *, u_int));
-int __fpu_dtof __P((struct fpn *, u_int, u_int ));
-int __fpu_qtof __P((struct fpn *, u_int, u_int , u_int , u_int ));
-void __fpu_explode __P((struct fpemu *, struct fpn *, int, int ));
+int __fpu_itof(struct fpn *, u_int);
+int __fpu_xtof(struct fpn *, u_int64_t);
+int __fpu_stof(struct fpn *, u_int);
+int __fpu_dtof(struct fpn *, u_int, u_int );
+int __fpu_qtof(struct fpn *, u_int, u_int , u_int , u_int );
+void __fpu_explode(struct fpemu *, struct fpn *, int, int );
/* fpu_implode.c */
-u_int __fpu_ftoi __P((struct fpemu *, struct fpn *));
-u_int __fpu_ftox __P((struct fpemu *, struct fpn *, u_int *));
-u_int __fpu_ftos __P((struct fpemu *, struct fpn *));
-u_int __fpu_ftod __P((struct fpemu *, struct fpn *, u_int *));
-u_int __fpu_ftoq __P((struct fpemu *, struct fpn *, u_int *));
-void __fpu_implode __P((struct fpemu *, struct fpn *, int, u_int *));
+u_int __fpu_ftoi(struct fpemu *, struct fpn *);
+u_int __fpu_ftox(struct fpemu *, struct fpn *, u_int *);
+u_int __fpu_ftos(struct fpemu *, struct fpn *);
+u_int __fpu_ftod(struct fpemu *, struct fpn *, u_int *);
+u_int __fpu_ftoq(struct fpemu *, struct fpn *, u_int *);
+void __fpu_implode(struct fpemu *, struct fpn *, int, u_int *);
/* fpu_mul.c */
-struct fpn *__fpu_mul __P((struct fpemu *));
+struct fpn *__fpu_mul(struct fpemu *);
/* fpu_sqrt.c */
-struct fpn *__fpu_sqrt __P((struct fpemu *));
+struct fpn *__fpu_sqrt(struct fpemu *);
/* fpu_subr.c */
/*
@@ -89,9 +89,9 @@ struct fpn *__fpu_sqrt __P((struct fpemu *));
* Note that the result is probably not a well-formed number (it will lack
* the normal 1-bit mant[0]&FP_1).
*/
-int __fpu_shr __P((register struct fpn *, register int));
-void __fpu_norm __P((register struct fpn *));
+int __fpu_shr(register struct fpn *, register int);
+void __fpu_norm(register struct fpn *);
/* Build a new Quiet NaN (sign=0, frac=all 1's). */
-struct fpn *__fpu_newnan __P((register struct fpemu *));
+struct fpn *__fpu_newnan(register struct fpemu *);
#endif /* !_SPARC64_FPU_FPU_EXTERN_H_ */
diff --git a/lib/libc/sparc64/fpu/fpu_implode.c b/lib/libc/sparc64/fpu/fpu_implode.c
index 207fa63..cb7b206 100644
--- a/lib/libc/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/sparc64/fpu/fpu_implode.c
@@ -62,8 +62,8 @@
#include "fpu_emu.h"
#include "fpu_extern.h"
-static int round __P((struct fpemu *, struct fpn *));
-static int toinf __P((struct fpemu *, int));
+static int round(struct fpemu *, struct fpn *);
+static int toinf(struct fpemu *, int);
/*
* Round a number (algorithm from Motorola MC68882 manual, modified for
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 8b28431..057487d 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -94,7 +94,7 @@ FILE *__stderrp = &__sF[2];
struct glue __sglue = { &uglue, 3, __sF };
static struct glue *lastglue = &uglue;
-static struct glue * moreglue __P((int));
+static struct glue * moreglue(int);
static spinlock_t thread_lock = _SPINLOCK_INITIALIZER;
#define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock)
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 86659e5..621aa5f 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -109,7 +109,7 @@ _fseeko(fp, offset, whence, ltest)
int whence;
int ltest;
{
- fpos_t (*seekfn) __P((void *, fpos_t, int));
+ fpos_t (*seekfn)(void *, fpos_t, int);
fpos_t target, curoff, ret;
size_t n;
struct stat st;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index c1c215c..2173808 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -46,29 +46,29 @@
* in particular, macros and private variables.
*/
-extern int _sread __P((FILE *, char *, int));
-extern int _swrite __P((FILE *, char const *, int));
-extern fpos_t _sseek __P((FILE *, fpos_t, int));
-extern int _ftello __P((FILE *, fpos_t *));
-extern int _fseeko __P((FILE *, off_t, int, int));
-extern int __fflush __P((FILE *fp));
-extern int __sflush __P((FILE *));
-extern FILE *__sfp __P((void));
-extern int __srefill __P((FILE *));
-extern int __sread __P((void *, char *, int));
-extern int __swrite __P((void *, char const *, int));
-extern fpos_t __sseek __P((void *, fpos_t, int));
-extern int __sclose __P((void *));
-extern void __sinit __P((void));
-extern void _cleanup __P((void));
-extern void (*__cleanup) __P((void));
-extern void __smakebuf __P((FILE *));
-extern int __swhatbuf __P((FILE *, size_t *, int *));
-extern int _fwalk __P((int (*)(FILE *)));
-extern int __swsetup __P((FILE *));
-extern int __sflags __P((const char *, int *));
-extern int __ungetc __P((int, FILE *));
-extern int __vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));
+extern int _sread(FILE *, char *, int);
+extern int _swrite(FILE *, char const *, int);
+extern fpos_t _sseek(FILE *, fpos_t, int);
+extern int _ftello(FILE *, fpos_t *);
+extern int _fseeko(FILE *, off_t, int, int);
+extern int __fflush(FILE *fp);
+extern int __sflush(FILE *);
+extern FILE *__sfp(void);
+extern int __srefill(FILE *);
+extern int __sread(void *, char *, int);
+extern int __swrite(void *, char const *, int);
+extern fpos_t __sseek(void *, fpos_t, int);
+extern int __sclose(void *);
+extern void __sinit(void);
+extern void _cleanup(void);
+extern void (*__cleanup)(void);
+extern void __smakebuf(FILE *);
+extern int __swhatbuf(FILE *, size_t *, int *);
+extern int _fwalk(int (*)(FILE *));
+extern int __swsetup(FILE *);
+extern int __sflags(const char *, int *);
+extern int __ungetc(int, FILE *);
+extern int __vfprintf(FILE *, const char *, _BSD_VA_LIST_);
extern int __sdidinit;
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index a0d396d..098af8f 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -51,9 +51,9 @@ static const char rcsid[] =
#include <unistd.h>
/* #include "un-namespace.h" */
-char *_mktemp __P((char *));
+char *_mktemp(char *);
-static int _gettemp __P((char *, int *, int, int));
+static int _gettemp(char *, int *, int, int);
static const unsigned char padchar[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index b3e292a..59fc35c 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -51,7 +51,7 @@ static const char rcsid[] =
#include "libc_private.h"
#include "local.h"
-static int lflush __P((FILE *));
+static int lflush(FILE *);
static int
lflush(FILE *fp)
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index c887788..03808dd 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -51,7 +51,7 @@ static const char rcsid[] =
#endif
#include "local.h"
-static int eofread __P((void *, char *, int));
+static int eofread(void *, char *, int);
/* ARGSUSED */
static int
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index dc34c7d..c7780a4 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
__warn_references(tempnam,
"warning: tempnam() possibly used unsafely; consider using mkstemp()");
-extern char *_mktemp __P((char *));
+extern char *_mktemp(char *);
char *
tempnam(dir, pfx)
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index ff1c038..bc996f8 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)tmpnam.c 8.3 (Berkeley) 3/28/94";
__warn_references(tmpnam,
"warning: tmpnam() possibly used unsafely; consider using mkstemp()");
-extern char *_mktemp __P((char *));
+extern char *_mktemp(char *);
char *
tmpnam(s)
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index f70fb42..7eb10b1 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
#include "local.h"
#include "libc_private.h"
-static int __submore __P((FILE *));
+static int __submore(FILE *);
/*
* Expand the ungetc buffer `in place'. That is, adjust fp->_p when
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 15b1c64..1d04528 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -112,14 +112,14 @@ enum typeid {
T_DOUBLE, T_LONG_DOUBLE
};
-static int __sprint __P((FILE *, struct __suio *));
+static int __sprint(FILE *, struct __suio *);
static int __sbprintf __P((FILE *, const char *, va_list)) __printflike(2, 0);
static char *__ujtoa __P((uintmax_t, char *, int, int, char *, int,
char, const char *));
static char *__ultoa __P((u_long, char *, int, int, char *, int,
char, const char *));
-static void __find_arguments __P((const char *, va_list, union arg **));
-static void __grow_type_table __P((int, enum typeid **, int *));
+static void __find_arguments(const char *, va_list, union arg **);
+static void __grow_type_table(int, enum typeid **, int *);
/*
* Flush out all the vectors defined by the given uio,
@@ -354,8 +354,8 @@ vfprintf(FILE *fp, const char *fmt0, va_list ap)
#define BUF ((MAXEXP*2)+MAXFRACT+1) /* + decimal point */
#define DEFPREC 6
-static char *cvt __P((double, int, int, char *, int *, int, int *, char **));
-static int exponent __P((char *, int, int));
+static char *cvt(double, int, int, char *, int *, int, int *, char **);
+static int exponent(char *, int, int);
#else /* no FLOATING_POINT */
@@ -1392,7 +1392,7 @@ __grow_type_table (int nextarg, enum typeid **typetable, int *tablesize)
#ifdef FLOATING_POINT
-extern char *__dtoa __P((double, int, int, int *, int *, char **, char **));
+extern char *__dtoa(double, int, int, int *, int *, char **, char **);
static char *
cvt(double value, int ndigits, int flags, char *sign, int *decpt,
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 5a5f8c8..d3f2fdd 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -46,7 +46,7 @@ static const char rcsid[] =
#include <string.h>
static int
-eofread __P((void *, char *, int));
+eofread(void *, char *, int);
/* ARGSUSED */
static int
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index 5ee24bc..1088896 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -62,7 +62,7 @@ bsearch(key, base0, nmemb, size, compar)
const void *base0;
size_t nmemb;
size_t size;
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
const char *base = base0;
size_t lim;
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index 24683f3..1643db0 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <stddef.h>
#include <string.h>
-inline char *__findenv __P((const char *, int *));
+inline char *__findenv(const char *, int *);
/*
* __findenv --
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index 89e9592..d37d199 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -143,7 +143,7 @@ int
heapsort(vbase, nmemb, size, compar)
void *vbase;
size_t nmemb, size;
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
int cnt, i, j, l;
char tmp, *tmp1, *tmp2;
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 7998acc..463bbfc 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -250,7 +250,7 @@ static int malloc_utrace;
struct ut { void *p; size_t s; void *r; };
-void utrace __P((struct ut *, int));
+void utrace(struct ut *, int);
#define UTRACE(a, b, c) \
if (malloc_utrace) \
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 2fb1f3a..f03bb3d 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
-static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
-static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+static void setup(u_char *, u_char *, size_t, size_t, int (*)());
+static void insertionsort(u_char *, size_t, size_t, int (*)());
#define ISIZE sizeof(int)
#define PSIZE sizeof(u_char *)
@@ -101,7 +101,7 @@ mergesort(base, nmemb, size, cmp)
void *base;
size_t nmemb;
size_t size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
{
int i, sense;
int big, iflag;
@@ -262,7 +262,7 @@ COPY: b = t;
void
setup(list1, list2, n, size, cmp)
size_t n, size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
u_char *list1, *list2;
{
int i, length, size2, tmp, sense;
@@ -337,7 +337,7 @@ static void
insertionsort(a, n, size, cmp)
u_char *a;
size_t n, size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
{
u_char *ai, *s, *t, *u, tmp;
int i;
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 71d9dc9..11dd937 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -41,9 +41,9 @@ static const char rcsid[] =
#include <stdlib.h>
-typedef int cmp_t __P((const void *, const void *));
-static inline char *med3 __P((char *, char *, char *, cmp_t *));
-static inline void swapfunc __P((char *, char *, int, int));
+typedef int cmp_t(const void *, const void *);
+static inline char *med3(char *, char *, char *, cmp_t *);
+static inline void swapfunc(char *, char *, int, int);
#define min(a, b) (a) < (b) ? a : b
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 873c7ec..9540f63 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -64,8 +64,8 @@ typedef struct {
} stack;
static inline void simplesort
- __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
+(const u_char **, int, int, const u_char *, u_int);
+static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
static void r_sort_b __P((const u_char **,
const u_char **, int, int, const u_char *, u_int));
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index be12368..9db04aa 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -214,7 +214,7 @@ static long rand_deg = DEG_3;
static long rand_sep = SEP_3;
static long *end_ptr = &randtbl[DEG_3 + 1];
-static inline long good_rand __P((long));
+static inline long good_rand(long);
static inline long good_rand (x)
long x;
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index ef10810..e1de805 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -42,7 +42,7 @@ static const char rcsid[] = "$FreeBSD$";
#include <stdlib.h>
#include <string.h>
-char *__findenv __P((const char *, int *));
+char *__findenv(const char *, int *);
/*
* setenv --
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
index daf4aa7..339405a 100644
--- a/lib/libc/stdlib/tdelete.c
+++ b/lib/libc/stdlib/tdelete.c
@@ -28,7 +28,7 @@ void *
tdelete(vkey, vrootp, compar)
const void *vkey; /* key to be deleted */
void **vrootp; /* address of the root of tree */
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
node_t **rootp = (node_t **)vrootp;
node_t *p, *q, *r;
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index b2c4b96..c2e3d77 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -27,7 +27,7 @@ void *
tfind(vkey, vrootp, compar)
const void *vkey; /* key to be found */
void **vrootp; /* address of the tree root */
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
node_t **rootp = (node_t **)vrootp;
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 85832ce..e842ff4 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -27,7 +27,7 @@ void *
tsearch(vkey, vrootp, compar)
const void *vkey; /* key to be located */
void **vrootp; /* address of tree root */
- int (*compar) __P((const void *, const void *));
+ int (*compar)(const void *, const void *);
{
node_t *q;
node_t **rootp = (node_t **)vrootp;
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
index eab71df..78d3685 100644
--- a/lib/libc/stdlib/twalk.c
+++ b/lib/libc/stdlib/twalk.c
@@ -29,7 +29,7 @@ static void trecurse __P((const node_t *,
static void
trecurse(root, action, level)
const node_t *root; /* Root of the tree to be walked */
- void (*action) __P((const void *, VISIT, int));
+ void (*action)(const void *, VISIT, int);
int level;
{
@@ -50,7 +50,7 @@ trecurse(root, action, level)
void
twalk(vroot, action)
const void *vroot; /* Root of the tree to be walked */
- void (*action) __P((const void *, VISIT, int));
+ void (*action)(const void *, VISIT, int);
{
if (vroot != NULL && action != NULL)
trecurse(vroot, action, 0);
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 187dd01..59320f6 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -45,7 +45,7 @@
.Bd -literal
struct sigaction {
union {
- void (*__sa_handler) __P((int));
+ void (*__sa_handler)(int);
void (*__sa_sigaction) __P((int, struct __siginfo *,
void *));
} __sigaction_u; /* signal handler */
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index b54fc59..1faf0191 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -58,18 +58,18 @@ static char *rcsid = "$FreeBSD$";
#include <rpc/xdr.h>
#include "un-namespace.h"
-static void xdrmem_destroy __P((XDR *));
-static bool_t xdrmem_getlong_aligned __P((XDR *, long *));
-static bool_t xdrmem_putlong_aligned __P((XDR *, const long *));
-static bool_t xdrmem_getlong_unaligned __P((XDR *, long *));
-static bool_t xdrmem_putlong_unaligned __P((XDR *, const long *));
-static bool_t xdrmem_getbytes __P((XDR *, char *, u_int));
-static bool_t xdrmem_putbytes __P((XDR *, const char *, u_int));
+static void xdrmem_destroy(XDR *);
+static bool_t xdrmem_getlong_aligned(XDR *, long *);
+static bool_t xdrmem_putlong_aligned(XDR *, const long *);
+static bool_t xdrmem_getlong_unaligned(XDR *, long *);
+static bool_t xdrmem_putlong_unaligned(XDR *, const long *);
+static bool_t xdrmem_getbytes(XDR *, char *, u_int);
+static bool_t xdrmem_putbytes(XDR *, const char *, u_int);
/* XXX: w/64-bit pointers, u_int not enough! */
-static u_int xdrmem_getpos __P((XDR *));
-static bool_t xdrmem_setpos __P((XDR *, u_int));
-static int32_t *xdrmem_inline_aligned __P((XDR *, u_int));
-static int32_t *xdrmem_inline_unaligned __P((XDR *, u_int));
+static u_int xdrmem_getpos(XDR *);
+static bool_t xdrmem_setpos(XDR *, u_int);
+static int32_t *xdrmem_inline_aligned(XDR *, u_int);
+static int32_t *xdrmem_inline_unaligned(XDR *, u_int);
static const struct xdr_ops xdrmem_ops_aligned = {
xdrmem_getlong_aligned,
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index 616dbf6..3ab2667 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -67,15 +67,15 @@ static char *rcsid = "$FreeBSD$";
#include <rpc/xdr.h>
#include "un-namespace.h"
-static bool_t xdrrec_getlong __P((XDR *, long *));
-static bool_t xdrrec_putlong __P((XDR *, const long *));
-static bool_t xdrrec_getbytes __P((XDR *, char *, u_int));
+static bool_t xdrrec_getlong(XDR *, long *);
+static bool_t xdrrec_putlong(XDR *, const long *);
+static bool_t xdrrec_getbytes(XDR *, char *, u_int);
-static bool_t xdrrec_putbytes __P((XDR *, const char *, u_int));
-static u_int xdrrec_getpos __P((XDR *));
-static bool_t xdrrec_setpos __P((XDR *, u_int));
-static int32_t *xdrrec_inline __P((XDR *, u_int));
-static void xdrrec_destroy __P((XDR *));
+static bool_t xdrrec_putbytes(XDR *, const char *, u_int);
+static u_int xdrrec_getpos(XDR *);
+static bool_t xdrrec_setpos(XDR *, u_int);
+static int32_t *xdrrec_inline(XDR *, u_int);
+static void xdrrec_destroy(XDR *);
static const struct xdr_ops xdrrec_ops = {
xdrrec_getlong,
@@ -109,7 +109,7 @@ typedef struct rec_strm {
/*
* out-goung bits
*/
- int (*writeit) __P((char *, char *, int));
+ int (*writeit)(char *, char *, int);
char *out_base; /* output buffer (points to frag header) */
char *out_finger; /* next output position */
char *out_boundry; /* data cannot up to this address */
@@ -118,7 +118,7 @@ typedef struct rec_strm {
/*
* in-coming bits
*/
- int (*readit) __P((char *, char *, int));
+ int (*readit)(char *, char *, int);
u_long in_size; /* fixed size of the input buffer */
char *in_base;
char *in_finger; /* location of next byte to be had */
@@ -129,12 +129,12 @@ typedef struct rec_strm {
u_int recvsize;
} RECSTREAM;
-static u_int fix_buf_size __P((u_int));
-static bool_t flush_out __P((RECSTREAM *, bool_t));
-static bool_t fill_input_buf __P((RECSTREAM *));
-static bool_t get_input_bytes __P((RECSTREAM *, char *, int));
-static bool_t set_input_fragment __P((RECSTREAM *));
-static bool_t skip_input_bytes __P((RECSTREAM *, long));
+static u_int fix_buf_size(u_int);
+static bool_t flush_out(RECSTREAM *, bool_t);
+static bool_t fill_input_buf(RECSTREAM *);
+static bool_t get_input_bytes(RECSTREAM *, char *, int);
+static bool_t set_input_fragment(RECSTREAM *);
+static bool_t skip_input_bytes(RECSTREAM *, long);
/*
@@ -153,9 +153,9 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
u_int recvsize;
char *tcp_handle;
/* like read, but pass it a tcp_handle, not sock */
- int (*readit) __P((char *, char *, int));
+ int (*readit)(char *, char *, int);
/* like write, but pass it a tcp_handle, not sock */
- int (*writeit) __P((char *, char *, int));
+ int (*writeit)(char *, char *, int);
{
RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index e49cb44..3cf485c 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -54,14 +54,14 @@ static char *rcsid = "$FreeBSD$";
#include <rpc/xdr.h>
#include "un-namespace.h"
-static void xdrstdio_destroy __P((XDR *));
-static bool_t xdrstdio_getlong __P((XDR *, long *));
-static bool_t xdrstdio_putlong __P((XDR *, const long *));
-static bool_t xdrstdio_getbytes __P((XDR *, char *, u_int));
-static bool_t xdrstdio_putbytes __P((XDR *, const char *, u_int));
-static u_int xdrstdio_getpos __P((XDR *));
-static bool_t xdrstdio_setpos __P((XDR *, u_int));
-static int32_t *xdrstdio_inline __P((XDR *, u_int));
+static void xdrstdio_destroy(XDR *);
+static bool_t xdrstdio_getlong(XDR *, long *);
+static bool_t xdrstdio_putlong(XDR *, const long *);
+static bool_t xdrstdio_getbytes(XDR *, char *, u_int);
+static bool_t xdrstdio_putbytes(XDR *, const char *, u_int);
+static u_int xdrstdio_getpos(XDR *);
+static bool_t xdrstdio_setpos(XDR *, u_int);
+static int32_t *xdrstdio_inline(XDR *, u_int);
/*
* Ops vector for stdio type XDR
OpenPOWER on IntegriCloud