aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2002-03-23 17:24:55 +0000
committerWarner Losh <imp@FreeBSD.org>2002-03-23 17:24:55 +0000
commitbb28f3c29b4c91af1b0e79e456294bb08735648a (patch)
treeb4ea687a7ecac173665d9f3a8a858a98631f494e /include
parent194788fafcb927f0affa1a56e21a1e8373f81f9c (diff)
downloadsrc-bb28f3c29b4c91af1b0e79e456294bb08735648a.tar.gz
src-bb28f3c29b4c91af1b0e79e456294bb08735648a.zip
Breath deep and take __P out of the system include files.
# This appears to not break X11, but I'm having problems compiling the # glide part of the server with or without this patch, so I can't tell # for sure.
Notes
Notes: svn path=/head/; revision=93032
Diffstat (limited to 'include')
-rw-r--r--include/_ctype.h62
-rw-r--r--include/arpa/inet.h40
-rw-r--r--include/arpa/nameser.h50
-rw-r--r--include/assert.h7
-rw-r--r--include/complex.h12
-rw-r--r--include/ctype.h62
-rw-r--r--include/db.h31
-rw-r--r--include/dirent.h26
-rw-r--r--include/dlfcn.h24
-rw-r--r--include/err.h28
-rw-r--r--include/fnmatch.h2
-rw-r--r--include/fstab.h11
-rw-r--r--include/fts.h14
-rw-r--r--include/glob.h16
-rw-r--r--include/grp.h16
-rw-r--r--include/hesiod.h20
-rw-r--r--include/ieeefp.h12
-rw-r--r--include/ifaddrs.h4
-rw-r--r--include/langinfo.h2
-rw-r--r--include/libgen.h8
-rw-r--r--include/link.h15
-rw-r--r--include/locale.h5
-rw-r--r--include/math.h92
-rw-r--r--include/mpool.h22
-rw-r--r--include/ndbm.h23
-rw-r--r--include/netconfig.h18
-rw-r--r--include/netdb.h99
-rw-r--r--include/nl_types.h6
-rw-r--r--include/nlist.h2
-rw-r--r--include/nsswitch.h20
-rw-r--r--include/paths.h2
-rw-r--r--include/pthread.h203
-rw-r--r--include/pthread_np.h24
-rw-r--r--include/pwd.h14
-rw-r--r--include/regex.h10
-rw-r--r--include/regexp.h9
-rw-r--r--include/resolv.h133
-rw-r--r--include/rpc/auth.h4
-rw-r--r--include/rpc/auth_des.h2
-rw-r--r--include/rpc/auth_unix.h2
-rw-r--r--include/rpc/clnt.h100
-rw-r--r--include/rpc/clnt_soc.h26
-rw-r--r--include/rpc/des.h2
-rw-r--r--include/rpc/des_crypt.h6
-rw-r--r--include/rpc/nettype.h8
-rw-r--r--include/rpc/pmap_clnt.h28
-rw-r--r--include/rpc/pmap_prot.h6
-rw-r--r--include/rpc/pmap_rmt.h4
-rw-r--r--include/rpc/rpc.h29
-rw-r--r--include/rpc/rpc_com.h35
-rw-r--r--include/rpc/rpc_msg.h12
-rw-r--r--include/rpc/rpcb_clnt.h36
-rw-r--r--include/rpc/rpcent.h18
-rw-r--r--include/rpc/svc.h98
-rw-r--r--include/rpc/svc_auth.h6
-rw-r--r--include/rpc/svc_soc.h18
-rw-r--r--include/rpc/xdr.h110
-rw-r--r--include/rpcsvc/nis_db.h27
-rw-r--r--include/rpcsvc/nislib.h135
-rw-r--r--include/rpcsvc/ypclnt.h18
-rw-r--r--include/rune.h17
-rw-r--r--include/runetype.h5
-rw-r--r--include/search.h17
-rw-r--r--include/setjmp.h15
-rw-r--r--include/signal.h50
-rw-r--r--include/stdio.h160
-rw-r--r--include/stdlib.h178
-rw-r--r--include/string.h84
-rw-r--r--include/stringlist.h10
-rw-r--r--include/time.h62
-rw-r--r--include/ttyent.h13
-rw-r--r--include/unistd.h299
-rw-r--r--include/utime.h3
-rw-r--r--include/vis.h12
-rw-r--r--include/wchar.h66
-rw-r--r--include/wctype.h28
76 files changed, 1346 insertions, 1547 deletions
diff --git a/include/_ctype.h b/include/_ctype.h
index 31df49759802..e5ec784cd5e2 100644
--- a/include/_ctype.h
+++ b/include/_ctype.h
@@ -67,31 +67,31 @@
#define _CTYPE_Q 0x00200000L /* Phonogram */
__BEGIN_DECLS
-int isalnum __P((int));
-int isalpha __P((int));
-int iscntrl __P((int));
-int isdigit __P((int));
-int isgraph __P((int));
-int islower __P((int));
-int isprint __P((int));
-int ispunct __P((int));
-int isspace __P((int));
-int isupper __P((int));
-int isxdigit __P((int));
-int tolower __P((int));
-int toupper __P((int));
+int isalnum(int);
+int isalpha(int);
+int iscntrl(int);
+int isdigit(int);
+int isgraph(int);
+int islower(int);
+int isprint(int);
+int ispunct(int);
+int isspace(int);
+int isupper(int);
+int isxdigit(int);
+int tolower(int);
+int toupper(int);
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int digittoint __P((int));
-int isascii __P((int));
-int isblank __P((int));
-int ishexnumber __P((int));
-int isideogram __P((int));
-int isnumber __P((int));
-int isphonogram __P((int));
-int isrune __P((int));
-int isspecial __P((int));
-int toascii __P((int));
+int digittoint(int);
+int isascii(int);
+int isblank(int);
+int ishexnumber(int);
+int isideogram(int);
+int isnumber(int);
+int isphonogram(int);
+int isrune(int);
+int isspecial(int);
+int toascii(int);
#endif
__END_DECLS
@@ -124,9 +124,9 @@ __END_DECLS
/* See comments in <machine/ansi.h> about _BSD_CT_RUNE_T_. */
__BEGIN_DECLS
-unsigned long ___runetype __P((_BSD_CT_RUNE_T_));
-_BSD_CT_RUNE_T_ ___tolower __P((_BSD_CT_RUNE_T_));
-_BSD_CT_RUNE_T_ ___toupper __P((_BSD_CT_RUNE_T_));
+unsigned long ___runetype(_BSD_CT_RUNE_T_);
+_BSD_CT_RUNE_T_ ___tolower(_BSD_CT_RUNE_T_);
+_BSD_CT_RUNE_T_ ___toupper(_BSD_CT_RUNE_T_);
__END_DECLS
/*
@@ -181,11 +181,11 @@ __tolower(_BSD_CT_RUNE_T_ _c)
#else /* not using inlines */
__BEGIN_DECLS
-int __maskrune __P((_BSD_CT_RUNE_T_, unsigned long));
-int __istype __P((_BSD_CT_RUNE_T_, unsigned long));
-int __isctype __P((_BSD_CT_RUNE_T_, unsigned long));
-_BSD_CT_RUNE_T_ __toupper __P((_BSD_CT_RUNE_T_));
-_BSD_CT_RUNE_T_ __tolower __P((_BSD_CT_RUNE_T_));
+int __maskrune(_BSD_CT_RUNE_T_, unsigned long);
+int __istype(_BSD_CT_RUNE_T_, unsigned long);
+int __isctype(_BSD_CT_RUNE_T_, unsigned long);
+_BSD_CT_RUNE_T_ __toupper(_BSD_CT_RUNE_T_);
+_BSD_CT_RUNE_T_ __tolower(_BSD_CT_RUNE_T_);
__END_DECLS
#endif /* using inlines */
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 42daebf13c5d..5a0e81427cce 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -130,31 +130,31 @@ struct in_addr {
__BEGIN_DECLS
#ifndef _BYTEORDER_PROTOTYPED
#define _BYTEORDER_PROTOTYPED
-__uint32_t htonl __P((__uint32_t));
-__uint16_t htons __P((__uint16_t));
-__uint32_t ntohl __P((__uint32_t));
-__uint16_t ntohs __P((__uint16_t));
+__uint32_t htonl(__uint32_t);
+__uint16_t htons(__uint16_t);
+__uint32_t ntohl(__uint32_t);
+__uint16_t ntohs(__uint16_t);
#endif
-in_addr_t inet_addr __P((const char *));
-char *inet_ntoa __P((struct in_addr));
-const char *inet_ntop __P((int, const void *, char *, socklen_t));
-int inet_pton __P((int, const char *, void *));
+in_addr_t inet_addr(const char *);
+char *inet_ntoa(struct in_addr);
+const char *inet_ntop(int, const void *, char *, socklen_t);
+int inet_pton(int, const char *, void *);
/* Nonstandard functions. */
#ifndef _POSIX_SOURCE
-int ascii2addr __P((int, const char *, void *));
-char *addr2ascii __P((int, const void *, int, char *));
-int inet_aton __P((const char *, struct in_addr *));
-in_addr_t inet_lnaof __P((struct in_addr));
-struct in_addr inet_makeaddr __P((in_addr_t, in_addr_t));
-char * inet_neta __P((in_addr_t, char *, size_t));
-in_addr_t inet_netof __P((struct in_addr));
-in_addr_t inet_network __P((const char *));
-char *inet_net_ntop __P((int, const void *, int, char *, size_t));
-int inet_net_pton __P((int, const char *, void *, size_t));
-unsigned inet_nsap_addr __P((const char *, unsigned char *, int));
-char *inet_nsap_ntoa __P((int, const unsigned char *, char *));
+int ascii2addr(int, const char *, void *);
+char *addr2ascii(int, const void *, int, char *);
+int inet_aton(const char *, struct in_addr *);
+in_addr_t inet_lnaof(struct in_addr);
+struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
+char * inet_neta(in_addr_t, char *, size_t);
+in_addr_t inet_netof(struct in_addr);
+in_addr_t inet_network(const char *);
+char *inet_net_ntop(int, const void *, int, char *, size_t);
+int inet_net_pton(int, const char *, void *, size_t);
+unsigned inet_nsap_addr(const char *, unsigned char *, int);
+char *inet_nsap_ntoa(int, const unsigned char *, char *);
#endif /* !_POSIX_SOURCE */
__END_DECLS
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 343e6416a402..99b51c2e7254 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -415,31 +415,31 @@ typedef enum __ns_class {
#define ns_name_uncompress __ns_name_uncompress
__BEGIN_DECLS
-u_int ns_get16 __P((const u_char *));
-u_long ns_get32 __P((const u_char *));
-void ns_put16 __P((u_int, u_char *));
-void ns_put32 __P((u_long, u_char *));
-int ns_initparse __P((const u_char *, int, ns_msg *));
-int ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
-int ns_sprintrr __P((const ns_msg *, const ns_rr *,
- const char *, const char *, char *, size_t));
-int ns_sprintrrf __P((const u_char *, size_t, const char *,
- ns_class, ns_type, u_long, const u_char *,
- size_t, const char *, const char *,
- char *, size_t));
-int ns_format_ttl __P((u_long, char *, size_t));
-int ns_parse_ttl __P((const char *, u_long *));
-int ns_name_ntop __P((const u_char *, char *, size_t));
-int ns_name_pton __P((const char *, u_char *, size_t));
-int ns_name_unpack __P((const u_char *, const u_char *,
- const u_char *, u_char *, size_t));
-int ns_name_pack __P((const u_char *, u_char *, int,
- const u_char **, const u_char **));
-int ns_name_uncompress __P((const u_char *, const u_char *,
- const u_char *, char *, size_t));
-int ns_name_compress __P((const char *, u_char *, size_t,
- const u_char **, const u_char **));
-int ns_name_skip __P((const u_char **, const u_char *));
+u_int ns_get16(const u_char *);
+u_long ns_get32(const u_char *);
+void ns_put16(u_int, u_char *);
+void ns_put32(u_long, u_char *);
+int ns_initparse(const u_char *, int, ns_msg *);
+int ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
+int ns_sprintrr(const ns_msg *, const ns_rr *,
+ const char *, const char *, char *, size_t);
+int ns_sprintrrf(const u_char *, size_t, const char *,
+ ns_class, ns_type, u_long, const u_char *,
+ size_t, const char *, const char *,
+ char *, size_t);
+int ns_format_ttl(u_long, char *, size_t);
+int ns_parse_ttl(const char *, u_long *);
+int ns_name_ntop(const u_char *, char *, size_t);
+int ns_name_pton(const char *, u_char *, size_t);
+int ns_name_unpack(const u_char *, const u_char *,
+ const u_char *, u_char *, size_t);
+int ns_name_pack(const u_char *, u_char *, int,
+ const u_char **, const u_char **);
+int ns_name_uncompress(const u_char *, const u_char *,
+ const u_char *, char *, size_t);
+int ns_name_compress(const char *, u_char *, size_t,
+ const u_char **, const u_char **);
+int ns_name_skip(const u_char **, const u_char *);
__END_DECLS
#ifdef BIND_4_COMPAT
diff --git a/include/assert.h b/include/assert.h
index 19800fd34e35..f267a4a2a2ab 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -55,15 +55,10 @@
#else
#define _assert(e) assert(e)
-#ifdef __STDC__
#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \
__LINE__, #e))
-#else /* !__STDC__ */
-#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \
- __LINE__, "e"))
-#endif /* __STDC__ */
#endif /* NDEBUG */
__BEGIN_DECLS
-void __assert __P((const char *, const char *, int, const char *));
+void __assert(const char *, const char *, int, const char *);
__END_DECLS
diff --git a/include/complex.h b/include/complex.h
index faf43da00047..88cc5b559edb 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -41,12 +41,12 @@
__BEGIN_DECLS
-double cabs __P((double complex));
-float cabsf __P((float complex));
-double cimag __P((double complex));
-float cimagf __P((float complex));
-double creal __P((double complex));
-float crealf __P((float complex));
+double cabs(double complex);
+float cabsf(float complex);
+double cimag(double complex);
+float cimagf(float complex);
+double creal(double complex);
+float crealf(float complex);
__END_DECLS
diff --git a/include/ctype.h b/include/ctype.h
index 31df49759802..e5ec784cd5e2 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -67,31 +67,31 @@
#define _CTYPE_Q 0x00200000L /* Phonogram */
__BEGIN_DECLS
-int isalnum __P((int));
-int isalpha __P((int));
-int iscntrl __P((int));
-int isdigit __P((int));
-int isgraph __P((int));
-int islower __P((int));
-int isprint __P((int));
-int ispunct __P((int));
-int isspace __P((int));
-int isupper __P((int));
-int isxdigit __P((int));
-int tolower __P((int));
-int toupper __P((int));
+int isalnum(int);
+int isalpha(int);
+int iscntrl(int);
+int isdigit(int);
+int isgraph(int);
+int islower(int);
+int isprint(int);
+int ispunct(int);
+int isspace(int);
+int isupper(int);
+int isxdigit(int);
+int tolower(int);
+int toupper(int);
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int digittoint __P((int));
-int isascii __P((int));
-int isblank __P((int));
-int ishexnumber __P((int));
-int isideogram __P((int));
-int isnumber __P((int));
-int isphonogram __P((int));
-int isrune __P((int));
-int isspecial __P((int));
-int toascii __P((int));
+int digittoint(int);
+int isascii(int);
+int isblank(int);
+int ishexnumber(int);
+int isideogram(int);
+int isnumber(int);
+int isphonogram(int);
+int isrune(int);
+int isspecial(int);
+int toascii(int);
#endif
__END_DECLS
@@ -124,9 +124,9 @@ __END_DECLS
/* See comments in <machine/ansi.h> about _BSD_CT_RUNE_T_. */
__BEGIN_DECLS
-unsigned long ___runetype __P((_BSD_CT_RUNE_T_));
-_BSD_CT_RUNE_T_ ___tolower __P((_BSD_CT_RUNE_T_));
-_BSD_CT_RUNE_T_ ___toupper __P((_BSD_CT_RUNE_T_));
+unsigned long ___runetype(_BSD_CT_RUNE_T_);
+_BSD_CT_RUNE_T_ ___tolower(_BSD_CT_RUNE_T_);
+_BSD_CT_RUNE_T_ ___toupper(_BSD_CT_RUNE_T_);
__END_DECLS
/*
@@ -181,11 +181,11 @@ __tolower(_BSD_CT_RUNE_T_ _c)
#else /* not using inlines */
__BEGIN_DECLS
-int __maskrune __P((_BSD_CT_RUNE_T_, unsigned long));
-int __istype __P((_BSD_CT_RUNE_T_, unsigned long));
-int __isctype __P((_BSD_CT_RUNE_T_, unsigned long));
-_BSD_CT_RUNE_T_ __toupper __P((_BSD_CT_RUNE_T_));
-_BSD_CT_RUNE_T_ __tolower __P((_BSD_CT_RUNE_T_));
+int __maskrune(_BSD_CT_RUNE_T_, unsigned long);
+int __istype(_BSD_CT_RUNE_T_, unsigned long);
+int __isctype(_BSD_CT_RUNE_T_, unsigned long);
+_BSD_CT_RUNE_T_ __toupper(_BSD_CT_RUNE_T_);
+_BSD_CT_RUNE_T_ __tolower(_BSD_CT_RUNE_T_);
__END_DECLS
#endif /* using inlines */
diff --git a/include/db.h b/include/db.h
index cd907c3abe78..3a11e687c638 100644
--- a/include/db.h
+++ b/include/db.h
@@ -31,6 +31,7 @@
* SUCH DAMAGE.
*
* @(#)db.h 8.7 (Berkeley) 6/16/94
+ * $FreeBSD$
*/
#ifndef _DB_H_
@@ -99,14 +100,14 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
/* Access method description structure. */
typedef struct __db {
DBTYPE type; /* Underlying db type. */
- int (*close) __P((struct __db *));
- int (*del) __P((const struct __db *, const DBT *, u_int));
- int (*get) __P((const struct __db *, const DBT *, DBT *, u_int));
- int (*put) __P((const struct __db *, DBT *, const DBT *, u_int));
- int (*seq) __P((const struct __db *, DBT *, DBT *, u_int));
- int (*sync) __P((const struct __db *, u_int));
+ int (*close)(struct __db *);
+ int (*del)(const struct __db *, const DBT *, u_int);
+ int (*get)(const struct __db *, const DBT *, DBT *, u_int);
+ int (*put)(const struct __db *, DBT *, const DBT *, u_int);
+ int (*seq)(const struct __db *, DBT *, DBT *, u_int);
+ int (*sync)(const struct __db *, u_int);
void *internal; /* Access method private. */
- int (*fd) __P((const struct __db *));
+ int (*fd)(const struct __db *);
} DB;
#define BTREEMAGIC 0x053162
@@ -121,9 +122,9 @@ typedef struct {
int minkeypage; /* minimum keys per page */
u_int psize; /* page size */
int (*compare) /* comparison function */
- __P((const DBT *, const DBT *));
+(const DBT *, const DBT *);
size_t (*prefix) /* prefix function */
- __P((const DBT *, const DBT *));
+(const DBT *, const DBT *);
int lorder; /* byte order */
} BTREEINFO;
@@ -137,7 +138,7 @@ typedef struct {
u_int nelem; /* number of elements */
u_int cachesize; /* bytes to cache */
u_int32_t /* hash function */
- (*hash) __P((const void *, size_t));
+ (*hash)(const void *, size_t);
int lorder; /* byte order */
} HASHINFO;
@@ -206,13 +207,13 @@ typedef struct {
#endif
__BEGIN_DECLS
-DB *dbopen __P((const char *, int, int, DBTYPE, const void *));
+DB *dbopen(const char *, int, int, DBTYPE, const void *);
#ifdef __DBINTERFACE_PRIVATE
-DB *__bt_open __P((const char *, int, int, const BTREEINFO *, int));
-DB *__hash_open __P((const char *, int, int, const HASHINFO *, int));
-DB *__rec_open __P((const char *, int, int, const RECNOINFO *, int));
-void __dbpanic __P((DB *dbp));
+DB *__bt_open(const char *, int, int, const BTREEINFO *, int);
+DB *__hash_open(const char *, int, int, const HASHINFO *, int);
+DB *__rec_open(const char *, int, int, const RECNOINFO *, int);
+void __dbpanic(DB *dbp);
#endif
__END_DECLS
#endif /* !_DB_H_ */
diff --git a/include/dirent.h b/include/dirent.h
index 191ed358f1c8..c0dd4a0c5ae1 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -87,20 +87,20 @@ typedef struct _dirdesc {
#include <sys/cdefs.h>
__BEGIN_DECLS
-DIR *opendir __P((const char *));
-struct dirent *readdir __P((DIR *));
-void rewinddir __P((DIR *));
-int closedir __P((DIR *));
+DIR *opendir(const char *);
+struct dirent *readdir(DIR *);
+void rewinddir(DIR *);
+int closedir(DIR *);
#ifndef _POSIX_SOURCE
-DIR *__opendir2 __P((const char *, int));
-long telldir __P((DIR *));
-void seekdir __P((DIR *, long));
-int scandir __P((const char *, struct dirent ***,
- int (*)(struct dirent *), int (*)(const void *, const void *)));
-int alphasort __P((const void *, const void *));
-int getdents __P((int, char *, int));
-int getdirentries __P((int, char *, int, long *));
-int readdir_r __P((DIR *, struct dirent *, struct dirent **));
+DIR *__opendir2(const char *, int);
+long telldir(DIR *);
+void seekdir(DIR *, long);
+int scandir(const char *, struct dirent ***,
+ int (*)(struct dirent *), int (*)(const void *, const void *));
+int alphasort(const void *, const void *);
+int getdents(int, char *, int);
+int getdirentries(int, char *, int, long *);
+int readdir_r(DIR *, struct dirent *, struct dirent **);
#endif /* not POSIX */
__END_DECLS
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 5034a36b072c..13fd6845ffa5 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -64,18 +64,18 @@ typedef struct dl_info {
} Dl_info;
__BEGIN_DECLS
-int dladdr __P((const void *, Dl_info *));
-int dlclose __P((void *));
-const char *dlerror __P((void));
-void dllockinit __P((void *_context,
- void *(*_lock_create)(void *_context),
- void (*_rlock_acquire)(void *_lock),
- void (*_wlock_acquire)(void *_lock),
- void (*_lock_release)(void *_lock),
- void (*_lock_destroy)(void *_lock),
- void (*_context_destroy)(void *_context)));
-void *dlopen __P((const char *, int));
-void *dlsym __P((void *, const char *));
+int dladdr(const void *, Dl_info *);
+int dlclose(void *);
+const char *dlerror(void);
+void dllockinit(void *_context,
+ void *(*_lock_create)(void *_context),
+ void (*_rlock_acquire)(void *_lock),
+ void (*_wlock_acquire)(void *_lock),
+ void (*_lock_release)(void *_lock),
+ void (*_lock_destroy)(void *_lock),
+ void (*_context_destroy)(void *_context));
+void *dlopen(const char *, int);
+void *dlsym(void *, const char *);
__END_DECLS
#endif /* !_DLFCN_H_ */
diff --git a/include/err.h b/include/err.h
index ed8f6174fdd9..8248fd542332 100644
--- a/include/err.h
+++ b/include/err.h
@@ -48,23 +48,23 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-void err __P((int, const char *, ...)) __dead2 __printf0like(2, 3);
-void verr __P((int, const char *, _BSD_VA_LIST_)) __dead2
+void err(int, const char *, ...) __dead2 __printf0like(2, 3);
+void verr(int, const char *, _BSD_VA_LIST_) __dead2
__printf0like(2, 0);
-void errc __P((int, int, const char *, ...)) __dead2 __printf0like(3, 4);
-void verrc __P((int, int, const char *, _BSD_VA_LIST_)) __dead2
+void errc(int, int, const char *, ...) __dead2 __printf0like(3, 4);
+void verrc(int, int, const char *, _BSD_VA_LIST_) __dead2
__printf0like(3, 0);
-void errx __P((int, const char *, ...)) __dead2 __printf0like(2, 3);
-void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead2
+void errx(int, const char *, ...) __dead2 __printf0like(2, 3);
+void verrx(int, const char *, _BSD_VA_LIST_) __dead2
__printf0like(2, 0);
-void warn __P((const char *, ...)) __printf0like(1, 2);
-void vwarn __P((const char *, _BSD_VA_LIST_)) __printf0like(1, 0);
-void warnc __P((int, const char *, ...)) __printf0like(2, 3);
-void vwarnc __P((int, const char *, _BSD_VA_LIST_)) __printf0like(2, 0);
-void warnx __P((const char *, ...)) __printflike(1, 2);
-void vwarnx __P((const char *, _BSD_VA_LIST_)) __printflike(1, 0);
-void err_set_file __P((void *));
-void err_set_exit __P((void (*)(int)));
+void warn(const char *, ...) __printf0like(1, 2);
+void vwarn(const char *, _BSD_VA_LIST_) __printf0like(1, 0);
+void warnc(int, const char *, ...) __printf0like(2, 3);
+void vwarnc(int, const char *, _BSD_VA_LIST_) __printf0like(2, 0);
+void warnx(const char *, ...) __printflike(1, 2);
+void vwarnx(const char *, _BSD_VA_LIST_) __printflike(1, 0);
+void err_set_file(void *);
+void err_set_exit(void (*)(int));
__END_DECLS
#endif /* !_ERR_H_ */
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 49102b34b80d..9b74456742da 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-int fnmatch __P((const char *, const char *, int));
+int fnmatch(const char *, const char *, int);
__END_DECLS
#endif /* !_FNMATCH_H_ */
diff --git a/include/fstab.h b/include/fstab.h
index c2bb06a1a139..a269d420a3a8 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -31,6 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fstab.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _FSTAB_H_
@@ -69,11 +70,11 @@ struct fstab {
#include <sys/cdefs.h>
__BEGIN_DECLS
-struct fstab *getfsent __P((void));
-struct fstab *getfsspec __P((const char *));
-struct fstab *getfsfile __P((const char *));
-int setfsent __P((void));
-void endfsent __P((void));
+struct fstab *getfsent(void);
+struct fstab *getfsspec(const char *);
+struct fstab *getfsfile(const char *);
+int setfsent(void);
+void endfsent(void);
__END_DECLS
#endif /* !_FSTAB_H_ */
diff --git a/include/fts.h b/include/fts.h
index 62e2254f2918..36356569e96f 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -47,7 +47,7 @@ typedef struct {
int fts_pathlen; /* sizeof(path) */
int fts_nitems; /* elements in the sort array */
int (*fts_compar) /* compare function */
- __P((const struct _ftsent **, const struct _ftsent **));
+(const struct _ftsent **, const struct _ftsent **);
#define FTS_COMFOLLOW 0x001 /* follow command line symlinks */
#define FTS_LOGICAL 0x002 /* logical walk */
@@ -119,12 +119,12 @@ typedef struct _ftsent {
#include <sys/cdefs.h>
__BEGIN_DECLS
-FTSENT *fts_children __P((FTS *, int));
-int fts_close __P((FTS *));
-FTS *fts_open __P((char * const *, int,
- int (*)(const FTSENT **, const FTSENT **)));
-FTSENT *fts_read __P((FTS *));
-int fts_set __P((FTS *, FTSENT *, int));
+FTSENT *fts_children(FTS *, int);
+int fts_close(FTS *);
+FTS *fts_open(char * const *, int,
+ int (*)(const FTSENT **, const FTSENT **));
+FTSENT *fts_read(FTS *);
+int fts_set(FTS *, FTSENT *, int);
__END_DECLS
#endif /* !_FTS_H_ */
diff --git a/include/glob.h b/include/glob.h
index cd49ea8d82bd..d59db3b799e0 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -50,18 +50,18 @@ typedef struct {
int gl_flags; /* Copy of flags parameter to glob. */
char **gl_pathv; /* List of paths matching pattern. */
/* Copy of errfunc parameter to glob. */
- int (*gl_errfunc) __P((const char *, int));
+ int (*gl_errfunc)(const char *, int);
/*
* Alternate filesystem access methods for glob; replacement
* versions of closedir(3), readdir(3), opendir(3), stat(2)
* and lstat(2).
*/
- void (*gl_closedir) __P((void *));
- struct dirent *(*gl_readdir) __P((void *));
- void *(*gl_opendir) __P((const char *));
- int (*gl_lstat) __P((const char *, struct stat *));
- int (*gl_stat) __P((const char *, struct stat *));
+ void (*gl_closedir)(void *);
+ struct dirent *(*gl_readdir)(void *);
+ void *(*gl_opendir)(const char *);
+ int (*gl_lstat)(const char *, struct stat *);
+ int (*gl_stat)(const char *, struct stat *);
} glob_t;
#define GLOB_APPEND 0x0001 /* Append to output from previous call. */
@@ -86,8 +86,8 @@ typedef struct {
#define GLOB_ABEND (-2) /* Unignored error. */
__BEGIN_DECLS
-int glob __P((const char *, int, int (*)(const char *, int), glob_t *));
-void globfree __P((glob_t *));
+int glob(const char *, int, int (*)(const char *, int), glob_t *);
+void globfree(glob_t *);
__END_DECLS
#endif /* !_GLOB_H_ */
diff --git a/include/grp.h b/include/grp.h
index e8a0702af452..3919c0504811 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -62,15 +62,15 @@ struct group {
};
__BEGIN_DECLS
-struct group *getgrgid __P((gid_t));
-struct group *getgrnam __P((const char *));
+struct group *getgrgid(gid_t);
+struct group *getgrnam(const char *);
#ifndef _POSIX_SOURCE
-struct group *getgrent __P((void));
-int setgrent __P((void));
-void endgrent __P((void));
-void setgrfile __P((const char *));
-int setgroupent __P((int));
-const char *group_from_gid __P((gid_t, int));
+struct group *getgrent(void);
+int setgrent(void);
+void endgrent(void);
+void setgrfile(const char *);
+int setgroupent(int);
+const char *group_from_gid(gid_t, int);
#endif
__END_DECLS
diff --git a/include/hesiod.h b/include/hesiod.h
index e2a608f956c4..4b5d42f7d302 100644
--- a/include/hesiod.h
+++ b/include/hesiod.h
@@ -81,18 +81,18 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-int hesiod_init __P((void **));
-char **hesiod_resolve __P((void *, const char *, const char *));
-void hesiod_free_list __P((void *, char **));
-char *hesiod_to_bind __P((void *, const char *, const char *));
-void hesiod_end __P((void *));
+int hesiod_init(void **);
+char **hesiod_resolve(void *, const char *, const char *);
+void hesiod_free_list(void *, char **);
+char *hesiod_to_bind(void *, const char *, const char *);
+void hesiod_end(void *);
/* backwards compatibility */
-int hes_init __P((void));
-char *hes_to_bind __P((const char *, const char *));
-char **hes_resolve __P((const char *, const char *));
-int hes_error __P((void));
-void hes_free __P((char **));
+int hes_init(void);
+char *hes_to_bind(const char *, const char *);
+char **hes_resolve(const char *, const char *);
+int hes_error(void);
+void hes_free(char **);
__END_DECLS
#endif /* ! _HESIOD_H_ */
diff --git a/include/ieeefp.h b/include/ieeefp.h
index d439efa3575a..24ebdf40388e 100644
--- a/include/ieeefp.h
+++ b/include/ieeefp.h
@@ -16,12 +16,12 @@
#include <machine/floatingpoint.h>
#else /* !__i386__ */
__BEGIN_DECLS
-extern fp_rnd_t fpgetround __P((void));
-extern fp_rnd_t fpsetround __P((fp_rnd_t));
-extern fp_except_t fpgetmask __P((void));
-extern fp_except_t fpsetmask __P((fp_except_t));
-extern fp_except_t fpgetsticky __P((void));
-extern fp_except_t fpsetsticky __P((fp_except_t));
+extern fp_rnd_t fpgetround(void);
+extern fp_rnd_t fpsetround(fp_rnd_t);
+extern fp_except_t fpgetmask(void);
+extern fp_except_t fpsetmask(fp_except_t);
+extern fp_except_t fpgetsticky(void);
+extern fp_except_t fpsetsticky(fp_except_t);
__END_DECLS
#endif /* __i386__ */
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index 6ebf288c2733..dfbf0dee2593 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -49,8 +49,8 @@ struct ifaddrs {
#include <sys/cdefs.h>
__BEGIN_DECLS
-extern int getifaddrs __P((struct ifaddrs **));
-extern void freeifaddrs __P((struct ifaddrs *));
+extern int getifaddrs(struct ifaddrs **);
+extern void freeifaddrs(struct ifaddrs *);
__END_DECLS
#endif
diff --git a/include/langinfo.h b/include/langinfo.h
index 25e88b60e394..97904324e69f 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -105,7 +105,7 @@
#define D_MD_ORDER 57 /* month/day order (local extension) */
__BEGIN_DECLS
-char *nl_langinfo __P((nl_item));
+char *nl_langinfo(nl_item);
__END_DECLS
#endif /* !_LANGINFO_H_ */
diff --git a/include/libgen.h b/include/libgen.h
index eb9d809cdea7..3639c712b9fa 100644
--- a/include/libgen.h
+++ b/include/libgen.h
@@ -35,11 +35,11 @@
__BEGIN_DECLS
-char *basename __P((const char *));
-char *dirname __P((const char *));
+char *basename(const char *);
+char *dirname(const char *);
#if 0
-char *regcmp __P((const char *, ...));
-char *regex __P((const char *, const char *, ...));
+char *regcmp(const char *, ...);
+char *regex(const char *, const char *, ...);
extern char *__loc1;
#endif
diff --git a/include/link.h b/include/link.h
index 9d652e252901..6222bafc969b 100644
--- a/include/link.h
+++ b/include/link.h
@@ -196,14 +196,13 @@ struct so_debug {
* to crt0.
*/
struct ld_entry {
- void *(*dlopen) __P((const char *, int)); /* NONE */
- int (*dlclose) __P((void *)); /* NONE */
- void *(*dlsym) __P((void *, const char *)); /* NONE */
- const char *(*dlerror) __P((void)); /* NONE */
- void (*dlexit) __P((void)); /* HAS_DLEXIT */
- void *(*dlsym3) __P((void *, const char *, void *)); /* HAS_DLSYM3 */
- int (*dladdr) __P((const void *,
- struct dl_info *)); /* HAS_DLADDR */
+ void *(*dlopen)(const char *, int); /* NONE */
+ int (*dlclose)(void *); /* NONE */
+ void *(*dlsym)(void *, const char *); /* NONE */
+ const char *(*dlerror)(void); /* NONE */
+ void (*dlexit)(void); /* HAS_DLEXIT */
+ void *(*dlsym3)(void *, const char *, void *); /* HAS_DLSYM3 */
+ int (*dladdr)(const void *, struct dl_info *); /* HAS_DLADDR */
};
/*
diff --git a/include/locale.h b/include/locale.h
index 0c1a6bcc35b0..8b6ad4d65c74 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -31,6 +31,7 @@
* SUCH DAMAGE.
*
* @(#)locale.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _LOCALE_H_
@@ -74,8 +75,8 @@ struct lconv {
#include <sys/cdefs.h>
__BEGIN_DECLS
-struct lconv *localeconv __P((void));
-char *setlocale __P((int, const char *));
+struct lconv *localeconv(void);
+char *setlocale(int, const char *);
__END_DECLS
#endif /* _LOCALE_H_ */
diff --git a/include/math.h b/include/math.h
index 51cfe86db547..53ea709cbf0a 100644
--- a/include/math.h
+++ b/include/math.h
@@ -64,59 +64,59 @@
* in the (broken) BSD libm, so they not declared as __pure2.
*/
__BEGIN_DECLS
-double acos __P((double));
-double asin __P((double));
-double atan __P((double));
-double atan2 __P((double, double));
-double ceil __P((double));
-double cos __P((double));
-double cosh __P((double));
-double exp __P((double));
-double fabs __P((double));
-double floor __P((double));
-double fmod __P((double, double));
-double frexp __P((double, int *)); /* fundamentally !__pure2 */
-double ldexp __P((double, int));
-double log __P((double));
-double log10 __P((double));
-double modf __P((double, double *)); /* fundamentally !__pure2 */
-double pow __P((double, double));
-double sin __P((double));
-double sinh __P((double));
-double sqrt __P((double));
-double tan __P((double));
-double tanh __P((double));
+double acos(double);
+double asin(double);
+double atan(double);
+double atan2(double, double);
+double ceil(double);
+double cos(double);
+double cosh(double);
+double exp(double);
+double fabs(double);
+double floor(double);
+double fmod(double, double);
+double frexp(double, int *); /* fundamentally !__pure2 */
+double ldexp(double, int);
+double log(double);
+double log10(double);
+double modf(double, double *); /* fundamentally !__pure2 */
+double pow(double, double);
+double sin(double);
+double sinh(double);
+double sqrt(double);
+double tan(double);
+double tanh(double);
/*
* These functions are non-ANSI so they can be "right". The ones that
* don't set errno in [lib]msun are declared as __pure2.
*/
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-double acosh __P((double));
-double asinh __P((double));
-double atanh __P((double));
+double acosh(double);
+double asinh(double);
+double atanh(double);
double cabs(); /* we can't describe cabs()'s argument properly */
-double cbrt __P((double)) __pure2;
-double copysign __P((double, double)) __pure2;
-double drem __P((double, double));
-double erf __P((double));
-double erfc __P((double)) __pure2;
-double expm1 __P((double)) __pure2;
-int finite __P((double)) __pure2;
-double hypot __P((double, double));
-int isinf __P((double)) __pure2;
-int isnan __P((double)) __pure2;
-double j0 __P((double));
-double j1 __P((double));
-double jn __P((int, double));
-double lgamma __P((double));
-double log1p __P((double)) __pure2;
-double logb __P((double)) __pure2;
-double rint __P((double)) __pure2;
-double scalb __P((double, int));
-double y0 __P((double));
-double y1 __P((double));
-double yn __P((int, double));
+double cbrt(double) __pure2;
+double copysign(double, double) __pure2;
+double drem(double, double);
+double erf(double);
+double erfc(double) __pure2;
+double expm1(double) __pure2;
+int finite(double) __pure2;
+double hypot(double, double);
+int isinf(double) __pure2;
+int isnan(double) __pure2;
+double j0(double);
+double j1(double);
+double jn(int, double);
+double lgamma(double);
+double log1p(double) __pure2;
+double logb(double) __pure2;
+double rint(double) __pure2;
+double scalb(double, int);
+double y0(double);
+double y1(double);
+double yn(int, double);
#endif
__END_DECLS
diff --git a/include/mpool.h b/include/mpool.h
index 1adf60d5383b..b5be330a0cc5 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -71,9 +71,9 @@ typedef struct MPOOL {
u_long pagesize; /* file page size */
int fd; /* file descriptor */
/* page in conversion routine */
- void (*pgin) __P((void *, pgno_t, void *));
+ void (*pgin)(void *, pgno_t, void *);
/* page out conversion routine */
- void (*pgout) __P((void *, pgno_t, void *));
+ void (*pgout)(void *, pgno_t, void *);
void *pgcookie; /* cookie for page in/out routines */
#ifdef STATISTICS
u_long cachehit;
@@ -89,16 +89,16 @@ typedef struct MPOOL {
} MPOOL;
__BEGIN_DECLS
-MPOOL *mpool_open __P((void *, int, pgno_t, pgno_t));
-void mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *),
- void (*)(void *, pgno_t, void *), void *));
-void *mpool_new __P((MPOOL *, pgno_t *));
-void *mpool_get __P((MPOOL *, pgno_t, u_int));
-int mpool_put __P((MPOOL *, void *, u_int));
-int mpool_sync __P((MPOOL *));
-int mpool_close __P((MPOOL *));
+MPOOL *mpool_open(void *, int, pgno_t, pgno_t);
+void mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
+ void (*)(void *, pgno_t, void *), void *);
+void *mpool_new(MPOOL *, pgno_t *);
+void *mpool_get(MPOOL *, pgno_t, u_int);
+int mpool_put(MPOOL *, void *, u_int);
+int mpool_sync(MPOOL *);
+int mpool_close(MPOOL *);
#ifdef STATISTICS
-void mpool_stat __P((MPOOL *));
+void mpool_stat(MPOOL *);
#endif
__END_DECLS
diff --git a/include/ndbm.h b/include/ndbm.h
index d5a9ae2ae80c..e144ba816a46 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -34,6 +34,7 @@
* SUCH DAMAGE.
*
* @(#)ndbm.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _NDBM_H_
@@ -63,17 +64,17 @@ typedef DB DBM;
#define dbm_pagfno(a) DBM_PAGFNO_NOT_AVAILABLE
__BEGIN_DECLS
-int dbm_clearerr __P((DBM *));
-void dbm_close __P((DBM *));
-int dbm_delete __P((DBM *, datum));
-int dbm_error __P((DBM *));
-datum dbm_fetch __P((DBM *, datum));
-datum dbm_firstkey __P((DBM *));
-long dbm_forder __P((DBM *, datum));
-datum dbm_nextkey __P((DBM *));
-DBM *dbm_open __P((const char *, int, int));
-int dbm_store __P((DBM *, datum, datum, int));
-int dbm_dirfno __P((DBM *));
+int dbm_clearerr(DBM *);
+void dbm_close(DBM *);
+int dbm_delete(DBM *, datum);
+int dbm_error(DBM *);
+datum dbm_fetch(DBM *, datum);
+datum dbm_firstkey(DBM *);
+long dbm_forder(DBM *, datum);
+datum dbm_nextkey(DBM *);
+DBM *dbm_open(const char *, int, int);
+int dbm_store(DBM *, datum, datum, int);
+int dbm_dirfno(DBM *);
__END_DECLS
#endif /* !_NDBM_H_ */
diff --git a/include/netconfig.h b/include/netconfig.h
index 491a3ffb3340..80dc0da2738f 100644
--- a/include/netconfig.h
+++ b/include/netconfig.h
@@ -79,18 +79,18 @@ typedef struct {
#define NC_ICMP "icmp"
__BEGIN_DECLS
-void *setnetconfig __P((void));
-struct netconfig *getnetconfig __P((void *));
-struct netconfig *getnetconfigent __P((const char *));
-void freenetconfigent __P((struct netconfig *));
-int endnetconfig __P((void *));
+void *setnetconfig(void);
+struct netconfig *getnetconfig(void *);
+struct netconfig *getnetconfigent(const char *);
+void freenetconfigent(struct netconfig *);
+int endnetconfig(void *);
-void *setnetpath __P((void));
-struct netconfig *getnetpath __P((void *));
+void *setnetpath(void);
+struct netconfig *getnetpath(void *);
int endnetpath(void *);
-void nc_perror __P((const char *));
-char *nc_sperror __P((void));
+void nc_perror(const char *);
+char *nc_sperror(void);
__END_DECLS
#endif /* _NETCONFIG_H_ */
diff --git a/include/netdb.h b/include/netdb.h
index f7fb1aa05594..123ecb985c1e 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -203,62 +203,61 @@ struct addrinfo {
#define SCOPE_DELIMITER '%'
__BEGIN_DECLS
-void endhostent __P((void));
-void endnetent __P((void));
-void endnetgrent __P((void));
-void endprotoent __P((void));
-void endservent __P((void));
-void freehostent __P((struct hostent *));
-struct hostent *gethostbyaddr __P((const char *, int, int));
-struct hostent *gethostbyname __P((const char *));
-struct hostent *gethostbyname2 __P((const char *, int));
-struct hostent *gethostent __P((void));
-struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
-struct hostent *getipnodebyname __P((const char *, int, int, int *));
-struct netent *getnetbyaddr __P((unsigned long, int));
-struct netent *getnetbyname __P((const char *));
-struct netent *getnetent __P((void));
-int getnetgrent __P((char **, char **, char **));
-struct protoent *getprotobyname __P((const char *));
-struct protoent *getprotobynumber __P((int));
-struct protoent *getprotoent __P((void));
-struct servent *getservbyname __P((const char *, const char *));
-struct servent *getservbyport __P((int, const char *));
-struct servent *getservent __P((void));
-void herror __P((const char *));
-__const char *hstrerror __P((int));
-int innetgr __P((const char *, const char *, const char *,
- const char *));
-void sethostent __P((int));
-/* void sethostfile __P((const char *)); */
-void setnetent __P((int));
-void setprotoent __P((int));
-int getaddrinfo __P((const char *, const char *,
- const struct addrinfo *, struct addrinfo **));
-int getnameinfo __P((const struct sockaddr *, socklen_t, char *,
- size_t, char *, size_t, int));
-void freeaddrinfo __P((struct addrinfo *));
-char *gai_strerror __P((int));
-void setnetgrent __P((const char *));
-void setservent __P((int));
+void endhostent(void);
+void endnetent(void);
+void endnetgrent(void);
+void endprotoent(void);
+void endservent(void);
+void freehostent(struct hostent *);
+struct hostent *gethostbyaddr(const char *, int, int);
+struct hostent *gethostbyname(const char *);
+struct hostent *gethostbyname2(const char *, int);
+struct hostent *gethostent(void);
+struct hostent *getipnodebyaddr(const void *, size_t, int, int *);
+struct hostent *getipnodebyname(const char *, int, int, int *);
+struct netent *getnetbyaddr(unsigned long, int);
+struct netent *getnetbyname(const char *);
+struct netent *getnetent(void);
+int getnetgrent(char **, char **, char **);
+struct protoent *getprotobyname(const char *);
+struct protoent *getprotobynumber(int);
+struct protoent *getprotoent(void);
+struct servent *getservbyname(const char *, const char *);
+struct servent *getservbyport(int, const char *);
+struct servent *getservent(void);
+void herror(const char *);
+__const char *hstrerror(int);
+int innetgr(const char *, const char *, const char *, const char *);
+void sethostent(int);
+/* void sethostfile(const char *); */
+void setnetent(int);
+void setprotoent(int);
+int getaddrinfo(const char *, const char *,
+ const struct addrinfo *, struct addrinfo **);
+int getnameinfo(const struct sockaddr *, socklen_t, char *,
+ size_t, char *, size_t, int);
+void freeaddrinfo(struct addrinfo *);
+char *gai_strerror(int);
+void setnetgrent(const char *);
+void setservent(int);
/*
* PRIVATE functions specific to the FreeBSD implementation
*/
/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-void _sethosthtent __P((int));
-void _endhosthtent __P((void));
-void _sethostdnsent __P((int));
-void _endhostdnsent __P((void));
-void _setnethtent __P((int));
-void _endnethtent __P((void));
-void _setnetdnsent __P((int));
-void _endnetdnsent __P((void));
-struct hostent * _gethostbynisname __P((const char *, int));
-struct hostent * _gethostbynisaddr __P((const char *, int, int));
-void _map_v4v6_address __P((const char *, char *));
-void _map_v4v6_hostent __P((struct hostent *, char **, int *));
+void _sethosthtent(int);
+void _endhosthtent(void);
+void _sethostdnsent(int);
+void _endhostdnsent(void);
+void _setnethtent(int);
+void _endnethtent(void);
+void _setnetdnsent(int);
+void _endnetdnsent(void);
+struct hostent * _gethostbynisname(const char *, int);
+struct hostent * _gethostbynisaddr(const char *, int, int);
+void _map_v4v6_address(const char *, char *);
+void _map_v4v6_hostent(struct hostent *, char **, int *);
__END_DECLS
#endif /* !_NETDB_H_ */
diff --git a/include/nl_types.h b/include/nl_types.h
index 7691b14e6933..afd7f9f5f824 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -43,9 +43,9 @@ typedef int nl_item;
typedef void *nl_catd;
__BEGIN_DECLS
-extern nl_catd catopen __P((__const char *, int));
-extern char *catgets __P((nl_catd, int, int, __const char *));
-extern int catclose __P((nl_catd));
+extern nl_catd catopen(__const char *, int);
+extern char *catgets(nl_catd, int, int, __const char *);
+extern int catclose(nl_catd);
__END_DECLS
#endif /* _NL_TYPES_H_ */
diff --git a/include/nlist.h b/include/nlist.h
index 560563abf1a1..9dfd90ab8357 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -115,7 +115,7 @@ struct nlist {
#include <sys/cdefs.h>
__BEGIN_DECLS
-int nlist __P((const char *, struct nlist *));
+int nlist(const char *, struct nlist *);
__END_DECLS
#endif /* !_NLIST_H_ */
diff --git a/include/nsswitch.h b/include/nsswitch.h
index ee9f89ac5121..74e5a909aa2a 100644
--- a/include/nsswitch.h
+++ b/include/nsswitch.h
@@ -42,11 +42,7 @@
#include <sys/types.h>
-#if __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifndef _PATH_NS_CONF
#define _PATH_NS_CONF "/etc/nsswitch.conf"
@@ -170,16 +166,16 @@ typedef struct {
#include <sys/cdefs.h>
__BEGIN_DECLS
-extern int nsdispatch __P((void *, const ns_dtab [], const char *,
- const char *, const ns_src [], ...));
+extern int nsdispatch(void *, const ns_dtab [], const char *,
+ const char *, const ns_src [], ...);
#ifdef _NS_PRIVATE
-extern void _nsdbtaddsrc __P((ns_dbt *, const ns_src *));
-extern void _nsdbtdump __P((const ns_dbt *));
-extern const ns_dbt *_nsdbtget __P((const char *));
-extern void _nsdbtput __P((const ns_dbt *));
-extern void _nsyyerror __P((const char *));
-extern int _nsyylex __P((void));
+extern void _nsdbtaddsrc(ns_dbt *, const ns_src *);
+extern void _nsdbtdump(const ns_dbt *);
+extern const ns_dbt *_nsdbtget(const char *);
+extern void _nsdbtput(const ns_dbt *);
+extern void _nsyyerror(const char *);
+extern int _nsyylex(void);
extern int _nsyylineno;
#endif /* _NS_PRIVATE */
diff --git a/include/paths.h b/include/paths.h
index ea4fd1dfc49b..88176c9e204f 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -79,7 +79,7 @@
/* How to get the correct name of the kernel. */
__BEGIN_DECLS
-const char *getbootfile __P((void));
+const char *getbootfile(void);
__END_DECLS
#endif /* !_PATHS_H_ */
diff --git a/include/pthread.h b/include/pthread.h
index ec11d6fe0578..c48654ac6f47 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -121,7 +121,7 @@ typedef struct pthread_rwlockattr *pthread_rwlockattr_t;
* use in header symbols.
*/
typedef void *pthread_addr_t;
-typedef void *(*pthread_startroutine_t) __P((void *));
+typedef void *(*pthread_startroutine_t)(void *);
/*
* Once definitions.
@@ -189,124 +189,113 @@ enum pthread_mutextype {
* Thread function prototype definitions:
*/
__BEGIN_DECLS
-int pthread_attr_destroy __P((pthread_attr_t *));
-int pthread_attr_getstacksize __P((const pthread_attr_t *,
- size_t *));
-int pthread_attr_getguardsize __P((const pthread_attr_t *,
- size_t *));
-int pthread_attr_getstackaddr __P((const pthread_attr_t *,
- void **));
-int pthread_attr_getdetachstate __P((const pthread_attr_t *,
- int *));
-int pthread_attr_init __P((pthread_attr_t *));
-int pthread_attr_setstacksize __P((pthread_attr_t *, size_t));
-int pthread_attr_setguardsize __P((pthread_attr_t *, size_t));
-int pthread_attr_setstackaddr __P((pthread_attr_t *, void *));
-int pthread_attr_setdetachstate __P((pthread_attr_t *, int));
-void pthread_cleanup_pop __P((int));
-void pthread_cleanup_push __P((void (*) (void *),
- void *routine_arg));
-int pthread_condattr_destroy __P((pthread_condattr_t *));
-int pthread_condattr_init __P((pthread_condattr_t *));
+int pthread_attr_destroy(pthread_attr_t *);
+int pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
+int pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int pthread_attr_getstackaddr(const pthread_attr_t *, void **);
+int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
+int pthread_attr_init(pthread_attr_t *);
+int pthread_attr_setstacksize(pthread_attr_t *, size_t);
+int pthread_attr_setguardsize(pthread_attr_t *, size_t);
+int pthread_attr_setstackaddr(pthread_attr_t *, void *);
+int pthread_attr_setdetachstate(pthread_attr_t *, int);
+void pthread_cleanup_pop(int);
+void pthread_cleanup_push(void (*) (void *), void *routine_arg);
+int pthread_condattr_destroy(pthread_condattr_t *);
+int pthread_condattr_init(pthread_condattr_t *);
#if defined(_POSIX_THREAD_PROCESS_SHARED)
-int pthread_condattr_getpshared __P((pthread_condattr_t *,
- int *));
-int pthread_condattr_setpshared __P((pthread_condattr_t *,
- int));
+int pthread_condattr_getpshared(pthread_condattr_t *, int *);
+int pthread_condattr_setpshared(pthread_condattr_t *, int);
#endif
-int pthread_cond_broadcast __P((pthread_cond_t *));
-int pthread_cond_destroy __P((pthread_cond_t *));
-int pthread_cond_init __P((pthread_cond_t *,
- const pthread_condattr_t *));
-int pthread_cond_signal __P((pthread_cond_t *));
-int pthread_cond_timedwait __P((pthread_cond_t *,
- pthread_mutex_t *, const struct timespec *));
-int pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *));
-int pthread_create __P((pthread_t *, const pthread_attr_t *,
- void *(*) (void *), void *));
-int pthread_detach __P((pthread_t));
-int pthread_equal __P((pthread_t, pthread_t));
-void pthread_exit __P((void *)) __dead2;
-void *pthread_getspecific __P((pthread_key_t));
-int pthread_join __P((pthread_t, void **));
-int pthread_key_create __P((pthread_key_t *,
- void (*) (void *)));
-int pthread_key_delete __P((pthread_key_t));
-int pthread_kill __P((pthread_t, int));
-int pthread_mutexattr_init __P((pthread_mutexattr_t *));
-int pthread_mutexattr_destroy __P((pthread_mutexattr_t *));
-int pthread_mutexattr_gettype __P((pthread_mutexattr_t *, int *));
-int pthread_mutexattr_settype __P((pthread_mutexattr_t *, int));
-int pthread_mutex_destroy __P((pthread_mutex_t *));
-int pthread_mutex_init __P((pthread_mutex_t *,
- const pthread_mutexattr_t *));
-int pthread_mutex_lock __P((pthread_mutex_t *));
-int pthread_mutex_trylock __P((pthread_mutex_t *));
-int pthread_mutex_unlock __P((pthread_mutex_t *));
-int pthread_once __P((pthread_once_t *,
- void (*) (void)));
-int pthread_rwlock_destroy __P((pthread_rwlock_t *));
-int pthread_rwlock_init __P((pthread_rwlock_t *,
- const pthread_rwlockattr_t *));
-int pthread_rwlock_rdlock __P((pthread_rwlock_t *));
-int pthread_rwlock_tryrdlock __P((pthread_rwlock_t *));
-int pthread_rwlock_trywrlock __P((pthread_rwlock_t *));
-int pthread_rwlock_unlock __P((pthread_rwlock_t *));
-int pthread_rwlock_wrlock __P((pthread_rwlock_t *));
-int pthread_rwlockattr_init __P((pthread_rwlockattr_t *));
-int pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
- int *));
-int pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
- int));
-int pthread_rwlockattr_destroy __P((pthread_rwlockattr_t *));
-pthread_t pthread_self __P((void));
-int pthread_setspecific __P((pthread_key_t, const void *));
-int pthread_sigmask __P((int, const sigset_t *, sigset_t *));
+int pthread_cond_broadcast(pthread_cond_t *);
+int pthread_cond_destroy(pthread_cond_t *);
+int pthread_cond_init(pthread_cond_t *,
+ const pthread_condattr_t *);
+int pthread_cond_signal(pthread_cond_t *);
+int pthread_cond_timedwait(pthread_cond_t *,
+ pthread_mutex_t *, const struct timespec *);
+int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
+int pthread_create(pthread_t *, const pthread_attr_t *,
+ void *(*) (void *), void *);
+int pthread_detach(pthread_t);
+int pthread_equal(pthread_t, pthread_t);
+void pthread_exit(void *) __dead2;
+void *pthread_getspecific(pthread_key_t);
+int pthread_join(pthread_t, void **);
+int pthread_key_create(pthread_key_t *,
+ void (*) (void *));
+int pthread_key_delete(pthread_key_t);
+int pthread_kill(pthread_t, int);
+int pthread_mutexattr_init(pthread_mutexattr_t *);
+int pthread_mutexattr_destroy(pthread_mutexattr_t *);
+int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
+int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
+int pthread_mutex_destroy(pthread_mutex_t *);
+int pthread_mutex_init(pthread_mutex_t *,
+ const pthread_mutexattr_t *);
+int pthread_mutex_lock(pthread_mutex_t *);
+int pthread_mutex_trylock(pthread_mutex_t *);
+int pthread_mutex_unlock(pthread_mutex_t *);
+int pthread_once(pthread_once_t *, void (*) (void));
+int pthread_rwlock_destroy(pthread_rwlock_t *);
+int pthread_rwlock_init(pthread_rwlock_t *,
+ const pthread_rwlockattr_t *);
+int pthread_rwlock_rdlock(pthread_rwlock_t *);
+int pthread_rwlock_tryrdlock(pthread_rwlock_t *);
+int pthread_rwlock_trywrlock(pthread_rwlock_t *);
+int pthread_rwlock_unlock(pthread_rwlock_t *);
+int pthread_rwlock_wrlock(pthread_rwlock_t *);
+int pthread_rwlockattr_init(pthread_rwlockattr_t *);
+int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
+ int *);
+int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
+int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
+pthread_t pthread_self(void);
+int pthread_setspecific(pthread_key_t, const void *);
+int pthread_sigmask(int, const sigset_t *, sigset_t *);
-int pthread_cancel __P((pthread_t));
-int pthread_setcancelstate __P((int, int *));
-int pthread_setcanceltype __P((int, int *));
-void pthread_testcancel __P((void));
+int pthread_cancel(pthread_t);
+int pthread_setcancelstate(int, int *);
+int pthread_setcanceltype(int, int *);
+void pthread_testcancel(void);
-int pthread_getprio __P((pthread_t));
-int pthread_setprio __P((pthread_t, int));
-void pthread_yield __P((void));
+int pthread_getprio(pthread_t);
+int pthread_setprio(pthread_t, int);
+void pthread_yield(void);
#if defined(_POSIX_THREAD_PROCESS_SHARED)
-int pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
- int *pshared));
-int pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
- int pshared));
+int pthread_mutexattr_getpshared(pthread_mutexattr_t *,
+ int *pshared);
+int pthread_mutexattr_setpshared(pthread_mutexattr_t *,
+ int pshared);
#endif
-int pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
- int *));
-int pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
- int));
-int pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *));
-int pthread_mutex_setprioceiling __P((pthread_mutex_t *, int, int *));
+int pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
+ int *);
+int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
+ int);
+int pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
+int pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
-int pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
- int *));
-int pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
- int));
+int pthread_mutexattr_getprotocol(pthread_mutexattr_t *, int *);
+int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
-int pthread_attr_getinheritsched __P((const pthread_attr_t *, int *));
-int pthread_attr_getschedparam __P((const pthread_attr_t *,
- struct sched_param *));
-int pthread_attr_getschedpolicy __P((const pthread_attr_t *, int *));
-int pthread_attr_getscope __P((const pthread_attr_t *, int *));
-int pthread_attr_setinheritsched __P((pthread_attr_t *, int));
-int pthread_attr_setschedparam __P((pthread_attr_t *,
- const struct sched_param *));
-int pthread_attr_setschedpolicy __P((pthread_attr_t *, int));
-int pthread_attr_setscope __P((pthread_attr_t *, int));
-int pthread_getschedparam __P((pthread_t pthread, int *,
- struct sched_param *));
-int pthread_setschedparam __P((pthread_t, int,
- const struct sched_param *));
+int pthread_attr_getinheritsched(const pthread_attr_t *, int *);
+int pthread_attr_getschedparam(const pthread_attr_t *,
+ struct sched_param *);
+int pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
+int pthread_attr_getscope(const pthread_attr_t *, int *);
+int pthread_attr_setinheritsched(pthread_attr_t *, int);
+int pthread_attr_setschedparam(pthread_attr_t *,
+ const struct sched_param *);
+int pthread_attr_setschedpolicy(pthread_attr_t *, int);
+int pthread_attr_setscope(pthread_attr_t *, int);
+int pthread_getschedparam(pthread_t pthread, int *,
+ struct sched_param *);
+int pthread_setschedparam(pthread_t, int,
+ const struct sched_param *);
__END_DECLS
#endif
diff --git a/include/pthread_np.h b/include/pthread_np.h
index e479df66f89f..54effc7046a5 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -37,23 +37,23 @@
/*
* Non-POSIX type definitions:
*/
-typedef void (*pthread_switch_routine_t) __P((pthread_t, pthread_t));
+typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t);
/*
* Non-POSIX thread function prototype definitions:
*/
__BEGIN_DECLS
-int pthread_attr_setcreatesuspend_np __P((pthread_attr_t *));
-int pthread_multi_np __P((void));
-int pthread_resume_np __P((pthread_t));
-int pthread_single_np __P((void));
-int pthread_suspend_np __P((pthread_t));
-int pthread_mutexattr_getkind_np __P((pthread_mutexattr_t));
-int pthread_mutexattr_setkind_np __P((pthread_mutexattr_t *, int));
-void pthread_set_name_np __P((pthread_t, const char *));
-int pthread_switch_add_np __P((pthread_switch_routine_t));
-int pthread_switch_delete_np __P((pthread_switch_routine_t));
-int pthread_main_np __P((void));
+int pthread_attr_setcreatesuspend_np(pthread_attr_t *);
+int pthread_multi_np(void);
+int pthread_resume_np(pthread_t);
+int pthread_single_np(void);
+int pthread_suspend_np(pthread_t);
+int pthread_mutexattr_getkind_np(pthread_mutexattr_t);
+int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
+void pthread_set_name_np(pthread_t, const char *);
+int pthread_switch_add_np(pthread_switch_routine_t);
+int pthread_switch_delete_np(pthread_switch_routine_t);
+int pthread_main_np(void);
__END_DECLS
#endif
diff --git a/include/pwd.h b/include/pwd.h
index ca8c42fcaf66..04961acf99e5 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -99,14 +99,14 @@ struct passwd {
#include <sys/cdefs.h>
__BEGIN_DECLS
-struct passwd *getpwuid __P((uid_t));
-struct passwd *getpwnam __P((const char *));
+struct passwd *getpwuid(uid_t);
+struct passwd *getpwnam(const char *);
#ifndef _POSIX_SOURCE
-struct passwd *getpwent __P((void));
-int setpassent __P((int));
-void setpwent __P((void));
-void endpwent __P((void));
-const char *user_from_uid __P((uid_t, int));
+struct passwd *getpwent(void);
+int setpassent(int);
+void setpwent(void);
+void endpwent(void);
+const char *user_from_uid(uid_t, int);
#endif
__END_DECLS
diff --git a/include/regex.h b/include/regex.h
index 1611d4b87921..0c52bd7f27f3 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -35,6 +35,7 @@
* SUCH DAMAGE.
*
* @(#)regex.h 8.2 (Berkeley) 1/3/94
+ * $FreeBSD$
*/
#ifndef _REGEX_H_
@@ -96,11 +97,10 @@ typedef struct {
#define REG_BACKR 02000 /* force use of backref code */
__BEGIN_DECLS
-int regcomp __P((regex_t *, const char *, int));
-size_t regerror __P((int, const regex_t *, char *, size_t));
-int regexec __P((const regex_t *,
- const char *, size_t, regmatch_t [], int));
-void regfree __P((regex_t *));
+int regcomp(regex_t *, const char *, int);
+size_t regerror(int, const regex_t *, char *, size_t);
+int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
+void regfree(regex_t *);
__END_DECLS
#endif /* !_REGEX_H_ */
diff --git a/include/regexp.h b/include/regexp.h
index 47c8e88fa695..96c2c94db951 100644
--- a/include/regexp.h
+++ b/include/regexp.h
@@ -35,6 +35,7 @@
* SUCH DAMAGE.
*
* @(#)regexp.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _REGEXP_H_
@@ -60,10 +61,10 @@ typedef struct regexp {
#include <sys/cdefs.h>
__BEGIN_DECLS
-regexp *regcomp __P((const char *));
-int regexec __P((const regexp *, const char *));
-void regsub __P((const regexp *, const char *, char *));
-void regerror __P((const char *));
+regexp *regcomp(const char *);
+int regexec(const regexp *, const char *);
+void regsub(const regexp *, const char *, char *);
+void regerror(const char *);
__END_DECLS
#endif /* !_REGEXP_H_ */
diff --git a/include/resolv.h b/include/resolv.h
index a076c7e0fdd9..6b5796191ecc 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -178,19 +178,19 @@ struct __res_state_ext {
typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
res_sendhookact;
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
- const u_char **query,
- int *querylen,
- u_char *ans,
- int anssiz,
- int *resplen));
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
+ const u_char **query,
+ int *querylen,
+ u_char *ans,
+ int anssiz,
+ int *resplen);
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
- const u_char *query,
- int querylen,
- u_char *ans,
- int anssiz,
- int *resplen));
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
+ const u_char *query,
+ int querylen,
+ u_char *ans,
+ int anssiz,
+ int *resplen);
struct res_sym {
int number; /* Identifying number, like T_MX */
@@ -257,63 +257,62 @@ extern const struct res_sym __p_type_syms[];
#define res_freeupdrec __res_freeupdrec
__BEGIN_DECLS
-int res_hnok __P((const char *));
-int res_ownok __P((const char *));
-int res_mailok __P((const char *));
-int res_dnok __P((const char *));
-int sym_ston __P((const struct res_sym *, const char *, int *));
-const char * sym_ntos __P((const struct res_sym *, int, int *));
-const char * sym_ntop __P((const struct res_sym *, int, int *));
-int b64_ntop __P((u_char const *, size_t, char *, size_t));
-int b64_pton __P((char const *, u_char *, size_t));
-int loc_aton __P((const char *, u_char *));
-const char * loc_ntoa __P((const u_char *, char *));
-int dn_skipname __P((const u_char *, const u_char *));
-void fp_resstat __P((struct __res_state *, FILE *));
-void fp_query __P((const u_char *, FILE *));
-void fp_nquery __P((const u_char *, int, FILE *));
-const char * hostalias __P((const char *));
-void putlong __P((u_int32_t, u_char *));
-void putshort __P((u_int16_t, u_char *));
-const char * p_class __P((int));
-const char * p_time __P((u_int32_t));
-const char * p_type __P((int));
-void p_query __P((const u_char *));
-const u_char * p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char * p_cdname __P((const u_char *, const u_char *, FILE *));
-const u_char * p_fqnname __P((const u_char *, const u_char *,
- int, char *, int));
-const u_char * p_fqname __P((const u_char *, const u_char *, FILE *));
-const char * p_option __P((u_long));
-char * p_secstodate __P((u_long));
-int dn_count_labels __P((const char *));
-int dn_comp __P((const char *, u_char *, int,
- u_char **, u_char **));
-int dn_expand __P((const u_char *, const u_char *, const u_char *,
- char *, int));
-int res_init __P((void));
-u_int res_randomid __P((void));
-int res_query __P((const char *, int, int, u_char *, int));
-int res_search __P((const char *, int, int, u_char *, int));
-int res_querydomain __P((const char *, const char *, int, int,
- u_char *, int));
-int res_mkquery __P((int, const char *, int, int, const u_char *,
- int, const u_char *, u_char *, int));
-int res_send __P((const u_char *, int, u_char *, int));
-int res_isourserver __P((const struct sockaddr_in *));
-int res_nameinquery __P((const char *, int, int,
- const u_char *, const u_char *));
-int res_queriesmatch __P((const u_char *, const u_char *,
- const u_char *, const u_char *));
-void res_close __P((void));
-int res_opt __P((int, u_char *, int, int));
-const char * p_section __P((int, int));
+int res_hnok(const char *);
+int res_ownok(const char *);
+int res_mailok(const char *);
+int res_dnok(const char *);
+int sym_ston(const struct res_sym *, const char *, int *);
+const char * sym_ntos(const struct res_sym *, int, int *);
+const char * sym_ntop(const struct res_sym *, int, int *);
+int b64_ntop(u_char const *, size_t, char *, size_t);
+int b64_pton(char const *, u_char *, size_t);
+int loc_aton(const char *, u_char *);
+const char * loc_ntoa(const u_char *, char *);
+int dn_skipname(const u_char *, const u_char *);
+void fp_resstat(struct __res_state *, FILE *);
+void fp_query(const u_char *, FILE *);
+void fp_nquery(const u_char *, int, FILE *);
+const char * hostalias(const char *);
+void putlong(u_int32_t, u_char *);
+void putshort(u_int16_t, u_char *);
+const char * p_class(int);
+const char * p_time(u_int32_t);
+const char * p_type(int);
+void p_query(const u_char *);
+const u_char * p_cdnname(const u_char *, const u_char *, int, FILE *);
+const u_char * p_cdname(const u_char *, const u_char *, FILE *);
+const u_char * p_fqnname(const u_char *, const u_char *,
+ int, char *, int);
+const u_char * p_fqname(const u_char *, const u_char *, FILE *);
+const char * p_option(u_long);
+char * p_secstodate(u_long);
+int dn_count_labels(const char *);
+int dn_comp(const char *, u_char *, int, u_char **, u_char **);
+int dn_expand(const u_char *, const u_char *, const u_char *,
+ char *, int);
+int res_init(void);
+u_int res_randomid(void);
+int res_query(const char *, int, int, u_char *, int);
+int res_search(const char *, int, int, u_char *, int);
+int res_querydomain(const char *, const char *, int, int,
+ u_char *, int);
+int res_mkquery(int, const char *, int, int, const u_char *,
+ int, const u_char *, u_char *, int);
+int res_send(const u_char *, int, u_char *, int);
+int res_isourserver(const struct sockaddr_in *);
+int res_nameinquery(const char *, int, int,
+ const u_char *, const u_char *);
+int res_queriesmatch(const u_char *, const u_char *,
+ const u_char *, const u_char *);
+void res_close(void);
+int res_opt(int, u_char *, int, int);
+const char * p_section(int, int);
/* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */
#ifdef _ARPA_NAMESER_H_
-int res_update __P((ns_updrec *));
-int res_mkupdate __P((ns_updrec *, u_char *, int));
-ns_updrec * res_mkupdrec __P((int, const char *, u_int, u_int, u_long));
-void res_freeupdrec __P((ns_updrec *));
+int res_update(ns_updrec *);
+int res_mkupdate(ns_updrec *, u_char *, int);
+ns_updrec * res_mkupdrec(int, const char *, u_int, u_int, u_long);
+void res_freeupdrec(ns_updrec *);
#endif
__END_DECLS
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index ce20370e6cc4..4f23e5e75f06 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -155,11 +155,7 @@ union des_block {
};
typedef union des_block des_block;
__BEGIN_DECLS
-#ifdef __STDC__
extern bool_t xdr_des_block(XDR *, des_block *);
-#else
-extern bool_t xdr_des_block();
-#endif
__END_DECLS
/*
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index 964e77480da7..fff4ebfe300c 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -111,7 +111,7 @@ struct authdes_verf {
*
*/
__BEGIN_DECLS
-extern int authdes_getucred __P(( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * ));
+extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
__END_DECLS
__BEGIN_DECLS
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 57e075b54816..48373b2c24c7 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -69,7 +69,7 @@ struct authunix_parms {
#define authsys_parms authunix_parms
__BEGIN_DECLS
-extern bool_t xdr_authunix_parms __P((XDR *, struct authunix_parms *));
+extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
__END_DECLS
/*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index f8af9a232def..6cb7c36a31af 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -97,22 +97,22 @@ typedef struct __rpc_client {
AUTH *cl_auth; /* authenticator */
struct clnt_ops {
/* call remote procedure */
- enum clnt_stat (*cl_call) __P((struct __rpc_client *,
+ enum clnt_stat (*cl_call)(struct __rpc_client *,
rpcproc_t, xdrproc_t, caddr_t, xdrproc_t,
- caddr_t, struct timeval));
+ caddr_t, struct timeval);
/* abort a call */
- void (*cl_abort) __P((struct __rpc_client *));
+ void (*cl_abort)(struct __rpc_client *);
/* get specific error code */
- void (*cl_geterr) __P((struct __rpc_client *,
- struct rpc_err *));
+ void (*cl_geterr)(struct __rpc_client *,
+ struct rpc_err *);
/* frees results */
- bool_t (*cl_freeres) __P((struct __rpc_client *,
- xdrproc_t, caddr_t));
+ bool_t (*cl_freeres)(struct __rpc_client *,
+ xdrproc_t, caddr_t);
/* destroy this structure */
- void (*cl_destroy) __P((struct __rpc_client *));
+ void (*cl_destroy)(struct __rpc_client *);
/* the ioctl() of rpc */
- bool_t (*cl_control) __P((struct __rpc_client *, u_int,
- char *));
+ bool_t (*cl_control)(struct __rpc_client *, u_int,
+ char *);
} *cl_ops;
void *cl_private; /* private stuff */
char *cl_netid; /* network token */
@@ -274,8 +274,8 @@ struct rpc_timers {
* const char *prot; -- protocol
*/
__BEGIN_DECLS
-extern CLIENT *clnt_create __P((const char *, const rpcprog_t, const rpcvers_t,
- const char *));
+extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t,
+ const char *);
/*
*
* const char *hostname; -- hostname
@@ -288,9 +288,9 @@ extern CLIENT *clnt_create __P((const char *, const rpcprog_t, const rpcvers_t,
* Generic client creation routine. Supported protocols are which belong
* to the nettype name space.
*/
-extern CLIENT *clnt_create_vers __P((const char *, const rpcprog_t, rpcvers_t *,
- const rpcvers_t, const rpcvers_t,
- const char *));
+extern CLIENT *clnt_create_vers(const char *, const rpcprog_t, rpcvers_t *,
+ const rpcvers_t, const rpcvers_t,
+ const char *);
/*
* const char *host; -- hostname
* const rpcprog_t prog; -- program number
@@ -305,8 +305,8 @@ extern CLIENT *clnt_create_vers __P((const char *, const rpcprog_t, rpcvers_t *,
* Generic client creation routine. It takes a netconfig structure
* instead of nettype
*/
-extern CLIENT *clnt_tp_create __P((const char *, const rpcprog_t,
- const rpcvers_t, const struct netconfig *));
+extern CLIENT *clnt_tp_create(const char *, const rpcprog_t,
+ const rpcvers_t, const struct netconfig *);
/*
* const char *hostname; -- hostname
* const rpcprog_t prog; -- program number
@@ -318,9 +318,9 @@ extern CLIENT *clnt_tp_create __P((const char *, const rpcprog_t,
* Generic TLI create routine. Only provided for compatibility.
*/
-extern CLIENT *clnt_tli_create __P((const int, const struct netconfig *,
- const struct netbuf *, const rpcprog_t,
- const rpcvers_t, const u_int, const u_int));
+extern CLIENT *clnt_tli_create(const int, const struct netconfig *,
+ const struct netbuf *, const rpcprog_t,
+ const rpcvers_t, const u_int, const u_int);
/*
* const register int fd; -- fd
* const struct netconfig *nconf; -- netconfig structure
@@ -334,14 +334,14 @@ extern CLIENT *clnt_tli_create __P((const int, const struct netconfig *,
/*
* Low level clnt create routine for connectionful transports, e.g. tcp.
*/
-extern CLIENT *clnt_vc_create __P((const int, const struct netbuf *,
- const rpcprog_t, const rpcvers_t,
- const u_int, const u_int));
+extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
+ const rpcprog_t, const rpcvers_t,
+ const u_int, const u_int);
/*
* Added for compatibility to old rpc 4.0. Obsoleted by clnt_vc_create().
*/
-extern CLIENT *clntunix_create __P((struct sockaddr_un *,
- u_long, u_long, int *, u_int, u_int));
+extern CLIENT *clntunix_create(struct sockaddr_un *,
+ u_long, u_long, int *, u_int, u_int);
/*
* const int fd; -- open file descriptor
* const struct netbuf *svcaddr; -- servers address
@@ -354,9 +354,9 @@ extern CLIENT *clntunix_create __P((struct sockaddr_un *,
/*
* Low level clnt create routine for connectionless transports, e.g. udp.
*/
-extern CLIENT *clnt_dg_create __P((const int, const struct netbuf *,
- const rpcprog_t, const rpcvers_t,
- const u_int, const u_int));
+extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
+ const rpcprog_t, const rpcvers_t,
+ const u_int, const u_int);
/*
* const int fd; -- open file descriptor
* const struct netbuf *svcaddr; -- servers address
@@ -373,7 +373,7 @@ extern CLIENT *clnt_dg_create __P((const int, const struct netbuf *,
* u_long prog;
* u_long vers;
*/
-extern CLIENT *clnt_raw_create __P((rpcprog_t, rpcvers_t));
+extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
__END_DECLS
@@ -382,24 +382,24 @@ __END_DECLS
* Print why creation failed
*/
__BEGIN_DECLS
-extern void clnt_pcreateerror __P((const char *)); /* stderr */
-extern char *clnt_spcreateerror __P((const char *)); /* string */
+extern void clnt_pcreateerror(const char *); /* stderr */
+extern char *clnt_spcreateerror(const char *); /* string */
__END_DECLS
/*
* Like clnt_perror(), but is more verbose in its output
*/
__BEGIN_DECLS
-extern void clnt_perrno __P((enum clnt_stat)); /* stderr */
-extern char *clnt_sperrno __P((enum clnt_stat)); /* string */
+extern void clnt_perrno(enum clnt_stat); /* stderr */
+extern char *clnt_sperrno(enum clnt_stat); /* string */
__END_DECLS
/*
* Print an English error message, given the client error code
*/
__BEGIN_DECLS
-extern void clnt_perror __P((CLIENT *, const char *)); /* stderr */
-extern char *clnt_sperror __P((CLIENT *, const char *)); /* string */
+extern void clnt_perror(CLIENT *, const char *); /* stderr */
+extern char *clnt_sperror(CLIENT *, const char *); /* string */
__END_DECLS
@@ -413,7 +413,7 @@ struct rpc_createerr {
#ifdef _THREAD_SAFE
__BEGIN_DECLS
-extern struct rpc_createerr *__rpc_createerr __P((void));
+extern struct rpc_createerr *__rpc_createerr(void);
__END_DECLS
#define rpc_createerr (*(__rpc_createerr()))
#else
@@ -434,10 +434,10 @@ extern struct rpc_createerr rpc_createerr;
* const char *nettype;
*/
__BEGIN_DECLS
-extern enum clnt_stat rpc_call __P((const char *, const rpcprog_t,
- const rpcvers_t, const rpcproc_t,
- const xdrproc_t, const char *,
- const xdrproc_t, char *, const char *));
+extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
+ const rpcvers_t, const rpcproc_t,
+ const xdrproc_t, const char *,
+ const xdrproc_t, char *, const char *);
__END_DECLS
/*
@@ -484,18 +484,18 @@ __END_DECLS
* const char *nettype; -- Transport type
*/
-typedef bool_t (*resultproc_t) __P((caddr_t, ...));
+typedef bool_t (*resultproc_t)(caddr_t, ...);
__BEGIN_DECLS
-extern enum clnt_stat rpc_broadcast __P((const rpcprog_t, const rpcvers_t,
- const rpcproc_t, const xdrproc_t,
- caddr_t, const xdrproc_t, caddr_t,
- const resultproc_t, const char *));
-extern enum clnt_stat rpc_broadcast_exp __P((const rpcprog_t, const rpcvers_t,
- const rpcproc_t, const xdrproc_t,
- caddr_t, const xdrproc_t, caddr_t,
- const resultproc_t, const int,
- const int, const char *));
+extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
+ const rpcproc_t, const xdrproc_t,
+ caddr_t, const xdrproc_t, caddr_t,
+ const resultproc_t, const char *);
+extern enum clnt_stat rpc_broadcast_exp(const rpcprog_t, const rpcvers_t,
+ const rpcproc_t, const xdrproc_t,
+ caddr_t, const xdrproc_t, caddr_t,
+ const resultproc_t, const int,
+ const int, const char *);
__END_DECLS
/* For backward compatibility */
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index b6c1bd2300a8..1e7a0dea59e4 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -63,19 +63,15 @@
* u_int recvsz;
*/
__BEGIN_DECLS
-extern CLIENT *clnttcp_create __P((struct sockaddr_in *,
- u_long,
- u_long,
- int *,
- u_int,
- u_int));
+extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
+ u_int, u_int);
__END_DECLS
/*
* Raw (memory) rpc.
*/
__BEGIN_DECLS
-extern CLIENT *clntraw_create __P((u_long, u_long));
+extern CLIENT *clntraw_create(u_long, u_long);
__END_DECLS
@@ -101,18 +97,10 @@ __END_DECLS
* u_int recvsz;
*/
__BEGIN_DECLS
-extern CLIENT *clntudp_create __P((struct sockaddr_in *,
- u_long,
- u_long,
- struct timeval,
- int *));
-extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *,
- u_long,
- u_long,
- struct timeval,
- int *,
- u_int,
- u_int));
+extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long,
+ struct timeval, int *);
+extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
+ struct timeval, int *, u_int, u_int);
__END_DECLS
#endif /* _RPC_CLNT_SOC_H */
diff --git a/include/rpc/des.h b/include/rpc/des.h
index 74fa33241597..f920e22d24a3 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -80,4 +80,4 @@ struct desparams {
/*
* Software DES.
*/
-extern int _des_crypt __P(( char *, int, struct desparams * ));
+extern int _des_crypt( char *, int, struct desparams * );
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index ce6c1bf44783..a5df606e9e0b 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -85,14 +85,14 @@
* Cipher Block Chaining mode
*/
__BEGIN_DECLS
-int cbc_crypt __P(( char *, char *, unsigned int, unsigned int, char *));
+int cbc_crypt( char *, char *, unsigned int, unsigned int, char *);
__END_DECLS
/*
* Electronic Code Book mode
*/
__BEGIN_DECLS
-int ecb_crypt __P(( char *, char *, unsigned int, unsigned int ));
+int ecb_crypt( char *, char *, unsigned int, unsigned int );
__END_DECLS
/*
@@ -100,7 +100,7 @@ __END_DECLS
* DES parity is odd and in the low bit of each byte
*/
__BEGIN_DECLS
-void des_setparity __P(( char *));
+void des_setparity( char *);
__END_DECLS
#endif /* _DES_DES_CRYPT_H */
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index f53c445d6ee3..5e26268a68da 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -55,10 +55,10 @@
#define _RPC_UDP 8
__BEGIN_DECLS
-extern void *__rpc_setconf __P((const char *));
-extern void __rpc_endconf __P((void *));
-extern struct netconfig *__rpc_getconf __P((void *));
-extern struct netconfig *__rpc_getconfip __P((const char *));
+extern void *__rpc_setconf(const char *);
+extern void __rpc_endconf(void *);
+extern struct netconfig *__rpc_getconf(void *);
+extern struct netconfig *__rpc_getconfip(const char *);
__END_DECLS
#endif /* !_RPC_NETTYPE_H */
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index a2beae5691ce..1902d690a1ac 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -67,20 +67,20 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-extern bool_t pmap_set __P((u_long, u_long, int, int));
-extern bool_t pmap_unset __P((u_long, u_long));
-extern struct pmaplist *pmap_getmaps __P((struct sockaddr_in *));
-extern enum clnt_stat pmap_rmtcall __P((struct sockaddr_in *,
- u_long, u_long, u_long,
- xdrproc_t, caddr_t,
- xdrproc_t, caddr_t,
- struct timeval, u_long *));
-extern enum clnt_stat clnt_broadcast __P((u_long, u_long, u_long,
- xdrproc_t, char *,
- xdrproc_t, char *,
- resultproc_t));
-extern u_short pmap_getport __P((struct sockaddr_in *,
- u_long, u_long, u_int));
+extern bool_t pmap_set(u_long, u_long, int, int);
+extern bool_t pmap_unset(u_long, u_long);
+extern struct pmaplist *pmap_getmaps(struct sockaddr_in *);
+extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *,
+ u_long, u_long, u_long,
+ xdrproc_t, caddr_t,
+ xdrproc_t, caddr_t,
+ struct timeval, u_long *);
+extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long,
+ xdrproc_t, char *,
+ xdrproc_t, char *,
+ resultproc_t);
+extern u_short pmap_getport(struct sockaddr_in *,
+ u_long, u_long, u_int);
__END_DECLS
#endif /* !_RPC_PMAP_CLNT_H_ */
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 7dddab2e0d5b..366832a7d3f8 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -99,9 +99,9 @@ struct pmaplist {
};
__BEGIN_DECLS
-extern bool_t xdr_pmap __P((XDR *, struct pmap *));
-extern bool_t xdr_pmaplist __P((XDR *, struct pmaplist **));
-extern bool_t xdr_pmaplist_ptr __P((XDR *, struct pmaplist *));
+extern bool_t xdr_pmap(XDR *, struct pmap *);
+extern bool_t xdr_pmaplist(XDR *, struct pmaplist **);
+extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *);
__END_DECLS
#endif /* !_RPC_PMAP_PROT_H */
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 4361f0d0b4f7..5c0806681e9e 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -58,8 +58,8 @@ struct rmtcallres {
};
__BEGIN_DECLS
-extern bool_t xdr_rmtcall_args __P((XDR *, struct rmtcallargs *));
-extern bool_t xdr_rmtcallres __P((XDR *, struct rmtcallres *));
+extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *);
+extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *);
__END_DECLS
#endif /* !_RPC_PMAP_RMT_H */
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index b770d75786b1..725b542a8dde 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -79,19 +79,19 @@
#include <rpc/rpcent.h>
__BEGIN_DECLS
-extern int get_myaddress __P((struct sockaddr_in *));
-extern int bindresvport __P((int, struct sockaddr_in *));
-extern int registerrpc __P((int, int, int, char *(*) __P((char [UDPMSGSIZE])),
- xdrproc_t, xdrproc_t));
-extern int callrpc __P((const char *, int, int, int, xdrproc_t, void *,
- xdrproc_t , void *));
-extern int getrpcport __P((char *, int, int, int));
+extern int get_myaddress(struct sockaddr_in *);
+extern int bindresvport(int, struct sockaddr_in *);
+extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
+ xdrproc_t, xdrproc_t);
+extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
+ xdrproc_t , void *);
+extern int getrpcport(char *, int, int, int);
-char *taddr2uaddr __P((const struct netconfig *, const struct netbuf *));
-struct netbuf *uaddr2taddr __P((const struct netconfig *, const char *));
+char *taddr2uaddr(const struct netconfig *, const struct netbuf *);
+struct netbuf *uaddr2taddr(const struct netconfig *, const char *);
struct sockaddr;
-extern int bindresvport_sa __P((int, struct sockaddr *));
+extern int bindresvport_sa(int, struct sockaddr *);
__END_DECLS
/*
@@ -99,11 +99,10 @@ __END_DECLS
* and rpcbind use only. Do not use, they may change without notice.
*/
__BEGIN_DECLS
-int __rpc_nconf2fd __P((const struct netconfig *));
-int __rpc_nconf2sockinfo __P((const struct netconfig *,
- struct __rpc_sockinfo *));
-int __rpc_fd2sockinfo __P((int, struct __rpc_sockinfo *));
-u_int __rpc_get_t_size __P((int, int, int));
+int __rpc_nconf2fd(const struct netconfig *);
+int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
+int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
+u_int __rpc_get_t_size(int, int, int);
__END_DECLS
#endif /* !_RPC_RPC_H */
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index f47db238467d..80497dd787ae 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -57,27 +57,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 int _rpc_dtablesize __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 int _rpc_dtablesize(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 *));
+struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
+ const char *, CLIENT **);
+bool_t __rpc_control(int,void *);
-char *_get_next_token __P((char *, int));
+char *_get_next_token(char *, int);
__END_DECLS
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index ed634a180250..45fd2615ddf4 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -167,7 +167,7 @@ __BEGIN_DECLS
* XDR *xdrs;
* struct rpc_msg *cmsg;
*/
-extern bool_t xdr_callmsg __P((XDR *, struct rpc_msg *));
+extern bool_t xdr_callmsg(XDR *, struct rpc_msg *);
/*
* XDR routine to pre-serialize the static part of a rpc message.
@@ -175,7 +175,7 @@ extern bool_t xdr_callmsg __P((XDR *, struct rpc_msg *));
* XDR *xdrs;
* struct rpc_msg *cmsg;
*/
-extern bool_t xdr_callhdr __P((XDR *, struct rpc_msg *));
+extern bool_t xdr_callhdr(XDR *, struct rpc_msg *);
/*
* XDR routine to handle a rpc reply.
@@ -183,7 +183,7 @@ extern bool_t xdr_callhdr __P((XDR *, struct rpc_msg *));
* XDR *xdrs;
* struct rpc_msg *rmsg;
*/
-extern bool_t xdr_replymsg __P((XDR *, struct rpc_msg *));
+extern bool_t xdr_replymsg(XDR *, struct rpc_msg *);
/*
@@ -192,7 +192,7 @@ extern bool_t xdr_replymsg __P((XDR *, struct rpc_msg *));
* XDR *xdrs;
* struct accepted_reply *rej;
*/
-extern bool_t xdr_accepted_reply __P((XDR *, struct accepted_reply *));
+extern bool_t xdr_accepted_reply(XDR *, struct accepted_reply *);
/*
* XDR routine to handle a rejected rpc reply.
@@ -200,7 +200,7 @@ extern bool_t xdr_accepted_reply __P((XDR *, struct accepted_reply *));
* XDR *xdrs;
* struct rejected_reply *rej;
*/
-extern bool_t xdr_rejected_reply __P((XDR *, struct rejected_reply *));
+extern bool_t xdr_rejected_reply(XDR *, struct rejected_reply *);
/*
* Fills in the error part of a reply message.
@@ -208,7 +208,7 @@ extern bool_t xdr_rejected_reply __P((XDR *, struct rejected_reply *));
* struct rpc_msg *msg;
* struct rpc_err *error;
*/
-extern void _seterr_reply __P((struct rpc_msg *, struct rpc_err *));
+extern void _seterr_reply(struct rpc_msg *, struct rpc_err *);
__END_DECLS
#endif /* !_RPC_RPC_MSG_H */
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index 0f081a47b0c3..fa64a853f90d 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -62,24 +62,24 @@
#include <rpc/rpcb_prot.h>
__BEGIN_DECLS
-extern bool_t rpcb_set __P((const rpcprog_t, const rpcvers_t,
- const struct netconfig *, const struct netbuf *));
-extern bool_t rpcb_unset __P((const rpcprog_t, const rpcvers_t,
- const struct netconfig *));
-extern rpcblist *rpcb_getmaps __P((const struct netconfig *, const char *));
-extern enum clnt_stat rpcb_rmtcall __P((const struct netconfig *,
- const char *, const rpcprog_t,
- const rpcvers_t, const rpcproc_t,
- const xdrproc_t, const caddr_t,
- const xdrproc_t, const caddr_t,
- const struct timeval,
- const struct netbuf *));
-extern bool_t rpcb_getaddr __P((const rpcprog_t, const rpcvers_t,
- const struct netconfig *, struct netbuf *,
- const char *));
-extern bool_t rpcb_gettime __P((const char *, time_t *));
-extern char *rpcb_taddr2uaddr __P((struct netconfig *, struct netbuf *));
-extern struct netbuf *rpcb_uaddr2taddr __P((struct netconfig *, char *));
+extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,
+ const struct netconfig *, const struct netbuf *);
+extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,
+ const struct netconfig *);
+extern rpcblist *rpcb_getmaps(const struct netconfig *, const char *);
+extern enum clnt_stat rpcb_rmtcall(const struct netconfig *,
+ const char *, const rpcprog_t,
+ const rpcvers_t, const rpcproc_t,
+ const xdrproc_t, const caddr_t,
+ const xdrproc_t, const caddr_t,
+ const struct timeval,
+ const struct netbuf *);
+extern bool_t rpcb_getaddr(const rpcprog_t, const rpcvers_t,
+ const struct netconfig *, struct netbuf *,
+ const char *);
+extern bool_t rpcb_gettime(const char *, time_t *);
+extern char *rpcb_taddr2uaddr(struct netconfig *, struct netbuf *);
+extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *);
__END_DECLS
#endif /* !_RPC_RPCB_CLNT_H */
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 234002ac6a9c..4388d8b9ff88 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -53,17 +53,17 @@ struct rpcent {
};
__BEGIN_DECLS
-extern struct rpcent *getrpcbyname_r __P((const char *, struct rpcent *,
- char *, int));
-extern struct rpcent *getrpcbynumber_r __P((int, struct rpcent *, char *, int));
-extern struct rpcent *getrpcent_r __P((struct rpcent *, char *, int));
+extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
+ char *, int);
+extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
/* Old interfaces that return a pointer to a static area; MT-unsafe */
-extern struct rpcent *getrpcbyname __P((char *));
-extern struct rpcent *getrpcbynumber __P((int));
-extern struct rpcent *getrpcent __P((void));
-extern void setrpcent __P((int));
-extern void endrpcent __P((void));
+extern struct rpcent *getrpcbyname(char *);
+extern struct rpcent *getrpcbynumber(int);
+extern struct rpcent *getrpcent(void);
+extern void setrpcent(int);
+extern void endrpcent(void);
__END_DECLS
#endif /* !_RPC_CENT_H */
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 0e503155d8ab..5647377e4a7a 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -86,29 +86,27 @@ typedef struct __rpc_svcxprt {
u_short xp_port; /* associated port number */
const struct xp_ops {
/* receive incoming requests */
- bool_t (*xp_recv) __P((struct __rpc_svcxprt *,
- struct rpc_msg *));
+ bool_t (*xp_recv)(struct __rpc_svcxprt *, struct rpc_msg *);
/* get transport status */
- enum xprt_stat (*xp_stat) __P((struct __rpc_svcxprt *));
+ enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
/* get arguments */
- bool_t (*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
- caddr_t));
+ bool_t (*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
+ caddr_t);
/* send reply */
- bool_t (*xp_reply) __P((struct __rpc_svcxprt *,
- struct rpc_msg *));
+ bool_t (*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
/* free mem allocated for args */
- bool_t (*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
- caddr_t));
+ bool_t (*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
+ caddr_t);
/* destroy this struct */
- void (*xp_destroy) __P((struct __rpc_svcxprt *));
+ void (*xp_destroy)(struct __rpc_svcxprt *);
} *xp_ops;
int xp_addrlen; /* length of remote address */
struct sockaddr_in xp_raddr; /* remote addr. (backward ABI compat) */
/* XXX - fvdl stick this here for ABI backward compat reasons */
const struct xp_ops2 {
/* catch-all function */
- bool_t (*xp_control) __P((struct __rpc_svcxprt *, const u_int,
- void *));
+ bool_t (*xp_control)(struct __rpc_svcxprt *, const u_int,
+ void *);
} *xp_ops2;
char *xp_tp; /* transport provider device name */
char *xp_netid; /* network token */
@@ -196,9 +194,9 @@ struct svc_req {
*/
__BEGIN_DECLS
-extern bool_t svc_reg __P((SVCXPRT *, const rpcprog_t, const rpcvers_t,
- void (*) __P((struct svc_req *, SVCXPRT *)),
- const struct netconfig *));
+extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
+ void (*)(struct svc_req *, SVCXPRT *),
+ const struct netconfig *);
__END_DECLS
/*
@@ -210,7 +208,7 @@ __END_DECLS
*/
__BEGIN_DECLS
-extern void svc_unreg __P((const rpcprog_t, const rpcvers_t));
+extern void svc_unreg(const rpcprog_t, const rpcvers_t);
__END_DECLS
/*
@@ -220,7 +218,7 @@ __END_DECLS
* SVCXPRT *xprt;
*/
__BEGIN_DECLS
-extern void xprt_register __P((SVCXPRT *));
+extern void xprt_register(SVCXPRT *);
__END_DECLS
/*
@@ -230,7 +228,7 @@ __END_DECLS
* SVCXPRT *xprt;
*/
__BEGIN_DECLS
-extern void xprt_unregister __P((SVCXPRT *));
+extern void xprt_unregister(SVCXPRT *);
__END_DECLS
@@ -261,17 +259,17 @@ __END_DECLS
*/
__BEGIN_DECLS
-extern bool_t svc_sendreply __P((SVCXPRT *, xdrproc_t, char *));
-extern void svcerr_decode __P((SVCXPRT *));
-extern void svcerr_weakauth __P((SVCXPRT *));
-extern void svcerr_noproc __P((SVCXPRT *));
-extern void svcerr_progvers __P((SVCXPRT *, rpcvers_t, rpcvers_t));
-extern void svcerr_auth __P((SVCXPRT *, enum auth_stat));
-extern void svcerr_noprog __P((SVCXPRT *));
-extern void svcerr_systemerr __P((SVCXPRT *));
-extern int rpc_reg __P((rpcprog_t, rpcvers_t, rpcproc_t,
- char *(*) __P((char *)), xdrproc_t, xdrproc_t,
- char *));
+extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, char *);
+extern void svcerr_decode(SVCXPRT *);
+extern void svcerr_weakauth(SVCXPRT *);
+extern void svcerr_noproc(SVCXPRT *);
+extern void svcerr_progvers(SVCXPRT *, rpcvers_t, rpcvers_t);
+extern void svcerr_auth(SVCXPRT *, enum auth_stat);
+extern void svcerr_noprog(SVCXPRT *);
+extern void svcerr_systemerr(SVCXPRT *);
+extern int rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
+ char *(*)(char *), xdrproc_t, xdrproc_t,
+ char *);
__END_DECLS
/*
@@ -302,18 +300,18 @@ extern int svc_fds;
* also see clnt.h for protocol numbers.
*/
__BEGIN_DECLS
-extern void rpctest_service __P((void));
+extern void rpctest_service(void);
__END_DECLS
__BEGIN_DECLS
-extern void svc_getreq __P((int));
-extern void svc_getreqset __P((fd_set *));
-extern void svc_getreq_common __P((int));
+extern void svc_getreq(int);
+extern void svc_getreqset(fd_set *);
+extern void svc_getreq_common(int);
struct pollfd;
-extern void svc_getreq_poll __P((struct pollfd *, int));
+extern void svc_getreq_poll(struct pollfd *, int);
-extern void svc_run __P((void));
-extern void svc_exit __P((void));
+extern void svc_run(void);
+extern void svc_exit(void);
__END_DECLS
/*
@@ -330,8 +328,8 @@ __BEGIN_DECLS
/*
* Transport independent svc_create routine.
*/
-extern int svc_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
- const rpcprog_t, const rpcvers_t, const char *));
+extern int svc_create(void (*)(struct svc_req *, SVCXPRT *),
+ const rpcprog_t, const rpcvers_t, const char *);
/*
* void (*dispatch)(); -- dispatch routine
* const rpcprog_t prognum; -- program number
@@ -345,9 +343,9 @@ extern int svc_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
* instead of a nettype.
*/
-extern SVCXPRT *svc_tp_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
+extern SVCXPRT *svc_tp_create(void (*)(struct svc_req *, SVCXPRT *),
const rpcprog_t, const rpcvers_t,
- const struct netconfig *));
+ const struct netconfig *);
/*
* void (*dispatch)(); -- dispatch routine
* const rpcprog_t prognum; -- program number
@@ -359,9 +357,9 @@ extern SVCXPRT *svc_tp_create __P((void (*) __P((struct svc_req *, SVCXPRT *)),
/*
* Generic TLI create routine
*/
-extern SVCXPRT *svc_tli_create __P((const int, const struct netconfig *,
- const struct t_bind *, const u_int,
- const u_int));
+extern SVCXPRT *svc_tli_create(const int, const struct netconfig *,
+ const struct t_bind *, const u_int,
+ const u_int);
/*
* const int fd; -- connection end point
* const struct netconfig *nconf; -- netconfig structure for network
@@ -374,7 +372,7 @@ extern SVCXPRT *svc_tli_create __P((const int, const struct netconfig *,
* Connectionless and connectionful create routines
*/
-extern SVCXPRT *svc_vc_create __P((const int, const u_int, const u_int));
+extern SVCXPRT *svc_vc_create(const int, const u_int, const u_int);
/*
* const int fd; -- open connection end point
* const u_int sendsize; -- max send size
@@ -384,9 +382,9 @@ extern SVCXPRT *svc_vc_create __P((const int, const u_int, const u_int));
/*
* Added for compatibility to old rpc 4.0. Obsoleted by svc_vc_create().
*/
-extern SVCXPRT *svcunix_create __P((int, u_int, u_int, char *));
+extern SVCXPRT *svcunix_create(int, u_int, u_int, char *);
-extern SVCXPRT *svc_dg_create __P((const int, const u_int, const u_int));
+extern SVCXPRT *svc_dg_create(const int, const u_int, const u_int);
/*
* const int fd; -- open connection
* const u_int sendsize; -- max send size
@@ -398,7 +396,7 @@ extern SVCXPRT *svc_dg_create __P((const int, const u_int, const u_int));
* the routine takes any *open* connection
* descriptor as its first input and is used for open connections.
*/
-extern SVCXPRT *svc_fd_create __P((const int, const u_int, const u_int));
+extern SVCXPRT *svc_fd_create(const int, const u_int, const u_int);
/*
* const int fd; -- open connection end point
* const u_int sendsize; -- max send size
@@ -408,17 +406,17 @@ extern SVCXPRT *svc_fd_create __P((const int, const u_int, const u_int));
/*
* Added for compatibility to old rpc 4.0. Obsoleted by svc_fd_create().
*/
-extern SVCXPRT *svcunixfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svcunixfd_create(int, u_int, u_int);
/*
* Memory based rpc (for speed check and testing)
*/
-extern SVCXPRT *svc_raw_create __P((void));
+extern SVCXPRT *svc_raw_create(void);
/*
* svc_dg_enable_cache() enables the cache on dg transports.
*/
-int svc_dg_enablecache __P((SVCXPRT *, const u_int));
+int svc_dg_enablecache(SVCXPRT *, const u_int);
int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid);
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 8f55339968e2..67df9765e62b 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -46,9 +46,9 @@
* Server side authenticator
*/
__BEGIN_DECLS
-extern enum auth_stat _authenticate __P((struct svc_req *, struct rpc_msg *));
-extern int svc_auth_reg __P((int, enum auth_stat (*) __P((struct svc_req *,
- struct rpc_msg *))));
+extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *);
+extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *,
+ struct rpc_msg *));
__END_DECLS
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index c3d16fec6341..6c528dbc95c6 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -65,8 +65,8 @@
* int protocol; like TCP or UDP, zero means do not register
*/
__BEGIN_DECLS
-extern bool_t svc_register __P((SVCXPRT *, u_long, u_long,
- void (*) __P((struct svc_req *, SVCXPRT *)), int));
+extern bool_t svc_register(SVCXPRT *, u_long, u_long,
+ void (*)(struct svc_req *, SVCXPRT *), int);
__END_DECLS
/*
@@ -77,7 +77,7 @@ __END_DECLS
* u_long vers;
*/
__BEGIN_DECLS
-extern void svc_unregister __P((u_long, u_long));
+extern void svc_unregister(u_long, u_long);
__END_DECLS
@@ -85,7 +85,7 @@ __END_DECLS
* Memory based rpc for testing and timing.
*/
__BEGIN_DECLS
-extern SVCXPRT *svcraw_create __P((void));
+extern SVCXPRT *svcraw_create(void);
__END_DECLS
@@ -93,9 +93,9 @@ __END_DECLS
* Udp based rpc.
*/
__BEGIN_DECLS
-extern SVCXPRT *svcudp_create __P((int));
-extern SVCXPRT *svcudp_bufcreate __P((int, u_int, u_int));
-extern int svcudp_enablecache __P((SVCXPRT *, u_long));
+extern SVCXPRT *svcudp_create(int);
+extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
+extern int svcudp_enablecache(SVCXPRT *, u_long);
__END_DECLS
@@ -103,14 +103,14 @@ __END_DECLS
* Tcp based rpc.
*/
__BEGIN_DECLS
-extern SVCXPRT *svctcp_create __P((int, u_int, u_int));
+extern SVCXPRT *svctcp_create(int, u_int, u_int);
__END_DECLS
/*
* Fd based rpc.
*/
__BEGIN_DECLS
-extern SVCXPRT *svcfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svcfd_create(int, u_int, u_int);
__END_DECLS
#endif /* !_RPC_SVC_SOC_H */
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 9867b252152b..0162c97159bf 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -101,22 +101,22 @@ typedef struct __rpc_xdr {
enum xdr_op x_op; /* operation; fast additional param */
const struct xdr_ops {
/* get a long from underlying stream */
- bool_t (*x_getlong) __P((struct __rpc_xdr *, long *));
+ bool_t (*x_getlong)(struct __rpc_xdr *, long *);
/* put a long to " */
- bool_t (*x_putlong) __P((struct __rpc_xdr *, const long *));
+ bool_t (*x_putlong)(struct __rpc_xdr *, const long *);
/* get some bytes from " */
- bool_t (*x_getbytes) __P((struct __rpc_xdr *, char *, u_int));
+ bool_t (*x_getbytes)(struct __rpc_xdr *, char *, u_int);
/* put some bytes to " */
- bool_t (*x_putbytes) __P((struct __rpc_xdr *, const char *, u_int));
+ bool_t (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
/* returns bytes off from beginning */
- u_int (*x_getpostn) __P((struct __rpc_xdr *));
+ u_int (*x_getpostn)(struct __rpc_xdr *);
/* lets you reposition the stream */
- bool_t (*x_setpostn) __P((struct __rpc_xdr *, u_int));
+ bool_t (*x_setpostn)(struct __rpc_xdr *, u_int);
/* buf quick ptr to buffered data */
- int32_t *(*x_inline) __P((struct __rpc_xdr *, u_int));
+ int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
/* free privates of this xdr_stream */
- void (*x_destroy) __P((struct __rpc_xdr *));
- bool_t (*x_control) __P((struct __rpc_xdr *, int, void *));
+ void (*x_destroy)(struct __rpc_xdr *);
+ bool_t (*x_control)(struct __rpc_xdr *, int, void *);
} *x_ops;
char * x_public; /* users' data */
void * x_private; /* pointer to private data */
@@ -133,12 +133,12 @@ typedef struct __rpc_xdr {
* allocate dynamic storage of the appropriate size and return it.
*/
#ifdef _KERNEL
-typedef bool_t (*xdrproc_t) __P((XDR *, void *, u_int));
+typedef bool_t (*xdrproc_t)(XDR *, void *, u_int);
#else
/*
* XXX can't actually prototype it, because some take three args!!!
*/
-typedef bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */));
+typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */);
#endif
/*
@@ -285,40 +285,40 @@ struct xdr_discrim {
* These are the "generic" xdr routines.
*/
__BEGIN_DECLS
-extern bool_t xdr_void __P((void));
-extern bool_t xdr_int __P((XDR *, int *));
-extern bool_t xdr_u_int __P((XDR *, u_int *));
-extern bool_t xdr_long __P((XDR *, long *));
-extern bool_t xdr_u_long __P((XDR *, u_long *));
-extern bool_t xdr_short __P((XDR *, short *));
-extern bool_t xdr_u_short __P((XDR *, u_short *));
-extern bool_t xdr_int16_t __P((XDR *, int16_t *));
-extern bool_t xdr_u_int16_t __P((XDR *, u_int16_t *));
-extern bool_t xdr_int32_t __P((XDR *, int32_t *));
-extern bool_t xdr_u_int32_t __P((XDR *, u_int32_t *));
-extern bool_t xdr_int64_t __P((XDR *, int64_t *));
-extern bool_t xdr_u_int64_t __P((XDR *, u_int64_t *));
-extern bool_t xdr_bool __P((XDR *, bool_t *));
-extern bool_t xdr_enum __P((XDR *, enum_t *));
-extern bool_t xdr_array __P((XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t xdr_bytes __P((XDR *, char **, u_int *, u_int));
-extern bool_t xdr_opaque __P((XDR *, char *, u_int));
-extern bool_t xdr_string __P((XDR *, char **, u_int));
-extern bool_t xdr_union __P((XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t));
-extern bool_t xdr_char __P((XDR *, char *));
-extern bool_t xdr_u_char __P((XDR *, u_char *));
-extern bool_t xdr_vector __P((XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t xdr_float __P((XDR *, float *));
-extern bool_t xdr_double __P((XDR *, double *));
-extern bool_t xdr_quadruple __P((XDR *, long double *));
-extern bool_t xdr_reference __P((XDR *, char **, u_int, xdrproc_t));
-extern bool_t xdr_pointer __P((XDR *, char **, u_int, xdrproc_t));
-extern bool_t xdr_wrapstring __P((XDR *, char **));
-extern void xdr_free __P((xdrproc_t, char *));
-extern bool_t xdr_hyper __P((XDR *, quad_t *));
-extern bool_t xdr_u_hyper __P((XDR *, u_quad_t *));
-extern bool_t xdr_longlong_t __P((XDR *, quad_t *));
-extern bool_t xdr_u_longlong_t __P((XDR *, u_quad_t *));
+extern bool_t xdr_void(void);
+extern bool_t xdr_int(XDR *, int *);
+extern bool_t xdr_u_int(XDR *, u_int *);
+extern bool_t xdr_long(XDR *, long *);
+extern bool_t xdr_u_long(XDR *, u_long *);
+extern bool_t xdr_short(XDR *, short *);
+extern bool_t xdr_u_short(XDR *, u_short *);
+extern bool_t xdr_int16_t(XDR *, int16_t *);
+extern bool_t xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t xdr_int32_t(XDR *, int32_t *);
+extern bool_t xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t xdr_int64_t(XDR *, int64_t *);
+extern bool_t xdr_u_int64_t(XDR *, u_int64_t *);
+extern bool_t xdr_bool(XDR *, bool_t *);
+extern bool_t xdr_enum(XDR *, enum_t *);
+extern bool_t xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_bytes(XDR *, char **, u_int *, u_int);
+extern bool_t xdr_opaque(XDR *, char *, u_int);
+extern bool_t xdr_string(XDR *, char **, u_int);
+extern bool_t xdr_union(XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t);
+extern bool_t xdr_char(XDR *, char *);
+extern bool_t xdr_u_char(XDR *, u_char *);
+extern bool_t xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_float(XDR *, float *);
+extern bool_t xdr_double(XDR *, double *);
+extern bool_t xdr_quadruple(XDR *, long double *);
+extern bool_t xdr_reference(XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_pointer(XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_wrapstring(XDR *, char **);
+extern void xdr_free(xdrproc_t, char *);
+extern bool_t xdr_hyper(XDR *, quad_t *);
+extern bool_t xdr_u_hyper(XDR *, u_quad_t *);
+extern bool_t xdr_longlong_t(XDR *, quad_t *);
+extern bool_t xdr_u_longlong_t(XDR *, u_quad_t *);
__END_DECLS
/*
@@ -331,7 +331,7 @@ struct netobj {
char *n_bytes;
};
typedef struct netobj netobj;
-extern bool_t xdr_netobj __P((XDR *, struct netobj *));
+extern bool_t xdr_netobj(XDR *, struct netobj *);
/*
* These are the public routines for the various implementations of
@@ -339,27 +339,27 @@ extern bool_t xdr_netobj __P((XDR *, struct netobj *));
*/
__BEGIN_DECLS
/* XDR using memory buffers */
-extern void xdrmem_create __P((XDR *, char *, u_int, enum xdr_op));
+extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op);
/* XDR using stdio library */
#ifdef _STDIO_H_
-extern void xdrstdio_create __P((XDR *, FILE *, enum xdr_op));
+extern void xdrstdio_create(XDR *, FILE *, enum xdr_op);
#endif
/* XDR pseudo records for tcp */
-extern void xdrrec_create __P((XDR *, u_int, u_int, char *,
- int (*) __P((char *, char *, int)),
- int (*) __P((char *, char *, int))));
+extern void xdrrec_create(XDR *, u_int, u_int, char *,
+ int (*)(char *, char *, int),
+ int (*)(char *, char *, int));
/* make end of xdr record */
-extern bool_t xdrrec_endofrecord __P((XDR *, int));
+extern bool_t xdrrec_endofrecord(XDR *, int);
/* move to beginning of next record */
-extern bool_t xdrrec_skiprecord __P((XDR *));
+extern bool_t xdrrec_skiprecord(XDR *);
/* true if no more input */
-extern bool_t xdrrec_eof __P((XDR *));
-extern u_int xdrrec_readbytes __P((XDR *, caddr_t, u_int));
+extern bool_t xdrrec_eof(XDR *);
+extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
__END_DECLS
#endif /* !_RPC_XDR_H */
diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h
index 784ac07fdb32..9dcc78376b1a 100644
--- a/include/rpcsvc/nis_db.h
+++ b/include/rpcsvc/nis_db.h
@@ -106,8 +106,6 @@ typedef struct db_result db_result;
* Prototypes for the database functions.
*/
-#if (__STDC__)
-
extern bool_t db_initialize(char *);
#ifdef ORIGINAL_DECLS
extern bool_t db_create_table(char *, table_obj *);
@@ -130,31 +128,6 @@ extern db_status db_unload_table(char *);
extern void db_free_result(db_result *);
#endif
-#else /* Non-prototype definitions */
-
-extern bool_t db_initialize();
-#ifdef ORIGINAL_DECLS
-extern bool_t db_create_table();
-extern bool_t db_destroy_table();
-#else
-extern db_status db_create_table();
-extern db_status db_destroy_table();
-#endif
-extern db_result *db_first_entry();
-extern db_result *db_next_entry();
-extern db_result *db_reset_next_entry();
-extern db_result *db_list_entries();
-extern db_result *db_add_entry();
-extern db_result *db_remove_entry();
-extern db_status db_checkpoint();
-extern db_status db_standby();
-#ifndef ORIGINAL_DECLS
-extern db_status db_table_exists();
-extern db_status db_unload_table();
-extern void db_free_result();
-#endif
-#endif /* __STDC__ */
-
#ifdef __cplusplus
}
#endif
diff --git a/include/rpcsvc/nislib.h b/include/rpcsvc/nislib.h
index 9f874d270e92..754affe9a430 100644
--- a/include/rpcsvc/nislib.h
+++ b/include/rpcsvc/nislib.h
@@ -25,6 +25,8 @@
* Sun Microsystems, Inc.
* 2550 Garcia Avenue
* Mountain View, California 94043
+ *
+ * $FreeBSD$
*/
/*
@@ -33,8 +35,7 @@
/*
* This file contains the interfaces that are visible in the SunOS 5.x
- * implementation of NIS Plus. When using C++ the defined __cplusplus and
- * __STDC__ should both be true.
+ * implementation of NIS Plus.
*/
#ifndef _RPCSVC_NISLIB_H
@@ -51,7 +52,6 @@ struct signature {
char *signature_val;
};
-#ifdef __STDC__
extern void nis_freeresult(nis_result *);
extern nis_result * nis_lookup(nis_name, u_long);
extern nis_result * nis_list(nis_name, u_long,
@@ -179,135 +179,6 @@ extern u_long __stop_clock(int);
extern struct signature *__nis_calculate_encrypted_cksum(unsigned char *, unsigned int, char *, int);
-#else
-
-/* Non-prototype definitions (old fashioned C) */
-
-extern void nis_freeresult();
-extern nis_result * nis_lookup();
-extern nis_result * nis_list();
-extern nis_result * nis_add();
-extern nis_result * nis_remove();
-extern nis_result * nis_modify();
-
-extern nis_result * nis_add_entry();
-extern nis_result * nis_remove_entry();
-extern nis_result * nis_modify_entry();
-extern nis_result * nis_first_entry();
-extern nis_result * nis_next_entry();
-
-extern nis_error nis_mkdir();
-extern nis_error nis_rmdir();
-extern name_pos nis_dir_cmp();
-
-extern nis_name *nis_getnames();
-extern void nis_freenames();
-extern nis_name nis_domain_of();
-extern nis_name nis_leaf_of();
-extern nis_name nis_leaf_of_r();
-extern nis_name nis_name_of();
-extern nis_name nis_local_group();
-extern nis_name nis_local_directory();
-extern nis_name nis_local_principal();
-extern nis_name nis_local_host();
-
-extern void nis_destroy_object();
-extern nis_object * nis_clone_object();
-extern void nis_print_object();
-
-extern char * nis_sperrno();
-extern void nis_perror();
-extern char * nis_sperror();
-extern void nis_lerror();
-
-extern void nis_print_group_entry();
-extern bool_t nis_ismember();
-extern nis_error nis_creategroup();
-extern nis_error nis_destroygroup();
-extern nis_error nis_addmember();
-extern nis_error nis_removemember();
-extern nis_error nis_verifygroup();
-
-extern void nis_freeservlist();
-extern nis_server ** nis_getservlist();
-extern nis_error nis_stats();
-extern nis_error nis_servstate();
-extern void nis_freetags();
-
-extern nis_result * nis_checkpoint();
-extern void nis_ping();
-
-/*
- * XXX: PLEASE NOTE THAT THE FOLLOWING FUNCTIONS ARE INTERNAL
- * TO NIS+ AND SHOULD NOT BE USED BY ANY APPLICATION PROGRAM.
- * THEIR SEMANTICS AND/OR SIGNATURE CAN CHANGE WITHOUT NOTICE.
- * SO, PLEASE DO NOT USE THEM. YOU ARE WARNED!!!!
- */
-extern char ** __break_name();
-extern int __name_distance();
-extern nis_result * nis_make_error();
-extern nis_attr * __cvt2attr();
-extern void nis_free_request();
-extern nis_error nis_get_request();
-extern nis_object * nis_read_obj();
-extern int nis_write_obj();
-extern int nis_in_table();
-extern int nis_insert_item();
-extern NIS_HASH_ITEM * nis_find_item();
-extern NIS_HASH_ITEM * nis_remove_item();
-extern void nis_insert_name();
-extern void nis_remove_name();
-extern CLIENT * nis_make_rpchandle();
-extern void * nis_get_static_storage();
-extern char * nis_data();
-
-extern void nis_print_rights();
-extern void nis_print_directory();
-extern void nis_print_group();
-extern void nis_print_table();
-extern void nis_print_link();
-extern void nis_print_entry();
-extern nis_object * nis_get_object();
-
-extern nis_server * __nis_init_callback();
-extern int nis_getdtblsize();
-extern int __nis_run_callback();
-
-extern log_result * nis_dump();
-extern log_result * nis_dumplog();
-
-extern bool_t __do_ismember();
-extern nis_name __nis_map_group();
-extern nis_name __nis_map_group_r();
-
-
-extern nis_error __nis_CacheBind();
-extern directory_obj * __nis_CacheSearch();
-extern bool_t __nis_CacheRemoveEntry();
-extern void __nis_CacheRestart();
-extern void __nis_CachePrint();
-extern void __nis_CacheDumpStatistics();
-extern bool_t writeColdStartFile();
-
-extern CLIENT * __get_ti_clnt();
-extern int __strcmp_case_insens();
-extern int __strncmp_case_insens();
-
-extern fd_result * nis_finddirectory();
-extern int __start_clock();
-extern u_long __stop_clock();
-
-/*
- * This particular function is part of the FreeBSD NIS+ implementation
- * only. Ideally it should be somewhere else, but it is used by both
- * rpc.nisd and nis_cachemgr, and there aren't that many headers common
- * to both programs.
- */
-
-extern struct signature *__nis_calculate_encrypted_cksum();
-
-#endif
-
#define NUL '\0'
#ifdef __cplusplus
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 64a742d3b9c0..3bf0f30e33dd 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -72,19 +72,15 @@ int yp_bind(char *dom);
int _yp_dobind(char *dom, struct dom_binding **ypdb);
void yp_unbind(char *dom);
int yp_get_default_domain(char **domp);
-int yp_match __P((char *indomain, char *inmap,
- const char *inkey, int inkeylen, char **outval,
- int *outvallen));
-int yp_first __P((char *indomain, char *inmap,
- char **outkey, int *outkeylen, char **outval,
- int *outvallen));
-int yp_next __P((char *indomain, char *inmap,
- char *inkey, int inkeylen, char **outkey,
- int *outkeylen, char **outval, int *outvallen));
+int yp_match(char *indomain, char *inmap, const char *inkey, int inkeylen,
+ char **outval, int *outvallen);
+int yp_first(char *indomain, char *inmap, char **outkey, int *outkeylen,
+ char **outval, int *outvallen);
+int yp_next(char *indomain, char *inmap, char *inkey, int inkeylen,
+ char **outkey, int *outkeylen, char **outval, int *outvallen);
int yp_master(char *indomain, char *inmap, char **outname);
int yp_order(char *indomain, char *inmap, int *outorder);
-int yp_all __P((char *indomain, char *inmap,
- struct ypall_callback *incallback));
+int yp_all(char *indomain, char *inmap, struct ypall_callback *incallback);
char * yperr_string(int incode);
char * ypbinderr_string(int incode);
int ypprot_err(unsigned int incode);
diff --git a/include/rune.h b/include/rune.h
index c1e2b88b4595..c81603b763e5 100644
--- a/include/rune.h
+++ b/include/rune.h
@@ -34,6 +34,7 @@
* SUCH DAMAGE.
*
* @(#)rune.h 8.1 (Berkeley) 6/27/93
+ * $FreeBSD$
*/
#ifndef _RUNE_H_
@@ -53,14 +54,14 @@
#define sputrune(c, s, n, r) (*__sputrune)((c), (s), (n), (r))
__BEGIN_DECLS
-char *mbrune __P((const char *, rune_t));
-char *mbrrune __P((const char *, rune_t));
-char *mbmb __P((const char *, char *));
-long fgetrune __P((FILE *));
-int fputrune __P((rune_t, FILE *));
-int fungetrune __P((rune_t, FILE *));
-int setrunelocale __P((char *));
-void setinvalidrune __P((rune_t));
+char *mbrune(const char *, rune_t);
+char *mbrrune(const char *, rune_t);
+char *mbmb(const char *, char *);
+long fgetrune(FILE *);
+int fputrune(rune_t, FILE *);
+int fungetrune(rune_t, FILE *);
+int setrunelocale(char *);
+void setinvalidrune(rune_t);
__END_DECLS
#endif /*! _RUNE_H_ */
diff --git a/include/runetype.h b/include/runetype.h
index e7fdf5d74b11..185f83e98307 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -34,6 +34,7 @@
* SUCH DAMAGE.
*
* @(#)runetype.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _RUNETYPE_H_
@@ -80,9 +81,9 @@ typedef struct {
char encoding[32]; /* ASCII name of this encoding */
rune_t (*sgetrune)
- __P((const char *, size_t, char const **));
+(const char *, size_t, char const **);
int (*sputrune)
- __P((rune_t, char *, size_t, char **));
+(rune_t, char *, size_t, char **);
rune_t invalid_rune;
unsigned long runetype[_CACHED_RUNES];
diff --git a/include/search.h b/include/search.h
index 370654a446d7..75f59bf2d1a7 100644
--- a/include/search.h
+++ b/include/search.h
@@ -41,16 +41,13 @@ typedef struct node {
#endif
__BEGIN_DECLS
-int hcreate __P((size_t));
-void hdestroy __P((void));
-ENTRY *hsearch __P((ENTRY, ACTION));
-void *tdelete __P((const void *, void **,
- int (*)(const void *, const void *)));
-void *tfind __P((const void *, void **,
- int (*)(const void *, const void *)));
-void *tsearch __P((const void *, void **,
- int (*)(const void *, const void *)));
-void twalk __P((const void *, void (*)(const void *, VISIT, int)));
+int hcreate(size_t);
+void hdestroy(void);
+ENTRY *hsearch(ENTRY, ACTION);
+void *tdelete(const void *, void **, int (*)(const void *, const void *));
+void *tfind(const void *, void **, int (*)(const void *, const void *));
+void *tsearch(const void *, void **, int (*)(const void *, const void *));
+void twalk(const void *, void (*)(const void *, VISIT, int));
__END_DECLS
#endif /* !_SEARCH_H_ */
diff --git a/include/setjmp.h b/include/setjmp.h
index 50934479f61e..8aff92e3567d 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -36,6 +36,7 @@
* SUCH DAMAGE.
*
* @(#)setjmp.h 8.2 (Berkeley) 1/21/94
+ * $FreeBSD$
*/
#ifndef _SETJMP_H_
@@ -47,18 +48,18 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-int setjmp __P((jmp_buf));
-void longjmp __P((jmp_buf, int)) __dead2;
+int setjmp(jmp_buf);
+void longjmp(jmp_buf, int) __dead2;
#ifndef _ANSI_SOURCE
-int sigsetjmp __P((sigjmp_buf, int));
-void siglongjmp __P((sigjmp_buf, int)) __dead2;
+int sigsetjmp(sigjmp_buf, int);
+void siglongjmp(sigjmp_buf, int) __dead2;
#endif /* not ANSI */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int _setjmp __P((jmp_buf));
-void _longjmp __P((jmp_buf, int)) __dead2;
-void longjmperror __P((void));
+int _setjmp(jmp_buf);
+void _longjmp(jmp_buf, int) __dead2;
+void longjmperror(void);
#endif /* neither ANSI nor POSIX */
__END_DECLS
diff --git a/include/signal.h b/include/signal.h
index fc3f164c9466..58ff0f8b7561 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -51,41 +51,41 @@ extern __const int sys_nsig;
#endif
__BEGIN_DECLS
-int raise __P((int));
+int raise(int);
#ifndef _ANSI_SOURCE
-int kill __P((_BSD_PID_T_, int));
-int sigaction __P((int, const struct sigaction *, struct sigaction *));
-int sigaddset __P((sigset_t *, int));
-int sigdelset __P((sigset_t *, int));
-int sigemptyset __P((sigset_t *));
-int sigfillset __P((sigset_t *));
-int sigismember __P((const sigset_t *, int));
-int sigpending __P((sigset_t *));
-int sigprocmask __P((int, const sigset_t *, sigset_t *));
-int sigsuspend __P((const sigset_t *));
-int sigwait __P((const sigset_t *, int *));
+int kill(_BSD_PID_T_, int);
+int sigaction(int, const struct sigaction *, struct sigaction *);
+int sigaddset(sigset_t *, int);
+int sigdelset(sigset_t *, int);
+int sigemptyset(sigset_t *);
+int sigfillset(sigset_t *);
+int sigismember(const sigset_t *, int);
+int sigpending(sigset_t *);
+int sigprocmask(int, const sigset_t *, sigset_t *);
+int sigsuspend(const sigset_t *);
+int sigwait(const sigset_t *, int *);
#ifdef _P1003_1B_VISIBLE
__BEGIN_DECLS
-int sigqueue __P((_BSD_PID_T_, int, const union sigval));
-int sigtimedwait __P((const sigset_t *, siginfo_t *, const struct timespec *));
-int sigwaitinfo __P((const sigset_t *, siginfo_t *));
+int sigqueue(_BSD_PID_T_, int, const union sigval);
+int sigtimedwait(const sigset_t *, siginfo_t *, const struct timespec *);
+int sigwaitinfo(const sigset_t *, siginfo_t *);
__END_DECLS
#endif
#ifndef _POSIX_SOURCE
-int killpg __P((_BSD_PID_T_, int));
-int sigaltstack __P((const stack_t *, stack_t *));
-int sigblock __P((int));
-int siginterrupt __P((int, int));
-int sigpause __P((int));
-int sigreturn __P((const struct __ucontext *));
-int sigsetmask __P((int));
-int sigstack __P((const struct sigstack *, struct sigstack *));
-int sigvec __P((int, struct sigvec *, struct sigvec *));
-void psignal __P((unsigned int, const char *));
+int killpg(_BSD_PID_T_, int);
+int sigaltstack(const stack_t *, stack_t *);
+int sigblock(int);
+int siginterrupt(int, int);
+int sigpause(int);
+int sigreturn(const struct __ucontext *);
+int sigsetmask(int);
+int sigstack(const struct sigstack *, struct sigstack *);
+int sigvec(int, struct sigvec *, struct sigvec *);
+void psignal(unsigned int, const char *);
#endif /* !_POSIX_SOURCE */
#endif /* !_ANSI_SOURCE */
__END_DECLS
diff --git a/include/stdio.h b/include/stdio.h
index 148f8a0020c3..5817f56cbdd3 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -108,10 +108,10 @@ typedef struct __sFILE {
/* operations */
void *_cookie; /* cookie passed to io functions */
- int (*_close) __P((void *));
- int (*_read) __P((void *, char *, int));
- fpos_t (*_seek) __P((void *, fpos_t, int));
- int (*_write) __P((void *, const char *, int));
+ int (*_close)(void *);
+ int (*_read)(void *, char *, int);
+ fpos_t (*_seek)(void *, fpos_t, int);
+ int (*_write)(void *, const char *, int);
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
@@ -212,51 +212,51 @@ __END_DECLS
* Functions defined in ANSI C standard.
*/
__BEGIN_DECLS
-void clearerr __P((FILE *));
-int fclose __P((FILE *));
-int feof __P((FILE *));
-int ferror __P((FILE *));
-int fflush __P((FILE *));
-int fgetc __P((FILE *));
-int fgetpos __P((FILE *, fpos_t *));
-char *fgets __P((char *, int, FILE *));
-FILE *fopen __P((const char *, const char *));
-int fprintf __P((FILE *, const char *, ...));
-int fputc __P((int, FILE *));
-int fputs __P((const char *, FILE *));
-size_t fread __P((void *, size_t, size_t, FILE *));
-FILE *freopen __P((const char *, const char *, FILE *));
-int fscanf __P((FILE *, const char *, ...));
-int fseek __P((FILE *, long, int));
-int fsetpos __P((FILE *, const fpos_t *));
-long ftell __P((FILE *));
-size_t fwrite __P((const void *, size_t, size_t, FILE *));
-int getc __P((FILE *));
-int getchar __P((void));
-char *gets __P((char *));
+void clearerr(FILE *);
+int fclose(FILE *);
+int feof(FILE *);
+int ferror(FILE *);
+int fflush(FILE *);
+int fgetc(FILE *);
+int fgetpos(FILE *, fpos_t *);
+char *fgets(char *, int, FILE *);
+FILE *fopen(const char *, const char *);
+int fprintf(FILE *, const char *, ...);
+int fputc(int, FILE *);
+int fputs(const char *, FILE *);
+size_t fread(void *, size_t, size_t, FILE *);
+FILE *freopen(const char *, const char *, FILE *);
+int fscanf(FILE *, const char *, ...);
+int fseek(FILE *, long, int);
+int fsetpos(FILE *, const fpos_t *);
+long ftell(FILE *);
+size_t fwrite(const void *, size_t, size_t, FILE *);
+int getc(FILE *);
+int getchar(void);
+char *gets(char *);
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
extern __const int sys_nerr; /* perror(3) external variables */
extern __const char *__const sys_errlist[];
#endif
-void perror __P((const char *));
-int printf __P((const char *, ...));
-int putc __P((int, FILE *));
-int putchar __P((int));
-int puts __P((const char *));
-int remove __P((const char *));
-int rename __P((const char *, const char *));
-void rewind __P((FILE *));
-int scanf __P((const char *, ...));
-void setbuf __P((FILE *, char *));
-int setvbuf __P((FILE *, char *, int, size_t));
-int sprintf __P((char *, const char *, ...));
-int sscanf __P((const char *, const char *, ...));
-FILE *tmpfile __P((void));
-char *tmpnam __P((char *));
-int ungetc __P((int, FILE *));
-int vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));
-int vprintf __P((const char *, _BSD_VA_LIST_));
-int vsprintf __P((char *, const char *, _BSD_VA_LIST_));
+void perror(const char *);
+int printf(const char *, ...);
+int putc(int, FILE *);
+int putchar(int);
+int puts(const char *);
+int remove(const char *);
+int rename(const char *, const char *);
+void rewind(FILE *);
+int scanf(const char *, ...);
+void setbuf(FILE *, char *);
+int setvbuf(FILE *, char *, int, size_t);
+int sprintf(char *, const char *, ...);
+int sscanf(const char *, const char *, ...);
+FILE *tmpfile(void);
+char *tmpnam(char *);
+int ungetc(int, FILE *);
+int vfprintf(FILE *, const char *, _BSD_VA_LIST_);
+int vprintf(const char *, _BSD_VA_LIST_);
+int vsprintf(char *, const char *, _BSD_VA_LIST_);
__END_DECLS
/*
@@ -269,12 +269,12 @@ __END_DECLS
#define L_ctermid 1024 /* size for ctermid(3); PATH_MAX */
__BEGIN_DECLS
-char *ctermid __P((char *));
-FILE *fdopen __P((int, const char *));
-int fileno __P((FILE *));
-int ftrylockfile __P((FILE *));
-void flockfile __P((FILE *));
-void funlockfile __P((FILE *));
+char *ctermid(char *);
+FILE *fdopen(int, const char *);
+int fileno(FILE *);
+int ftrylockfile(FILE *);
+void flockfile(FILE *);
+void funlockfile(FILE *);
__END_DECLS
#endif /* not ANSI */
@@ -285,19 +285,19 @@ __END_DECLS
__BEGIN_DECLS
#ifndef _FTRUNCATE_DECLARED
#define _FTRUNCATE_DECLARED
-int ftruncate __P((int, _BSD_OFF_T_));
+int ftruncate(int, _BSD_OFF_T_);
#endif
#ifndef _LSEEK_DECLARED
#define _LSEEK_DECLARED
-_BSD_OFF_T_ lseek __P((int, _BSD_OFF_T_, int));
+_BSD_OFF_T_ lseek(int, _BSD_OFF_T_, int);
#endif
#ifndef _MMAP_DECLARED
#define _MMAP_DECLARED
-void *mmap __P((void *, size_t, int, int, int, _BSD_OFF_T_));
+void *mmap(void *, size_t, int, int, int, _BSD_OFF_T_);
#endif
#ifndef _TRUNCATE_DECLARED
#define _TRUNCATE_DECLARED
-int truncate __P((const char *, _BSD_OFF_T_));
+int truncate(const char *, _BSD_OFF_T_);
#endif
__END_DECLS
#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
@@ -307,32 +307,32 @@ __END_DECLS
*/
#if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
__BEGIN_DECLS
-int asprintf __P((char **, const char *, ...)) __printflike(2, 3);
-char *ctermid_r __P((char *));
-char *fgetln __P((FILE *, size_t *));
+int asprintf(char **, const char *, ...) __printflike(2, 3);
+char *ctermid_r(char *);
+char *fgetln(FILE *, size_t *);
#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3
#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2)))
#else
#define __ATTR_FORMAT_ARG
#endif
-__const char *fmtcheck __P((const char *, const char *)) __ATTR_FORMAT_ARG;
-int fpurge __P((FILE *));
-int fseeko __P((FILE *, _BSD_OFF_T_, int));
-_BSD_OFF_T_ ftello __P((FILE *));
-int getw __P((FILE *));
-int pclose __P((FILE *));
-FILE *popen __P((const char *, const char *));
-int putw __P((int, FILE *));
-void setbuffer __P((FILE *, char *, int));
-int setlinebuf __P((FILE *));
-char *tempnam __P((const char *, const char *));
-int snprintf __P((char *, size_t, const char *, ...)) __printflike(3, 4);
-int vasprintf __P((char **, const char *, _BSD_VA_LIST_))
+__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG;
+int fpurge(FILE *);
+int fseeko(FILE *, _BSD_OFF_T_, int);
+_BSD_OFF_T_ ftello(FILE *);
+int getw(FILE *);
+int pclose(FILE *);
+FILE *popen(const char *, const char *);
+int putw(int, FILE *);
+void setbuffer(FILE *, char *, int);
+int setlinebuf(FILE *);
+char *tempnam(const char *, const char *);
+int snprintf(char *, size_t, const char *, ...) __printflike(3, 4);
+int vasprintf(char **, const char *, _BSD_VA_LIST_)
__printflike(2, 0);
-int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
+int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_)
__printflike(3, 0);
-int vscanf __P((const char *, _BSD_VA_LIST_)) __scanflike(1, 0);
-int vsscanf __P((const char *, const char *, _BSD_VA_LIST_))
+int vscanf(const char *, _BSD_VA_LIST_) __scanflike(1, 0);
+int vsscanf(const char *, const char *, _BSD_VA_LIST_)
__scanflike(2, 0);
__END_DECLS
@@ -347,11 +347,11 @@ __END_DECLS
* Stdio function-access interface.
*/
__BEGIN_DECLS
-FILE *funopen __P((const void *,
+FILE *funopen(const void *,
int (*)(void *, char *, int),
int (*)(void *, const char *, int),
fpos_t (*)(void *, fpos_t, int),
- int (*)(void *)));
+ int (*)(void *));
__END_DECLS
#define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
#define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
@@ -361,10 +361,10 @@ __END_DECLS
* Functions internal to the implementation.
*/
__BEGIN_DECLS
-int __srget __P((FILE *));
-int __vfscanf __P((FILE *, const char *, _BSD_VA_LIST_));
-int __svfscanf __P((FILE *, const char *, _BSD_VA_LIST_));
-int __swbuf __P((int, FILE *));
+int __srget(FILE *);
+int __vfscanf(FILE *, const char *, _BSD_VA_LIST_);
+int __svfscanf(FILE *, const char *, _BSD_VA_LIST_);
+int __swbuf(int, FILE *);
__END_DECLS
/*
diff --git a/include/stdlib.h b/include/stdlib.h
index 4ead1b58cd14..a76f8edb9a78 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -90,120 +90,118 @@ extern int __mb_cur_max;
#define MB_CUR_MAX __mb_cur_max
__BEGIN_DECLS
-void abort __P((void)) __dead2;
-int abs __P((int)) __pure2;
-int atexit __P((void (*)(void)));
-double atof __P((const char *));
-int atoi __P((const char *));
-long atol __P((const char *));
-void *bsearch __P((const void *, const void *, size_t,
- size_t, int (*)(const void *, const void *)));
-void *calloc __P((size_t, size_t));
-div_t div __P((int, int)) __pure2;
-void exit __P((int)) __dead2;
-void free __P((void *));
-char *getenv __P((const char *));
-long labs __P((long)) __pure2;
-ldiv_t ldiv __P((long, long)) __pure2;
-void *malloc __P((size_t));
-void qsort __P((void *, size_t, size_t,
- int (*)(const void *, const void *)));
-int rand __P((void));
-void *realloc __P((void *, size_t));
-void srand __P((unsigned));
-double strtod __P((const char *, char **));
-long strtol __P((const char *, char **, int));
+void abort(void) __dead2;
+int abs(int) __pure2;
+int atexit(void (*)(void));
+double atof(const char *);
+int atoi(const char *);
+long atol(const char *);
+void *bsearch(const void *, const void *, size_t,
+ size_t, int (*)(const void *, const void *));
+void *calloc(size_t, size_t);
+div_t div(int, int) __pure2;
+void exit(int) __dead2;
+void free(void *);
+char *getenv(const char *);
+long labs(long) __pure2;
+ldiv_t ldiv(long, long) __pure2;
+void *malloc(size_t);
+void qsort(void *, size_t, size_t,
+ int (*)(const void *, const void *));
+int rand(void);
+void *realloc(void *, size_t);
+void srand(unsigned);
+double strtod(const char *, char **);
+long strtol(const char *, char **, int);
unsigned long
- strtoul __P((const char *, char **, int));
-int system __P((const char *));
+ strtoul(const char *, char **, int);
+int system(const char *);
-int mblen __P((const char *, size_t));
-size_t mbstowcs __P((wchar_t *, const char *, size_t));
-int wctomb __P((char *, wchar_t));
-int mbtowc __P((wchar_t *, const char *, size_t));
-size_t wcstombs __P((char *, const wchar_t *, size_t));
+int mblen(const char *, size_t);
+size_t mbstowcs(wchar_t *, const char *, size_t);
+int wctomb(char *, wchar_t);
+int mbtowc(wchar_t *, const char *, size_t);
+size_t wcstombs(char *, const wchar_t *, size_t);
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
extern char *_malloc_options;
-extern void (*_malloc_message)__P((char *p1, char *p2, char *p3, char *p4));
-
-int putenv __P((const char *));
-int setenv __P((const char *, const char *, int));
-
-double drand48 __P((void));
-double erand48 __P((unsigned short[3]));
-long jrand48 __P((unsigned short[3]));
-void lcong48 __P((unsigned short[7]));
-long lrand48 __P((void));
-long mrand48 __P((void));
-long nrand48 __P((unsigned short[3]));
+extern void (*_malloc_message)(char *p1, char *p2, char *p3, char *p4);
+
+int putenv(const char *);
+int setenv(const char *, const char *, int);
+
+double drand48(void);
+double erand48(unsigned short[3]);
+long jrand48(unsigned short[3]);
+void lcong48(unsigned short[7]);
+long lrand48(void);
+long mrand48(void);
+long nrand48(unsigned short[3]);
unsigned short
- *seed48 __P((unsigned short[3]));
-void srand48 __P((long));
+ *seed48(unsigned short[3]);
+void srand48(long);
-void *alloca __P((size_t)); /* built-in for gcc */
+void *alloca(size_t); /* built-in for gcc */
/* getcap(3) functions */
__uint32_t
- arc4random __P((void));
-void arc4random_addrandom __P((unsigned char *dat, int datlen));
-void arc4random_stir __P((void));
+ arc4random(void);
+void arc4random_addrandom(unsigned char *dat, int datlen);
+void arc4random_stir(void);
#ifdef __LONG_LONG_SUPPORTED
long long
- atoll __P((const char *));
+ atoll(const char *);
#endif
-char *getbsize __P((int *, long *));
-char *cgetcap __P((char *, const char *, int));
-int cgetclose __P((void));
-int cgetent __P((char **, char **, const char *));
-int cgetfirst __P((char **, char **));
-int cgetmatch __P((const char *, const char *));
-int cgetnext __P((char **, char **));
-int cgetnum __P((char *, const char *, long *));
-int cgetset __P((const char *));
-int cgetstr __P((char *, const char *, char **));
-int cgetustr __P((char *, const char *, char **));
-
-int daemon __P((int, int));
-char *devname __P((int, int));
-int getloadavg __P((double [], int));
+char *getbsize(int *, long *);
+char *cgetcap(char *, const char *, int);
+int cgetclose(void);
+int cgetent(char **, char **, const char *);
+int cgetfirst(char **, char **);
+int cgetmatch(const char *, const char *);
+int cgetnext(char **, char **);
+int cgetnum(char *, const char *, long *);
+int cgetset(const char *);
+int cgetstr(char *, const char *, char **);
+int cgetustr(char *, const char *, char **);
+
+int daemon(int, int);
+char *devname(int, int);
+int getloadavg(double [], int);
__const char *
- getprogname __P((void));
+ getprogname(void);
-int heapsort __P((void *, size_t, size_t,
- int (*)(const void *, const void *)));
-char *initstate __P((unsigned long, char *, long));
+int heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
+char *initstate(unsigned long, char *, long);
#ifdef __LONG_LONG_SUPPORTED
long long
- llabs __P((long long)) __pure2;
-lldiv_t lldiv __P((long long, long long)) __pure2;
+ llabs(long long) __pure2;
+lldiv_t lldiv(long long, long long) __pure2;
#endif
-int mergesort __P((void *, size_t, size_t,
- int (*)(const void *, const void *)));
-int radixsort __P((const unsigned char **, int, const unsigned char *,
- unsigned));
-int sradixsort __P((const unsigned char **, int, const unsigned char *,
- unsigned));
-int rand_r __P((unsigned *));
-long random __P((void));
-void *reallocf __P((void *, size_t));
-char *realpath __P((const char *, char resolved_path[]));
-void setprogname __P((const char *));
-char *setstate __P((char *));
-void sranddev __P((void));
-void srandom __P((unsigned long));
-void srandomdev __P((void));
+int mergesort(void *, size_t, size_t, int (*)(const void *, const void *));
+int radixsort(const unsigned char **, int, const unsigned char *,
+ unsigned);
+int sradixsort(const unsigned char **, int, const unsigned char *,
+ unsigned);
+int rand_r(unsigned *);
+long random(void);
+void *reallocf(void *, size_t);
+char *realpath(const char *, char resolved_path[]);
+void setprogname(const char *);
+char *setstate(char *);
+void sranddev(void);
+void srandom(unsigned long);
+void srandomdev(void);
#ifdef __LONG_LONG_SUPPORTED
long long
- strtoll __P((const char *, char **, int));
+ strtoll(const char *, char **, int);
#endif
-__int64_t strtoq __P((const char *, char **, int));
+__int64_t strtoq(const char *, char **, int);
#ifdef __LONG_LONG_SUPPORTED
unsigned long long
- strtoull __P((const char *, char **, int));
+ strtoull(const char *, char **, int);
#endif
__uint64_t
- strtouq __P((const char *, char **, int));
-void unsetenv __P((const char *));
+ strtouq(const char *, char **, int);
+void unsetenv(const char *);
#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
__END_DECLS
diff --git a/include/string.h b/include/string.h
index 4a5bf910a2eb..acd2fd818dee 100644
--- a/include/string.h
+++ b/include/string.h
@@ -50,51 +50,51 @@ typedef _BSD_SIZE_T_ size_t;
#include <sys/cdefs.h>
__BEGIN_DECLS
-void *memchr __P((const void *, int, size_t));
-int memcmp __P((const void *, const void *, size_t));
-void *memcpy __P((void *, const void *, size_t));
-void *memmove __P((void *, const void *, size_t));
-void *memset __P((void *, int, size_t));
-char *strcat __P((char *, const char *));
-char *strchr __P((const char *, int));
-int strcmp __P((const char *, const char *));
-int strcoll __P((const char *, const char *));
-char *strcpy __P((char *, const char *));
-size_t strcspn __P((const char *, const char *));
-char *strerror __P((int));
-size_t strlen __P((const char *));
-char *strncat __P((char *, const char *, size_t));
-int strncmp __P((const char *, const char *, size_t));
-char *strncpy __P((char *, const char *, size_t));
-char *strpbrk __P((const char *, const char *));
-char *strrchr __P((const char *, int));
-size_t strspn __P((const char *, const char *));
-char *strstr __P((const char *, const char *));
-char *strtok __P((char *, const char *));
-size_t strxfrm __P((char *, const char *, size_t));
+void *memchr(const void *, int, size_t);
+int memcmp(const void *, const void *, size_t);
+void *memcpy(void *, const void *, size_t);
+void *memmove(void *, const void *, size_t);
+void *memset(void *, int, size_t);
+char *strcat(char *, const char *);
+char *strchr(const char *, int);
+int strcmp(const char *, const char *);
+int strcoll(const char *, const char *);
+char *strcpy(char *, const char *);
+size_t strcspn(const char *, const char *);
+char *strerror(int);
+size_t strlen(const char *);
+char *strncat(char *, const char *, size_t);
+int strncmp(const char *, const char *, size_t);
+char *strncpy(char *, const char *, size_t);
+char *strpbrk(const char *, const char *);
+char *strrchr(const char *, int);
+size_t strspn(const char *, const char *);
+char *strstr(const char *, const char *);
+char *strtok(char *, const char *);
+size_t strxfrm(char *, const char *, size_t);
/* Nonstandard routines */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int bcmp __P((const void *, const void *, size_t));
-void bcopy __P((const void *, void *, size_t));
-void bzero __P((void *, size_t));
-int ffs __P((int));
-char *index __P((const char *, int));
-void *memccpy __P((void *, const void *, int, size_t));
-char *rindex __P((const char *, int));
-int strcasecmp __P((const char *, const char *));
-char *strcasestr __P((const char *, const char *));
-char *strdup __P((const char *));
-int strerror_r __P((int, char *, size_t));
-size_t strlcat __P((char *, const char *, size_t));
-size_t strlcpy __P((char *, const char *, size_t));
-void strmode __P((int, char *));
-int strncasecmp __P((const char *, const char *, size_t));
-char *strnstr __P((const char *, const char *, size_t));
-char *strsep __P((char **, const char *));
-char *strsignal __P((int));
-char *strtok_r __P((char *, const char *, char **));
-void swab __P((const void *, void *, size_t));
+int bcmp(const void *, const void *, size_t);
+void bcopy(const void *, void *, size_t);
+void bzero(void *, size_t);
+int ffs(int);
+char *index(const char *, int);
+void *memccpy(void *, const void *, int, size_t);
+char *rindex(const char *, int);
+int strcasecmp(const char *, const char *);
+char *strcasestr(const char *, const char *);
+char *strdup(const char *);
+int strerror_r(int, char *, size_t);
+size_t strlcat(char *, const char *, size_t);
+size_t strlcpy(char *, const char *, size_t);
+void strmode(int, char *);
+int strncasecmp(const char *, const char *, size_t);
+char *strnstr(const char *, const char *, size_t);
+char *strsep(char **, const char *);
+char *strsignal(int);
+char *strtok_r(char *, const char *, char **);
+void swab(const void *, void *, size_t);
#endif
__END_DECLS
diff --git a/include/stringlist.h b/include/stringlist.h
index 138b2a71da0b..3f8b32a87152 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -29,6 +29,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#ifndef _STRINGLIST_H
@@ -46,10 +48,10 @@ typedef struct _stringlist {
} StringList;
__BEGIN_DECLS
-StringList *sl_init __P((void));
-void sl_add __P((StringList *, char *));
-void sl_free __P((StringList *, int));
-char *sl_find __P((StringList *, char *));
+StringList *sl_init(void);
+void sl_add(StringList *, char *);
+void sl_free(StringList *, int);
+char *sl_find(StringList *, char *);
__END_DECLS
#endif /* _STRINGLIST_H */
diff --git a/include/time.h b/include/time.h
index a5012a81a731..bdf037268d9a 100644
--- a/include/time.h
+++ b/include/time.h
@@ -125,49 +125,49 @@ extern char *tzname[];
#endif
__BEGIN_DECLS
-char *asctime __P((const struct tm *));
-clock_t clock __P((void));
-char *ctime __P((const time_t *));
-double difftime __P((time_t, time_t));
-struct tm *gmtime __P((const time_t *));
-struct tm *localtime __P((const time_t *));
-time_t mktime __P((struct tm *));
-size_t strftime __P((char *, size_t, const char *, const struct tm *));
-time_t time __P((time_t *));
+char *asctime(const struct tm *);
+clock_t clock(void);
+char *ctime(const time_t *);
+double difftime(time_t, time_t);
+struct tm *gmtime(const time_t *);
+struct tm *localtime(const time_t *);
+time_t mktime(struct tm *);
+size_t strftime(char *, size_t, const char *, const struct tm *);
+time_t time(time_t *);
#ifndef _ANSI_SOURCE
-time_t _time32_to_time __P((__int32_t t32));
-__int32_t _time_to_time32 __P((time_t t));
-time_t _time64_to_time __P((__int64_t t64));
-__int64_t _time_to_time64 __P((time_t t));
-long _time_to_long __P((time_t t));
-time_t _long_to_time __P((long tlong));
-int _time_to_int __P((time_t t));
-time_t _int_to_time __P((int tint));
+time_t _time32_to_time(__int32_t t32);
+__int32_t _time_to_time32(time_t t);
+time_t _time64_to_time(__int64_t t64);
+__int64_t _time_to_time64(time_t t);
+long _time_to_long(time_t t);
+time_t _long_to_time(long tlong);
+int _time_to_int(time_t t);
+time_t _int_to_time(int tint);
#endif /* not ANSI */
#ifndef _ANSI_SOURCE
-void tzset __P((void));
+void tzset(void);
#endif /* not ANSI */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-char *asctime_r __P((const struct tm *, char *));
-char *ctime_r __P((const time_t *, char *));
-struct tm *gmtime_r __P((const time_t *, struct tm *));
-struct tm *localtime_r __P((const time_t *, struct tm *));
-char *strptime __P((const char *, const char *, struct tm *));
-char *timezone __P((int, int));
-void tzsetwall __P((void));
-time_t timelocal __P((struct tm * const));
-time_t timegm __P((struct tm * const));
+char *asctime_r(const struct tm *, char *);
+char *ctime_r(const time_t *, char *);
+struct tm *gmtime_r(const time_t *, struct tm *);
+struct tm *localtime_r(const time_t *, struct tm *);
+char *strptime(const char *, const char *, struct tm *);
+char *timezone(int, int);
+void tzsetwall(void);
+time_t timelocal(struct tm * const);
+time_t timegm(struct tm * const);
#endif /* neither ANSI nor POSIX */
#if !defined(_ANSI_SOURCE) && defined(_P1003_1B_VISIBLE_HISTORICALLY)
/* Introduced in POSIX 1003.1b-1993, not part of 1003.1-1990. */
-int clock_getres __P((clockid_t, struct timespec *));
-int clock_gettime __P((clockid_t, struct timespec *));
-int clock_settime __P((clockid_t, const struct timespec *));
-int nanosleep __P((const struct timespec *, struct timespec *));
+int clock_getres(clockid_t, struct timespec *);
+int clock_gettime(clockid_t, struct timespec *);
+int clock_settime(clockid_t, const struct timespec *);
+int nanosleep(const struct timespec *, struct timespec *);
#endif /* neither ANSI nor POSIX */
__END_DECLS
diff --git a/include/ttyent.h b/include/ttyent.h
index bfb5a9d3da65..12902d097fcf 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -31,6 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ttyent.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _TTYENT_H_
@@ -65,12 +66,12 @@ struct ttyent {
#include <sys/cdefs.h>
__BEGIN_DECLS
-struct ttyent *getttyent __P((void));
-struct ttyent *getttynam __P((const char *));
-int setttyent __P((void));
-int endttyent __P((void));
-int isdialuptty __P((const char *));
-int isnettty __P((const char *));
+struct ttyent *getttyent(void);
+struct ttyent *getttynam(const char *);
+int setttyent(void);
+int endttyent(void);
+int isdialuptty(const char *);
+int isnettty(const char *);
__END_DECLS
#endif /* !_TTYENT_H_ */
diff --git a/include/unistd.h b/include/unistd.h
index 56e9de329dc8..3819e57470a2 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -57,175 +57,172 @@
#endif
__BEGIN_DECLS
-void _exit __P((int)) __dead2;
-int access __P((const char *, int));
-unsigned int alarm __P((unsigned int));
-int chdir __P((const char *));
-int chown __P((const char *, uid_t, gid_t));
-int close __P((int));
-int dup __P((int));
-int dup2 __P((int, int));
-int eaccess __P((const char *, int));
-int execl __P((const char *, const char *, ...));
-int execle __P((const char *, const char *, ...));
-int execlp __P((const char *, const char *, ...));
-int execv __P((const char *, char * const *));
-int execve __P((const char *, char * const *, char * const *));
-int execvp __P((const char *, char * const *));
-pid_t fork __P((void));
-long fpathconf __P((int, int));
-char *getcwd __P((char *, size_t));
-gid_t getegid __P((void));
-uid_t geteuid __P((void));
-gid_t getgid __P((void));
-int getgroups __P((int, gid_t []));
-char *getlogin __P((void));
-pid_t getpgrp __P((void));
-pid_t getpid __P((void));
-pid_t getppid __P((void));
-uid_t getuid __P((void));
-int isatty __P((int));
-int link __P((const char *, const char *));
+void _exit(int) __dead2;
+int access(const char *, int);
+unsigned int alarm(unsigned int);
+int chdir(const char *);
+int chown(const char *, uid_t, gid_t);
+int close(int);
+int dup(int);
+int dup2(int, int);
+int eaccess(const char *, int);
+int execl(const char *, const char *, ...);
+int execle(const char *, const char *, ...);
+int execlp(const char *, const char *, ...);
+int execv(const char *, char * const *);
+int execve(const char *, char * const *, char * const *);
+int execvp(const char *, char * const *);
+pid_t fork(void);
+long fpathconf(int, int);
+char *getcwd(char *, size_t);
+gid_t getegid(void);
+uid_t geteuid(void);
+gid_t getgid(void);
+int getgroups(int, gid_t []);
+char *getlogin(void);
+pid_t getpgrp(void);
+pid_t getpid(void);
+pid_t getppid(void);
+uid_t getuid(void);
+int isatty(int);
+int link(const char *, const char *);
#ifndef _LSEEK_DECLARED
#define _LSEEK_DECLARED
-off_t lseek __P((int, off_t, int));
+off_t lseek(int, off_t, int);
#endif
-long pathconf __P((const char *, int));
-int pause __P((void));
-int pipe __P((int *));
-ssize_t read __P((int, void *, size_t));
-int rmdir __P((const char *));
-int setgid __P((gid_t));
-int setpgid __P((pid_t, pid_t));
-void setproctitle __P((const char *_fmt, ...)) __printf0like(1, 2);
-pid_t setsid __P((void));
-int setuid __P((uid_t));
-unsigned int sleep __P((unsigned int));
-long sysconf __P((int));
-pid_t tcgetpgrp __P((int));
-int tcsetpgrp __P((int, pid_t));
-char *ttyname __P((int));
-int unlink __P((const char *));
-ssize_t write __P((int, const void *, size_t));
+long pathconf(const char *, int);
+int pause(void);
+int pipe(int *);
+ssize_t read(int, void *, size_t);
+int rmdir(const char *);
+int setgid(gid_t);
+int setpgid(pid_t, pid_t);
+void setproctitle(const char *_fmt, ...) __printf0like(1, 2);
+pid_t setsid(void);
+int setuid(uid_t);
+unsigned int sleep(unsigned int);
+long sysconf(int);
+pid_t tcgetpgrp(int);
+int tcsetpgrp(int, pid_t);
+char *ttyname(int);
+int unlink(const char *);
+ssize_t write(int, const void *, size_t);
extern char *optarg; /* getopt(3) external variables */
extern int optind, opterr, optopt;
-int getopt __P((int, char * const [], const char *));
+int getopt(int, char * const [], const char *);
#ifndef _POSIX_SOURCE
-#ifdef __STDC__
struct timeval; /* select(2) */
-#endif
-int acct __P((const char *));
-int async_daemon __P((void));
-int brk __P((const void *));
-int chroot __P((const char *));
-size_t confstr __P((int, char *, size_t));
-char *crypt __P((const char *, const char *));
+int acct(const char *);
+int async_daemon(void);
+int brk(const void *);
+int chroot(const char *);
+size_t confstr(int, char *, size_t);
+char *crypt(const char *, const char *);
__const char *
- crypt_get_format __P((void));
-int crypt_set_format __P((const char *));
-int des_cipher __P((const char *, char *, long, int));
-int des_setkey __P((const char *key));
-int encrypt __P((char *, int));
-void endusershell __P((void));
-int exect __P((const char *, char * const *, char * const *));
-int fchdir __P((int));
-int fchown __P((int, uid_t, gid_t));
-char *fflagstostr __P((u_long));
-int fsync __P((int));
+ crypt_get_format(void);
+int crypt_set_format(const char *);
+int des_cipher(const char *, char *, long, int);
+int des_setkey(const char *key);
+int encrypt(char *, int);
+void endusershell(void);
+int exect(const char *, char * const *, char * const *);
+int fchdir(int);
+int fchown(int, uid_t, gid_t);
+char *fflagstostr(u_long);
+int fsync(int);
#ifndef _FTRUNCATE_DECLARED
#define _FTRUNCATE_DECLARED
-int ftruncate __P((int, off_t));
+int ftruncate(int, off_t);
#endif
-int getdomainname __P((char *, int));
-int getdtablesize __P((void));
-int getgrouplist __P((const char *, gid_t, gid_t *, int *));
-long gethostid __P((void));
-int gethostname __P((char *, int));
-int getlogin_r __P((char *, int));
-mode_t getmode __P((const void *, mode_t));
-int getpagesize __P((void)) __pure2;
-char *getpass __P((const char *));
-int getpeereid __P((int, uid_t *, gid_t *));
-int getpgid __P((pid_t _pid));
-int getresgid __P((gid_t *, gid_t *, gid_t *));
-int getresuid __P((uid_t *, uid_t *, uid_t *));
-int getsid __P((pid_t _pid));
-char *getusershell __P((void));
-char *getwd __P((char *)); /* obsoleted by getcwd() */
-int initgroups __P((const char *, gid_t));
-int iruserok __P((unsigned long, int, const char *, const char *));
-int iruserok_sa __P((const void *, int, int, const char *, const char *));
-int issetugid __P((void));
-int lchown __P((const char *, uid_t, gid_t));
-int lockf __P((int, int, off_t));
-char *mkdtemp __P((char *));
-int mknod __P((const char *, mode_t, dev_t));
-int mkstemp __P((char *));
-int mkstemps __P((char *, int));
-char *mktemp __P((char *));
-int nfsclnt __P((int, void *));
-int nfssvc __P((int, void *));
-int nice __P((int));
-ssize_t pread __P((int, void *, size_t, off_t));
-int profil __P((char *, size_t, vm_offset_t, int));
-ssize_t pwrite __P((int, const void *, size_t, off_t));
-int rcmd __P((char **, int, const char *,
- const char *, const char *, int *));
-int rcmd_af __P((char **, int, const char *,
- const char *, const char *, int *, int));
-int rcmdsh __P((char **, int, const char *,
- const char *, const char *, const char *));
-char *re_comp __P((const char *));
-int re_exec __P((const char *));
-int readlink __P((const char *, char *, int));
-int reboot __P((int));
-int revoke __P((const char *));
-pid_t rfork __P((int));
-pid_t rfork_thread __P((int, void *, int (*)(void *), void *));
-int rresvport __P((int *));
-int rresvport_af __P((int *, int));
-int ruserok __P((const char *, int, const char *, const char *));
-void *sbrk __P((intptr_t));
-int select __P((int, fd_set *, fd_set *, fd_set *, struct timeval *));
-int setdomainname __P((const char *, int));
-int setegid __P((gid_t));
-int seteuid __P((uid_t));
-int setgroups __P((int, const gid_t *));
-void sethostid __P((long));
-int sethostname __P((const char *, int));
-int setkey __P((const char *));
-int setlogin __P((const char *));
-void *setmode __P((const char *));
-int setpgrp __P((pid_t _pid, pid_t _pgrp)); /* obsoleted by setpgid() */
-int setregid __P((gid_t, gid_t));
-int setresgid __P((gid_t, gid_t, gid_t));
-int setresuid __P((uid_t, uid_t, uid_t));
-int setreuid __P((uid_t, uid_t));
-int setrgid __P((gid_t));
-int setruid __P((uid_t));
-void setusershell __P((void));
-int strtofflags __P((char **, u_long *, u_long *));
-int swapon __P((const char *));
-int symlink __P((const char *, const char *));
-void sync __P((void));
-int syscall __P((int, ...));
-off_t __syscall __P((quad_t, ...));
+int getdomainname(char *, int);
+int getdtablesize(void);
+int getgrouplist(const char *, gid_t, gid_t *, int *);
+long gethostid(void);
+int gethostname(char *, int);
+int getlogin_r(char *, int);
+mode_t getmode(const void *, mode_t);
+int getpagesize(void) __pure2;
+char *getpass(const char *);
+int getpeereid(int, uid_t *, gid_t *);
+int getpgid(pid_t _pid);
+int getresgid(gid_t *, gid_t *, gid_t *);
+int getresuid(uid_t *, uid_t *, uid_t *);
+int getsid(pid_t _pid);
+char *getusershell(void);
+char *getwd(char *); /* obsoleted by getcwd() */
+int initgroups(const char *, gid_t);
+int iruserok(unsigned long, int, const char *, const char *);
+int iruserok_sa(const void *, int, int, const char *, const char *);
+int issetugid(void);
+int lchown(const char *, uid_t, gid_t);
+int lockf(int, int, off_t);
+char *mkdtemp(char *);
+int mknod(const char *, mode_t, dev_t);
+int mkstemp(char *);
+int mkstemps(char *, int);
+char *mktemp(char *);
+int nfsclnt(int, void *);
+int nfssvc(int, void *);
+int nice(int);
+ssize_t pread(int, void *, size_t, off_t);
+int profil(char *, size_t, vm_offset_t, int);
+ssize_t pwrite(int, const void *, size_t, off_t);
+int rcmd(char **, int, const char *, const char *, const char *, int *);
+int rcmd_af(char **, int, const char *,
+ const char *, const char *, int *, int);
+int rcmdsh(char **, int, const char *,
+ const char *, const char *, const char *);
+char *re_comp(const char *);
+int re_exec(const char *);
+int readlink(const char *, char *, int);
+int reboot(int);
+int revoke(const char *);
+pid_t rfork(int);
+pid_t rfork_thread(int, void *, int (*)(void *), void *);
+int rresvport(int *);
+int rresvport_af(int *, int);
+int ruserok(const char *, int, const char *, const char *);
+void *sbrk(intptr_t);
+int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+int setdomainname(const char *, int);
+int setegid(gid_t);
+int seteuid(uid_t);
+int setgroups(int, const gid_t *);
+void sethostid(long);
+int sethostname(const char *, int);
+int setkey(const char *);
+int setlogin(const char *);
+void *setmode(const char *);
+int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */
+int setregid(gid_t, gid_t);
+int setresgid(gid_t, gid_t, gid_t);
+int setresuid(uid_t, uid_t, uid_t);
+int setreuid(uid_t, uid_t);
+int setrgid(gid_t);
+int setruid(uid_t);
+void setusershell(void);
+int strtofflags(char **, u_long *, u_long *);
+int swapon(const char *);
+int symlink(const char *, const char *);
+void sync(void);
+int syscall(int, ...);
+off_t __syscall(quad_t, ...);
#ifndef _TRUNCATE_DECLARED
#define _TRUNCATE_DECLARED
-int truncate __P((const char *, off_t));
+int truncate(const char *, off_t);
#endif
-int ttyslot __P((void));
-unsigned int ualarm __P((unsigned int, unsigned int));
-int undelete __P((const char *));
-int unwhiteout __P((const char *));
-int usleep __P((unsigned int));
-void *valloc __P((size_t)); /* obsoleted by malloc() */
-pid_t vfork __P((void));
+int ttyslot(void);
+unsigned int ualarm(unsigned int, unsigned int);
+int undelete(const char *);
+int unwhiteout(const char *);
+int usleep(unsigned int);
+void *valloc(size_t); /* obsoleted by malloc() */
+pid_t vfork(void);
extern char *suboptarg; /* getsubopt(3) external variable */
-int getsubopt __P((char **, char * const *, char **));
+int getsubopt(char **, char * const *, char **);
#endif /* !_POSIX_SOURCE */
extern int optreset; /* getopt(3) external variable */
__END_DECLS
diff --git a/include/utime.h b/include/utime.h
index 1ea12d0cb16b..64511c074fa8 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -31,6 +31,7 @@
* SUCH DAMAGE.
*
* @(#)utime.h 8.1 (Berkeley) 6/2/93
+ * $FreeBSD$
*/
#ifndef _UTIME_H_
@@ -44,7 +45,7 @@ struct utimbuf {
#include <sys/cdefs.h>
__BEGIN_DECLS
-int utime __P((const char *, const struct utimbuf *));
+int utime(const char *, const struct utimbuf *);
__END_DECLS
#endif /* !_UTIME_H_ */
diff --git a/include/vis.h b/include/vis.h
index 22feaa99c065..f630db7290b9 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -83,12 +83,12 @@ typedef _BSD_SIZE_T_ size_t;
#include <sys/cdefs.h>
__BEGIN_DECLS
-char *vis __P((char *, int, int, int));
-int strvis __P((char *, const char *, int));
-int strvisx __P((char *, const char *, size_t, int));
-int strunvis __P((char *, const char *));
-int strunvisx __P((char *, const char *, int));
-int unvis __P((char *, int, int *, int));
+char *vis(char *, int, int, int);
+int strvis(char *, const char *, int);
+int strvisx(char *, const char *, size_t, int);
+int strunvis(char *, const char *);
+int strunvisx(char *, const char *, int);
+int unvis(char *, int, int *, int);
__END_DECLS
#endif /* !_VIS_H_ */
diff --git a/include/wchar.h b/include/wchar.h
index c14c1b785c2b..a27fc54484b5 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -100,47 +100,45 @@ typedef _BSD_SIZE_T_ size_t;
__BEGIN_DECLS
#if 0
/* XXX: not implemented */
-size_t mbrlen __P((const char * __restrict, size_t, mbstate_t * __restrict));
-size_t mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t,
- mbstate_t * __restrict));
-int mbsinit __P((const mbstate_t *));
-size_t mbsrtowcs __P((wchar_t * __restrict, const char ** __restrict, size_t,
- mbstate_t * __restrict));
-size_t wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict));
+size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
+size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
+ mbstate_t * __restrict);
+int mbsinit(const mbstate_t *);
+size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
+ mbstate_t * __restrict);
+size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
#endif
-wchar_t *wcscat __P((wchar_t * __restrict, const wchar_t * __restrict));
-wchar_t *wcschr __P((const wchar_t *, wchar_t));
-int wcscmp __P((const wchar_t *, const wchar_t *));
-wchar_t *wcscpy __P((wchar_t * __restrict, const wchar_t * __restrict));
-size_t wcscspn __P((const wchar_t *, const wchar_t *));
-size_t wcslen __P((const wchar_t *));
-wchar_t *wcsncat __P((wchar_t * __restrict, const wchar_t * __restrict,
- size_t));
-int wcsncmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t *wcsncpy __P((wchar_t * __restrict , const wchar_t * __restrict,
- size_t));
-wchar_t *wcspbrk __P((const wchar_t *, const wchar_t *));
-wchar_t *wcsrchr __P((const wchar_t *, wchar_t));
+wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict);
+wchar_t *wcschr(const wchar_t *, wchar_t);
+int wcscmp(const wchar_t *, const wchar_t *);
+wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
+size_t wcscspn(const wchar_t *, const wchar_t *);
+size_t wcslen(const wchar_t *);
+wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict,
+ size_t);
+int wcsncmp(const wchar_t *, const wchar_t *, size_t);
+wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t);
+wchar_t *wcspbrk(const wchar_t *, const wchar_t *);
+wchar_t *wcsrchr(const wchar_t *, wchar_t);
#if 0
/* XXX: not implemented */
-size_t wcsrtombs __P((char * __restrict, const wchar_t ** __restrict, size_t,
- mbstate_t * __restrict));
+size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
+ mbstate_t * __restrict);
#endif
-size_t wcsspn __P((const wchar_t *, const wchar_t *));
-wchar_t *wcsstr __P((const wchar_t *, const wchar_t *));
-wchar_t *wmemchr __P((const wchar_t *, wchar_t, size_t));
-int wmemcmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t *wmemcpy __P((wchar_t * __restrict, const wchar_t * __restrict,
- size_t));
-wchar_t *wmemmove __P((wchar_t *, const wchar_t *, size_t));
-wchar_t *wmemset __P((wchar_t *, wchar_t, size_t));
+size_t wcsspn(const wchar_t *, const wchar_t *);
+wchar_t *wcsstr(const wchar_t *, const wchar_t *);
+wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
+int wmemcmp(const wchar_t *, const wchar_t *, size_t);
+wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
+wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t);
+wchar_t *wmemset(wchar_t *, wchar_t, size_t);
-size_t wcslcat __P((wchar_t *, const wchar_t *, size_t));
-size_t wcslcpy __P((wchar_t *, const wchar_t *, size_t));
+size_t wcslcat(wchar_t *, const wchar_t *, size_t);
+size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
#if 0
/* XXX: not implemented */
-int wcswidth __P((const wchar_t *, size_t));
-int wcwidth __P((wchar_t));
+int wcswidth(const wchar_t *, size_t);
+int wcwidth(wchar_t);
#endif
__END_DECLS
diff --git a/include/wctype.h b/include/wctype.h
index 6c4ce479edd3..366dbdb5ff36 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -46,20 +46,20 @@ typedef _BSD_WINT_T_ wint_t;
#endif
__BEGIN_DECLS
-int iswalnum __P((wint_t));
-int iswalpha __P((wint_t));
-int iswblank __P((wint_t));
-int iswcntrl __P((wint_t));
-int iswdigit __P((wint_t));
-int iswgraph __P((wint_t));
-int iswlower __P((wint_t));
-int iswprint __P((wint_t));
-int iswpunct __P((wint_t));
-int iswspace __P((wint_t));
-int iswupper __P((wint_t));
-int iswxdigit __P((wint_t));
-wint_t towlower __P((wint_t));
-wint_t towupper __P((wint_t));
+int iswalnum(wint_t);
+int iswalpha(wint_t);
+int iswblank(wint_t);
+int iswcntrl(wint_t);
+int iswdigit(wint_t);
+int iswgraph(wint_t);
+int iswlower(wint_t);
+int iswprint(wint_t);
+int iswpunct(wint_t);
+int iswspace(wint_t);
+int iswupper(wint_t);
+int iswxdigit(wint_t);
+wint_t towlower(wint_t);
+wint_t towupper(wint_t);
__END_DECLS
#endif /* _WCTYPE_H_ */