From 7c4af8e108a4cb6d2404ed89fafa3169ae75eb60 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 14 Nov 2003 01:01:51 +0000 Subject: [PATCH] Remove __P() macros from include/ Submitted-by: Craig Dooley --- gnu/usr.bin/as/config/ho-sysv.h | 43 +++-- include/arpa/inet.h | 34 ++-- include/arpa/nameser.h | 48 +++--- include/assert.h | 3 +- include/complex.h | 14 +- include/ctype.h | 62 +++---- include/db.h | 33 ++-- include/dirent.h | 28 +-- include/dlfcn.h | 18 +- include/err.h | 30 ++-- include/fnmatch.h | 4 +- include/fstab.h | 11 +- include/fts.h | 16 +- include/glob.h | 18 +- include/grp.h | 15 +- include/histedit.h | 38 ++-- include/ieeefp.h | 14 +- include/ifaddrs.h | 6 +- include/langinfo.h | 4 +- include/libgen.h | 10 +- include/link.h | 18 +- include/locale.h | 5 +- include/math.h | 95 +++++----- include/mpool.h | 24 +-- include/ndbm.h | 23 +-- include/netdb.h | 122 ++++++------- include/nl_types.h | 8 +- include/nlist.h | 4 +- include/pthread.h | 224 ++++++++++++------------ include/pthread_np.h | 32 ++-- include/pwd.h | 13 +- include/regex.h | 11 +- include/regexp.h | 9 +- include/resolv.h | 120 ++++++------- include/rpc/auth.h | 66 +++---- include/rpc/auth_des.h | 6 +- include/rpc/auth_unix.h | 4 +- include/rpc/clnt.h | 54 +++--- include/rpc/des.h | 6 +- include/rpc/des_crypt.h | 8 +- include/rpc/pmap_clnt.h | 28 +-- include/rpc/pmap_prot.h | 6 +- include/rpc/pmap_rmt.h | 6 +- include/rpc/rpc.h | 20 +-- include/rpc/rpc_msg.h | 10 +- include/rpc/svc.h | 70 ++++---- include/rpc/svc_auth.h | 10 +- include/rpc/xdr.h | 100 +++++------ include/rpcsvc/ypclnt.h | 18 +- include/rpcsvc/yppasswd.x | 4 +- include/rune.h | 17 +- include/runetype.h | 6 +- include/search.h | 22 +-- include/setjmp.h | 15 +- include/signal.h | 52 +++--- include/stdio.h | 162 ++++++++--------- include/stdlib.h | 176 +++++++++---------- include/string.h | 86 +++++----- include/stringlist.h | 13 +- include/time.h | 48 +++--- include/ttyent.h | 13 +- include/unistd.h | 296 ++++++++++++++++---------------- include/utime.h | 3 +- include/vis.h | 12 +- include/wchar.h | 56 +++--- include/wctype.h | 30 ++-- 66 files changed, 1303 insertions(+), 1277 deletions(-) diff --git a/gnu/usr.bin/as/config/ho-sysv.h b/gnu/usr.bin/as/config/ho-sysv.h index 5407e5d319..c516d3396b 100644 --- a/gnu/usr.bin/as/config/ho-sysv.h +++ b/gnu/usr.bin/as/config/ho-sysv.h @@ -1,25 +1,32 @@ /* ho-sysv.h System V specific header file. - Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. - - This file is part of GAS, the GNU Assembler. - - GAS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GAS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + * Copyright (C) 1987, 1991, 1992 Free Software Foundation, Inc. + * + * This file is part of GAS, the GNU Assembler. + * + * GAS is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * GAS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GAS; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * $DragonFly: src/gnu/usr.bin/as/config/Attic/ho-sysv.h,v 1.2 2003/11/14 01:01:42 dillon Exp $ + */ #define HO_USG -#define setbuffer(stream, buf, size) setvbuf((stream), (buf), _IOLBF, (size)) +/* + * #define setbuffer(stream, buf, size) setvbuf((stream), (buf), _IOLBF, (size)) + */ extern int free(); extern char *malloc(); diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 76d9c28faf..b361180310 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -53,7 +53,7 @@ * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ * $FreeBSD: src/include/arpa/inet.h,v 1.11.2.1 2001/04/21 14:53:03 ume Exp $ - * $DragonFly: src/include/arpa/inet.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/arpa/inet.h,v 1.3 2003/11/14 01:01:47 dillon Exp $ */ #ifndef _ARPA_INET_H_ @@ -83,22 +83,22 @@ struct in_addr; #define inet_nsap_ntoa __inet_nsap_ntoa __BEGIN_DECLS -int ascii2addr __P((int, const char *, void *)); -char *addr2ascii __P((int, const void *, int, char *)); -in_addr_t inet_addr __P((const 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)); -char *inet_ntoa __P((struct in_addr)); -int inet_pton __P((int, const char *, void *)); -const char *inet_ntop __P((int, const void *, char *, size_t)); -u_int inet_nsap_addr __P((const char *, u_char *, int)); -char *inet_nsap_ntoa __P((int, const u_char *, char *)); +int ascii2addr (int, const char *, void *); +char *addr2ascii (int, const void *, int, char *); +in_addr_t inet_addr (const 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); +char *inet_ntoa (struct in_addr); +int inet_pton (int, const char *, void *); +const char *inet_ntop (int, const void *, char *, size_t); +u_int inet_nsap_addr (const char *, u_char *, int); +char *inet_nsap_ntoa (int, const u_char *, char *); __END_DECLS #endif /* !_INET_H_ */ diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index c62384d68a..4696d6b81a 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -51,7 +51,7 @@ /* * From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp * $FreeBSD: src/include/arpa/nameser.h,v 1.14.2.1 2001/06/15 22:08:27 ume Exp $ - * $DragonFly: src/include/arpa/nameser.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/arpa/nameser.h,v 1.3 2003/11/14 01:01:47 dillon Exp $ */ #ifndef _ARPA_NAMESER_H_ @@ -416,31 +416,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 *, +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 __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 *)); + 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 dff9589972..4abaaa4f80 100644 --- a/include/assert.h +++ b/include/assert.h @@ -36,6 +36,7 @@ * SUCH DAMAGE. * * @(#)assert.h 8.2 (Berkeley) 1/21/94 + * $DragonFly: src/include/assert.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ /* @@ -61,5 +62,5 @@ #include __BEGIN_DECLS -void __assert __P((const char *, int, const char *)); +void __assert (const char *, int, const char *); __END_DECLS diff --git a/include/complex.h b/include/complex.h index 665c102007..f975c5ab72 100644 --- a/include/complex.h +++ b/include/complex.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/complex.h,v 1.1.2.1 2001/11/23 16:16:18 dd Exp $ - * $DragonFly: src/include/complex.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/complex.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _COMPLEX_H @@ -42,12 +42,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 60d3b12007..ccb8aa98b2 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -40,7 +40,7 @@ * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 * $FreeBSD: src/include/ctype.h,v 1.16 2000/02/08 07:43:23 obrien Exp $ - * $DragonFly: src/include/ctype.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/ctype.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _CTYPE_H_ @@ -72,31 +72,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 @@ -130,9 +130,9 @@ __END_DECLS #endif __BEGIN_DECLS -unsigned long ___runetype __P((__ct_rune_t)); -__ct_rune_t ___tolower __P((__ct_rune_t)); -__ct_rune_t ___toupper __P((__ct_rune_t)); +unsigned long ___runetype (__ct_rune_t); +__ct_rune_t ___tolower (__ct_rune_t); +__ct_rune_t ___toupper (__ct_rune_t); __END_DECLS /* @@ -181,10 +181,10 @@ __tolower(__ct_rune_t _c) #else /* not using inlines */ __BEGIN_DECLS -int __maskrune __P((__ct_rune_t, unsigned long)); -int __isctype __P((__ct_rune_t, unsigned long)); -__ct_rune_t __toupper __P((__ct_rune_t)); -__ct_rune_t __tolower __P((__ct_rune_t)); +int __maskrune (__ct_rune_t, unsigned long); +int __isctype (__ct_rune_t, unsigned long); +__ct_rune_t __toupper (__ct_rune_t); +__ct_rune_t __tolower (__ct_rune_t); __END_DECLS #endif /* using inlines */ diff --git a/include/db.h b/include/db.h index cd907c3abe..05c43c0c1a 100644 --- a/include/db.h +++ b/include/db.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)db.h 8.7 (Berkeley) 6/16/94 + * $DragonFly: src/include/db.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #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; @@ -151,7 +152,7 @@ typedef struct { u_int psize; /* page size */ int lorder; /* byte order */ size_t reclen; /* record length (fixed-length records) */ - u_char bval; /* delimiting byte (variable-length records */ + u_char bval; /* delimiting byte (variable-length records) */ char *bfname; /* btree file name */ } RECNOINFO; @@ -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 a664ef943b..0ee086b09b 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -32,7 +32,7 @@ * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 * $FreeBSD: src/include/dirent.h,v 1.7 1999/12/29 05:01:20 peter Exp $ - * $DragonFly: src/include/dirent.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/dirent.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _DIRENT_H_ @@ -84,20 +84,20 @@ typedef struct _dirdesc { #include __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((const 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 (const 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 dbdffb6c3f..d92e570225 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/dlfcn.h,v 1.10.2.3 2003/02/20 20:42:45 kan Exp $ - * $DragonFly: src/include/dlfcn.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/dlfcn.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _DLFCN_H_ @@ -94,19 +94,19 @@ typedef struct dl_serinfo { } Dl_serinfo; __BEGIN_DECLS -int dladdr __P((const void *, Dl_info *)); -int dlclose __P((void *)); -const char *dlerror __P((void)); -int dlinfo __P((void *, int, void *)); -void dllockinit __P((void *_context, +int dladdr (const void *, Dl_info *); +int dlclose (void *); +const char *dlerror (void); +int dlinfo (void *, int, 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 __P((const char *, int)); -void *dlsym __P((void *, const char *)); + 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 08f58ecdb2..f7f76eb5c6 100644 --- a/include/err.h +++ b/include/err.h @@ -32,7 +32,7 @@ * * @(#)err.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/err.h,v 1.8 1999/08/27 23:44:49 peter Exp $ - * $DragonFly: src/include/err.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/err.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _ERR_H_ @@ -54,23 +54,23 @@ #endif __BEGIN_DECLS -void err __P((int, const char *, ...)) __dead2 __printf0like(2, 3); -void verr __P((int, const char *, __va_list)) __dead2 +void err (int, const char *, ...) __dead2 __printf0like(2, 3); +void verr (int, const char *, __va_list) __dead2 __printf0like(2, 0); -void errc __P((int, int, const char *, ...)) __dead2 __printf0like(3, 4); -void verrc __P((int, int, const char *, __va_list)) __dead2 +void errc (int, int, const char *, ...) __dead2 __printf0like(3, 4); +void verrc (int, int, const char *, __va_list) __dead2 __printf0like(3, 0); -void errx __P((int, const char *, ...)) __dead2 __printf0like(2, 3); -void verrx __P((int, const char *, __va_list)) __dead2 +void errx (int, const char *, ...) __dead2 __printf0like(2, 3); +void verrx (int, const char *, __va_list) __dead2 __printf0like(2, 0); -void warn __P((const char *, ...)) __printf0like(1, 2); -void vwarn __P((const char *, __va_list)) __printf0like(1, 0); -void warnc __P((int, const char *, ...)) __printf0like(2, 3); -void vwarnc __P((int, const char *, __va_list)) __printf0like(2, 0); -void warnx __P((const char *, ...)) __printflike(1, 2); -void vwarnx __P((const char *, __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 *, __va_list) __printf0like(1, 0); +void warnc (int, const char *, ...) __printf0like(2, 3); +void vwarnc (int, const char *, __va_list) __printf0like(2, 0); +void warnx (const char *, ...) __printflike(1, 2); +void vwarnx (const char *, __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 3d1039169b..aee5eec9dd 100644 --- a/include/fnmatch.h +++ b/include/fnmatch.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/fnmatch.h,v 1.9 1999/11/21 17:32:45 ache Exp $ - * $DragonFly: src/include/fnmatch.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/fnmatch.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ * @(#)fnmatch.h 8.1 (Berkeley) 6/2/93 */ @@ -54,7 +54,7 @@ #include __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 c2bb06a1a1..8af569f30e 100644 --- a/include/fstab.h +++ b/include/fstab.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)fstab.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/fstab.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _FSTAB_H_ @@ -69,11 +70,11 @@ struct fstab { #include __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 64c58b727b..6fcc012c02 100644 --- a/include/fts.h +++ b/include/fts.h @@ -32,7 +32,7 @@ * * @(#)fts.h 8.3 (Berkeley) 8/14/94 * $FreeBSD: src/include/fts.h,v 1.3.6.1 2001/08/02 22:34:17 assar Exp $ - * $DragonFly: src/include/fts.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/fts.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _FTS_H_ @@ -48,7 +48,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 */ @@ -120,12 +120,12 @@ typedef struct _ftsent { #include __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 a360edd8c2..b1c9a53ab1 100644 --- a/include/glob.h +++ b/include/glob.h @@ -35,7 +35,7 @@ * * @(#)glob.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/glob.h,v 1.3.6.3 2002/09/18 14:13:30 mikeh Exp $ - * $DragonFly: src/include/glob.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/glob.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _GLOB_H_ @@ -51,18 +51,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; #if __POSIX_VISIBLE >= 199209 @@ -97,8 +97,8 @@ typedef struct { #endif /* __BSD_VISIBLE */ __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 9e5654a958..36dc5a4fd2 100644 --- a/include/grp.h +++ b/include/grp.h @@ -36,6 +36,7 @@ * SUCH DAMAGE. * * @(#)grp.h 8.2 (Berkeley) 1/21/94 + * $DragonFly: src/include/grp.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _GRP_H_ @@ -55,14 +56,14 @@ struct group { #include __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)); +struct group *getgrent (void); +int setgrent (void); +void endgrent (void); +void setgrfile (const char *); +int setgroupent (int); #endif __END_DECLS diff --git a/include/histedit.h b/include/histedit.h index 448bc4b541..fe8dbbb2a7 100644 --- a/include/histedit.h +++ b/include/histedit.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/include/histedit.h,v 1.5 1999/08/27 23:44:50 peter Exp $ */ -/* $DragonFly: src/include/histedit.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ */ +/* $DragonFly: src/include/histedit.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ /* $NetBSD: histedit.h,v 1.5 1997/04/11 17:52:45 christos Exp $ */ /*- @@ -81,28 +81,28 @@ typedef struct lineinfo { /* * Initialization, cleanup, and resetting */ -EditLine *el_init __P((const char *, FILE *, FILE *)); -void el_reset __P((EditLine *)); -void el_end __P((EditLine *)); +EditLine *el_init (const char *, FILE *, FILE *); +void el_reset (EditLine *); +void el_end (EditLine *); /* * Get a line, a character or push a string back in the input queue */ -const char *el_gets __P((EditLine *, int *)); -int el_getc __P((EditLine *, char *)); -void el_push __P((EditLine *, const char *)); +const char *el_gets (EditLine *, int *); +int el_getc (EditLine *, char *); +void el_push (EditLine *, const char *); /* * High level function internals control * Parses argc, argv array and executes builtin editline commands */ -int el_parse __P((EditLine *, int, char **)); +int el_parse (EditLine *, int, char **); /* * Low level editline access function */ -int el_set __P((EditLine *, int, ...)); +int el_set (EditLine *, int, ...); /* * el_set/el_get parameters @@ -123,25 +123,25 @@ int el_set __P((EditLine *, int, ...)); /* * Source named file or $PWD/.editrc or $HOME/.editrc */ -int el_source __P((EditLine *, const char *)); +int el_source (EditLine *, const char *); /* * Must be called when the terminal changes size; If EL_SIGNAL * is set this is done automatically otherwise it is the responsibility * of the application */ -void el_resize __P((EditLine *)); +void el_resize (EditLine *); -void el_data_set __P((EditLine *, void *)); -void * el_data_get __P((EditLine *)); +void el_data_set (EditLine *, void *); +void * el_data_get (EditLine *); /* * User-defined function interface. */ -const LineInfo *el_line __P((EditLine *)); -int el_insertstr __P((EditLine *, char *)); -void el_deletestr __P((EditLine *, int)); +const LineInfo *el_line (EditLine *); +int el_insertstr (EditLine *, char *); +void el_deletestr (EditLine *, int); /* * ==== History ==== @@ -157,10 +157,10 @@ typedef struct HistEvent { /* * History access functions. */ -History * history_init __P((void)); -void history_end __P((History *)); +History * history_init (void); +void history_end (History *); -const HistEvent * history __P((History *, int, ...)); +const HistEvent * history (History *, int, ...); #define H_FUNC 0 /* , UTSL */ #define H_EVENT 1 /* , const int); */ diff --git a/include/ieeefp.h b/include/ieeefp.h index d1079eb5e0..5013abdf12 100644 --- a/include/ieeefp.h +++ b/include/ieeefp.h @@ -1,6 +1,6 @@ /* $NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $ */ /* $FreeBSD: src/include/ieeefp.h,v 1.3.2.1 2000/08/17 08:08:14 jhb Exp $ */ -/* $DragonFly: src/include/ieeefp.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ */ +/* $DragonFly: src/include/ieeefp.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -17,12 +17,12 @@ #include #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 09020d10ce..ec23f6c213 100644 --- a/include/ifaddrs.h +++ b/include/ifaddrs.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/include/ifaddrs.h,v 1.1.2.1 2000/07/15 07:24:05 kris Exp $ */ -/* $DragonFly: src/include/ifaddrs.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ */ +/* $DragonFly: src/include/ifaddrs.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ /* * Copyright (c) 1995, 1999 @@ -50,8 +50,8 @@ struct ifaddrs { #include __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 a6c333c03a..12a390b2c4 100644 --- a/include/langinfo.h +++ b/include/langinfo.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/langinfo.h,v 1.4.2.1 2002/03/12 17:12:24 phantom Exp $ - * $DragonFly: src/include/langinfo.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/langinfo.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _LANGINFO_H_ @@ -106,7 +106,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 cc4122370f..6b91eaf6f4 100644 --- a/include/libgen.h +++ b/include/libgen.h @@ -1,6 +1,6 @@ /* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */ /* $FreeBSD: src/include/libgen.h,v 1.1.2.1 2000/11/12 18:01:51 adrian Exp $ */ -/* $DragonFly: src/include/libgen.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ */ +/* $DragonFly: src/include/libgen.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ /* * Copyright (c) 1997 Todd C. Miller @@ -36,11 +36,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 66bc63b370..d6269e9937 100644 --- a/include/link.h +++ b/include/link.h @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/include/link.h,v 1.20.2.2 2003/02/20 20:42:45 kan Exp $ - * $DragonFly: src/include/link.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/link.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ /* @@ -208,14 +208,14 @@ 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 0c1a6bcc35..298a407c8a 100644 --- a/include/locale.h +++ b/include/locale.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)locale.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/locale.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _LOCALE_H_ @@ -74,8 +75,8 @@ struct lconv { #include __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 c0d1dddcb0..06cf269842 100644 --- a/include/math.h +++ b/include/math.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)math.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/math.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _MATH_H_ @@ -77,62 +78,62 @@ * 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)); +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); #if defined(vax) || defined(tahoe) -double infnan __P((int)); +double infnan (int); #endif -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)); +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 0c7c5064b3..a548779154 100644 --- a/include/mpool.h +++ b/include/mpool.h @@ -32,7 +32,7 @@ * * @(#)mpool.h 8.2 (Berkeley) 7/14/94 * $FreeBSD: src/include/mpool.h,v 1.5.6.2 2001/03/05 23:05:08 obrien Exp $ - * $DragonFly: src/include/mpool.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/mpool.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _MPOOL_H_ @@ -72,9 +72,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; @@ -90,16 +90,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 d5a9ae2ae8..e51242c4d2 100644 --- a/include/ndbm.h +++ b/include/ndbm.h @@ -34,6 +34,7 @@ * SUCH DAMAGE. * * @(#)ndbm.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/ndbm.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #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/netdb.h b/include/netdb.h index 0a6f665a2b..11dbe6676d 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -56,7 +56,7 @@ * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ * $FreeBSD: src/include/netdb.h,v 1.14.2.5 2001/08/29 08:46:51 alfred Exp $ - * $DragonFly: src/include/netdb.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/netdb.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _NETDB_H_ @@ -210,72 +210,72 @@ struct addrinfo { */ __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 * _gethostbyhtname __P((const char *, int)); -struct hostent * _gethostbydnsname __P((const char *, int)); -struct hostent * _gethostbynisname __P((const char *, int)); -struct hostent * _gethostbyhtaddr __P((const char *, int, int)); -struct hostent * _gethostbydnsaddr __P((const char *, int, int)); -struct hostent * _gethostbynisaddr __P((const char *, int, int)); -struct netent * _getnetbyhtname __P((const char *)); -struct netent * _getnetbydnsname __P((const char *)); -struct netent * _getnetbynisname __P((const char *)); -struct netent * _getnetbyhtaddr __P((unsigned long, int)); -struct netent * _getnetbydnsaddr __P((unsigned long, int)); -struct netent * _getnetbynisaddr __P((unsigned long, 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 * _gethostbyhtname (const char *, int); +struct hostent * _gethostbydnsname (const char *, int); +struct hostent * _gethostbynisname (const char *, int); +struct hostent * _gethostbyhtaddr (const char *, int, int); +struct hostent * _gethostbydnsaddr (const char *, int, int); +struct hostent * _gethostbynisaddr (const char *, int, int); +struct netent * _getnetbyhtname (const char *); +struct netent * _getnetbydnsname (const char *); +struct netent * _getnetbynisname (const char *); +struct netent * _getnetbyhtaddr (unsigned long, int); +struct netent * _getnetbydnsaddr (unsigned long, int); +struct netent * _getnetbynisaddr (unsigned long, 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 4202f9c5fd..f52f06d595 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/include/nl_types.h,v 1.7 1999/08/27 23:44:51 peter Exp $ */ -/* $DragonFly: src/include/nl_types.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ */ +/* $DragonFly: src/include/nl_types.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ /*********************************************************** Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts. @@ -44,9 +44,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 1a2b52fd8f..19257ae19c 100644 --- a/include/nlist.h +++ b/include/nlist.h @@ -38,7 +38,7 @@ * @(#)nlist.h 8.2 (Berkeley) 1/21/94 * * $FreeBSD: src/include/nlist.h,v 1.7 1999/08/27 23:44:51 peter Exp $ - * $DragonFly: src/include/nlist.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/nlist.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _NLIST_H_ @@ -116,7 +116,7 @@ struct nlist { #include __BEGIN_DECLS -int nlist __P((const char *, struct nlist *)); +int nlist (const char *, struct nlist *); __END_DECLS #endif /* !_NLIST_H_ */ diff --git a/include/pthread.h b/include/pthread.h index f7c41998fe..f9c4929194 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/pthread.h,v 1.20.2.4 2003/05/27 18:18:01 jdp Exp $ - * $DragonFly: src/include/pthread.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/pthread.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -122,7 +122,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. @@ -190,130 +190,130 @@ enum pthread_mutextype { * Thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_destroy __P((pthread_attr_t *)); -int pthread_attr_getstack __P((const pthread_attr_t * __restrict, +int pthread_attr_destroy (pthread_attr_t *); +int pthread_attr_getstack (const pthread_attr_t * __restrict, void ** __restrict stackaddr, - size_t * __restrict stacksize)); -int pthread_attr_getstacksize __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_setstack __P((pthread_attr_t *, void *, size_t)); -int pthread_attr_setstacksize __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 *)); + size_t * __restrict stacksize); +int pthread_attr_getstacksize (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_setstack (pthread_attr_t *, void *, size_t); +int pthread_attr_setstacksize (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_getconcurrency __P((void)); -int pthread_setconcurrency __P((int)); +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 *); +int pthread_getconcurrency (void); +int pthread_setconcurrency (int); -int pthread_attr_setfloatstate __P((pthread_attr_t *, int)); -int pthread_attr_getfloatstate __P((pthread_attr_t *, int *)); +int pthread_attr_setfloatstate (pthread_attr_t *, int); +int pthread_attr_getfloatstate (pthread_attr_t *, int *); __END_DECLS #endif diff --git a/include/pthread_np.h b/include/pthread_np.h index 300cc22041..be6d0e8d42 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/pthread_np.h,v 1.7.2.4 2003/01/10 15:41:17 fjoe Exp $ - * $DragonFly: src/include/pthread_np.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/pthread_np.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -38,26 +38,26 @@ /* * 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_attr_get_np __P((pthread_t, pthread_attr_t *)); -int pthread_main_np __P((void)); -int pthread_multi_np __P((void)); -int pthread_mutexattr_getkind_np __P((pthread_mutexattr_t)); -int pthread_mutexattr_setkind_np __P((pthread_mutexattr_t *, int)); -void pthread_resume_all_np __P((void)); -int pthread_resume_np __P((pthread_t)); -void pthread_set_name_np __P((pthread_t, const char *)); -int pthread_single_np __P((void)); -void pthread_suspend_all_np __P((void)); -int pthread_suspend_np __P((pthread_t)); -int pthread_switch_add_np __P((pthread_switch_routine_t)); -int pthread_switch_delete_np __P((pthread_switch_routine_t)); +int pthread_attr_setcreatesuspend_np (pthread_attr_t *); +int pthread_attr_get_np (pthread_t, pthread_attr_t *); +int pthread_main_np (void); +int pthread_multi_np (void); +int pthread_mutexattr_getkind_np (pthread_mutexattr_t); +int pthread_mutexattr_setkind_np (pthread_mutexattr_t *, int); +void pthread_resume_all_np (void); +int pthread_resume_np (pthread_t); +void pthread_set_name_np (pthread_t, const char *); +int pthread_single_np (void); +void pthread_suspend_all_np (void); +int pthread_suspend_np (pthread_t); +int pthread_switch_add_np (pthread_switch_routine_t); +int pthread_switch_delete_np (pthread_switch_routine_t); __END_DECLS #endif diff --git a/include/pwd.h b/include/pwd.h index 88d705d896..ccb5ed270f 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -36,6 +36,7 @@ * SUCH DAMAGE. * * @(#)pwd.h 8.2 (Berkeley) 1/21/94 + * $DragonFly: src/include/pwd.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _PWD_H_ @@ -98,13 +99,13 @@ struct passwd { #include __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)); +struct passwd *getpwent (void); +int setpassent (int); +void setpwent (void); +void endpwent (void); #endif __END_DECLS diff --git a/include/regex.h b/include/regex.h index 1611d4b879..42c0d9e3e2 100644 --- a/include/regex.h +++ b/include/regex.h @@ -35,6 +35,7 @@ * SUCH DAMAGE. * * @(#)regex.h 8.2 (Berkeley) 1/3/94 + * $DragonFly: src/include/regex.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _REGEX_H_ @@ -96,11 +97,11 @@ 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 47c8e88fa6..c77b0d789c 100644 --- a/include/regexp.h +++ b/include/regexp.h @@ -35,6 +35,7 @@ * SUCH DAMAGE. * * @(#)regexp.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/regexp.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _REGEXP_H_ @@ -60,10 +61,10 @@ typedef struct regexp { #include __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 b479147bac..1dd663dcd0 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -52,7 +52,7 @@ * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $ * $FreeBSD: src/include/resolv.h,v 1.19.2.1 2001/06/15 22:08:26 ume Exp $ - * $DragonFly: src/include/resolv.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/resolv.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _RESOLV_H_ @@ -179,19 +179,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, +typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns, const u_char **query, int *querylen, u_char *ans, int anssiz, - int *resplen)); + int *resplen); -typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns, +typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns, const u_char *query, int querylen, u_char *ans, int anssiz, - int *resplen)); + int *resplen); struct res_sym { int number; /* Identifying number, like T_MX */ @@ -258,63 +258,63 @@ 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 671bb881af..a07b88ba02 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -29,7 +29,7 @@ * from: @(#)auth.h 1.17 88/02/08 SMI * from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC * $FreeBSD: src/include/rpc/auth.h,v 1.15 1999/08/27 23:45:02 peter Exp $ - * $DragonFly: src/include/rpc/auth.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/auth.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -79,7 +79,7 @@ union des_block { }; typedef union des_block des_block; __BEGIN_DECLS -extern bool_t xdr_des_block __P((XDR *, des_block *)); +extern bool_t xdr_des_block (XDR *, des_block *); __END_DECLS /* @@ -91,7 +91,7 @@ struct opaque_auth { u_int oa_length; /* not to exceed MAX_AUTH_BYTES */ }; __BEGIN_DECLS -bool_t xdr_opaque_auth __P((XDR *xdrs, struct opaque_auth *ap)); +bool_t xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap); __END_DECLS @@ -103,16 +103,16 @@ typedef struct __rpc_auth { struct opaque_auth ah_verf; union des_block ah_key; struct auth_ops { - void (*ah_nextverf) __P((struct __rpc_auth *)); + void (*ah_nextverf) (struct __rpc_auth *); /* nextverf & serialize */ - int (*ah_marshal) __P((struct __rpc_auth *, XDR *)); + int (*ah_marshal) (struct __rpc_auth *, XDR *); /* validate verifier */ - int (*ah_validate) __P((struct __rpc_auth *, - struct opaque_auth *)); + int (*ah_validate) (struct __rpc_auth *, + struct opaque_auth *); /* refresh credentials */ - int (*ah_refresh) __P((struct __rpc_auth *)); + int (*ah_refresh) (struct __rpc_auth *); /* destroy this structure */ - void (*ah_destroy) __P((struct __rpc_auth *)); + void (*ah_destroy) (struct __rpc_auth *); } *ah_ops; caddr_t ah_private; } AUTH; @@ -169,9 +169,9 @@ extern struct opaque_auth _null_auth; */ __BEGIN_DECLS struct sockaddr_in; -extern AUTH *authunix_create __P((char *, int, int, int, int *)); -extern AUTH *authunix_create_default __P((void)); -extern AUTH *authnone_create __P((void)); +extern AUTH *authunix_create (char *, int, int, int, int *); +extern AUTH *authunix_create_default (void); +extern AUTH *authnone_create (void); __END_DECLS /* Forward compatibility with TI-RPC */ @@ -187,7 +187,7 @@ __END_DECLS * des_block *ckey; - optional conversation key to use */ __BEGIN_DECLS -extern AUTH *authdes_create __P(( char *, u_int, struct sockaddr *, des_block * )); +extern AUTH *authdes_create ( char *, u_int, struct sockaddr *, des_block * ); #ifdef NOTYET /* * TI-RPC supports this call, but it requires the inclusion of @@ -195,9 +195,9 @@ extern AUTH *authdes_create __P(( char *, u_int, struct sockaddr *, des_block * * headers which would result in a tangled mess. For now, the NIS+ * code prototypes this routine internally. */ -extern AUTH *authdes_pk_create __P(( char *, netobj *, u_int, +extern AUTH *authdes_pk_create ( char *, netobj *, u_int, struct sockaddr *, des_block *, - nis_server * )); + nis_server * ); #endif __END_DECLS @@ -205,12 +205,12 @@ __END_DECLS * Netname manipulation routines. */ __BEGIN_DECLS -extern int netname2user __P(( char *, uid_t *, gid_t *, int *, gid_t *)); -extern int netname2host __P(( char *, char *, int )); -extern int getnetname __P(( char * )); -extern int user2netname __P(( char *, uid_t, char * )); -extern int host2netname __P(( char *, char *, char * )); -extern void passwd2des __P(( char *, char * )); +extern int netname2user ( char *, uid_t *, gid_t *, int *, gid_t *); +extern int netname2host ( char *, char *, int ); +extern int getnetname ( char * ); +extern int user2netname ( char *, uid_t, char * ); +extern int host2netname ( char *, char *, char * ); +extern void passwd2des ( char *, char * ); __END_DECLS /* @@ -230,24 +230,24 @@ struct netstarg { }; __BEGIN_DECLS -extern int key_decryptsession __P(( const char *, des_block * )); -extern int key_decryptsession_pk __P(( char *, netobj *, des_block * )); -extern int key_encryptsession __P(( const char *, des_block * )); -extern int key_encryptsession_pk __P(( char *, netobj *, des_block * )); -extern int key_gendes __P(( des_block * )); -extern int key_setsecret __P(( const char * )); -extern int key_secretkey_is_set __P(( void )); -extern int key_setnet __P(( struct netstarg * )); -extern int key_get_conv __P(( char *, des_block * )); +extern int key_decryptsession ( const char *, des_block * ); +extern int key_decryptsession_pk ( char *, netobj *, des_block * ); +extern int key_encryptsession ( const char *, des_block * ); +extern int key_encryptsession_pk ( char *, netobj *, des_block * ); +extern int key_gendes ( des_block * ); +extern int key_setsecret ( const char * ); +extern int key_secretkey_is_set ( void ); +extern int key_setnet ( struct netstarg * ); +extern int key_get_conv ( char *, des_block * ); __END_DECLS /* * Publickey routines. */ __BEGIN_DECLS -extern int getpublickey __P(( char *, char * )); -extern int getpublicandprivatekey __P(( char *, char * )); -extern int getsecretkey __P(( char *, char *, char * )); +extern int getpublickey ( char *, char * ); +extern int getpublicandprivatekey ( char *, char * ); +extern int getsecretkey ( char *, char *, char * ); __END_DECLS diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index a7635f87e1..7aee4e81a5 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -1,4 +1,3 @@ -/* @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -26,6 +25,9 @@ * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 + * + * @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI + * $DragonFly: src/include/rpc/auth_des.h,v 1.2 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -103,7 +105,7 @@ struct authdes_verf { #define adv_nickname adv_int_u __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 #endif /* ndef _AUTH_DES_ */ diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 76d698aced..8ad75697a6 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -29,7 +29,7 @@ * from: @(#)auth_unix.h 1.8 88/02/08 SMI * from: @(#)auth_unix.h 2.2 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/auth_unix.h,v 1.10 1999/08/27 23:45:03 peter Exp $ - * $DragonFly: src/include/rpc/auth_unix.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/auth_unix.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -70,7 +70,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 40ffdf8c98..292321b066 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -29,7 +29,7 @@ * from: @(#)clnt.h 1.31 88/02/08 SMI * from: @(#)clnt.h 2.1 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/clnt.h,v 1.11.2.1 2001/06/28 21:44:09 iedowse Exp $ - * $DragonFly: src/include/rpc/clnt.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/clnt.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -120,22 +120,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 *, u_long, 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, - void *)); + bool_t (*cl_control) (struct __rpc_client *, u_int, + void *); } *cl_ops; caddr_t cl_private; /* private stuff */ } CLIENT; @@ -281,7 +281,7 @@ typedef struct __rpc_client { * u_long vers; */ __BEGIN_DECLS -extern CLIENT *clntraw_create __P((u_long, u_long)); +extern CLIENT *clntraw_create (u_long, u_long); __END_DECLS @@ -296,7 +296,7 @@ __END_DECLS * char *prot; -- protocol */ __BEGIN_DECLS -extern CLIENT *clnt_create __P((char *, u_long, u_long, char *)); +extern CLIENT *clnt_create (char *, u_long, u_long, char *); __END_DECLS @@ -312,12 +312,12 @@ __END_DECLS * u_int recvsz; */ __BEGIN_DECLS -extern CLIENT *clnttcp_create __P((struct sockaddr_in *, +extern CLIENT *clnttcp_create (struct sockaddr_in *, u_long, u_long, int *, u_int, - u_int)); + u_int); __END_DECLS @@ -343,18 +343,18 @@ __END_DECLS * u_int recvsz; */ __BEGIN_DECLS -extern CLIENT *clntudp_create __P((struct sockaddr_in *, +extern CLIENT *clntudp_create (struct sockaddr_in *, u_long, u_long, struct timeval, - int *)); -extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *, + int *); +extern CLIENT *clntudp_bufcreate (struct sockaddr_in *, u_long, u_long, struct timeval, int *, u_int, - u_int)); + u_int); __END_DECLS @@ -370,12 +370,12 @@ __END_DECLS * u_int recvsz; */ __BEGIN_DECLS -extern CLIENT *clntunix_create __P((struct sockaddr_un *, +extern CLIENT *clntunix_create (struct sockaddr_un *, u_long, u_long, int *, u_int, - u_int)); + u_int); __END_DECLS @@ -383,24 +383,24 @@ __END_DECLS * Print why creation failed */ __BEGIN_DECLS -extern void clnt_pcreateerror __P((char *)); /* stderr */ -extern char *clnt_spcreateerror __P((char *)); /* string */ +extern void clnt_pcreateerror (char *); /* stderr */ +extern char *clnt_spcreateerror (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 *, char *)); /* stderr */ -extern char *clnt_sperror __P((CLIENT *, char *)); /* string */ +extern void clnt_perror (CLIENT *, char *); /* stderr */ +extern char *clnt_sperror (CLIENT *, char *); /* string */ __END_DECLS diff --git a/include/rpc/des.h b/include/rpc/des.h index f41e5a7804..e2c1531faf 100644 --- a/include/rpc/des.h +++ b/include/rpc/des.h @@ -1,4 +1,3 @@ -/* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -26,6 +25,9 @@ * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 + * + * @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI + * $DragonFly: src/include/rpc/des.h,v 1.2 2003/11/14 01:01:50 dillon Exp $ */ /* * Generic DES driver interface @@ -79,4 +81,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 0b2d87d539..7cdb11db93 100644 --- a/include/rpc/des_crypt.h +++ b/include/rpc/des_crypt.h @@ -1,7 +1,7 @@ /* * @(#)des_crypt.h 2.1 88/08/11 4.0 RPCSRC; from 1.4 88/02/08 (C) 1986 SMI * $FreeBSD: src/include/rpc/des_crypt.h,v 1.2 1999/12/29 05:00:42 peter Exp $ - * $DragonFly: src/include/rpc/des_crypt.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/des_crypt.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ * * des_crypt.h, des library routine interface * Copyright (C) 1986, Sun Microsystems, Inc. @@ -77,7 +77,7 @@ */ __BEGIN_DECLS #ifdef __STDC__ -int cbc_crypt __P(( char *, char *, unsigned int, unsigned int, char *)); +int cbc_crypt ( char *, char *, unsigned int, unsigned int, char *); #else cbc_crypt(/* key, buf, len, mode, ivec */); /* char *key; @@ -92,7 +92,7 @@ cbc_crypt(/* key, buf, len, mode, ivec */); /* * Electronic Code Book mode */ #ifdef __STDC__ -int ecb_crypt __P(( char *, char *, unsigned int, unsigned int )); +int ecb_crypt ( char *, char *, unsigned int, unsigned int ); #else ecb_crypt(/* key, buf, len, mode */); /* char *key; @@ -110,7 +110,7 @@ __END_DECLS */ __BEGIN_DECLS #ifdef __STDC__ -void des_setparity __P(( char *)); +void des_setparity ( char *); #else void des_setparity(/* key */); /* diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index 8c7c67f6b5..4966028984 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -29,7 +29,7 @@ * from: @(#)pmap_clnt.h 1.11 88/02/08 SMI * from: @(#)pmap_clnt.h 2.1 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/pmap_clnt.h,v 1.11 1999/08/27 23:45:04 peter Exp $ - * $DragonFly: src/include/rpc/pmap_clnt.h,v 1.4 2003/11/09 18:50:57 dillon Exp $ + * $DragonFly: src/include/rpc/pmap_clnt.h,v 1.5 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -52,7 +52,7 @@ * clnt_stat = clnt_broadcast(program, version, procedure, * xdrargs, argsp, xdrres, resp, eachresult) * (like pmap_rmtcall, except the call is broadcasted to all - * locally connected nets. For each valid response received, + * locally connected nets.) For each valid response received, * the procedure eachresult is called. Its form is: * done = eachresult(resp, raddr) * bool_t done; @@ -67,23 +67,23 @@ #include __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 *, +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 __P((u_long, u_long, u_long, + struct timeval, u_long *); +extern enum clnt_stat clnt_broadcast (u_long, u_long, u_long, xdrproc_t, char *, xdrproc_t, char *, - bool_t (*) __P((caddr_t, - struct sockaddr_in *)))); -extern u_short pmap_getport __P((struct sockaddr_in *, - u_long, u_long, u_int)); -extern void pmap_getport_timeout __P((struct timeval *otv, - struct timeval *ntv)); + bool_t (*) (caddr_t, + struct sockaddr_in *)); +extern u_short pmap_getport (struct sockaddr_in *, + u_long, u_long, u_int); +extern void pmap_getport_timeout (struct timeval *otv, + struct timeval *ntv); __END_DECLS #endif /* !_RPC_PMAPCLNT_H */ diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 9385d58504..c9ba8c7669 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -29,7 +29,7 @@ * from: @(#)pmap_prot.h 1.14 88/02/08 SMI * from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/pmap_prot.h,v 1.10 1999/08/27 23:45:04 peter Exp $ - * $DragonFly: src/include/rpc/pmap_prot.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/pmap_prot.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -98,8 +98,8 @@ 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_pmap (XDR *, struct pmap *); +extern bool_t xdr_pmaplist (XDR *, struct pmaplist **); __END_DECLS #endif /* !_RPC_PMAPPROT_H */ diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index 0c5ce7a80a..b027f409ce 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -29,7 +29,7 @@ * from: @(#)pmap_rmt.h 1.2 88/02/08 SMI * from: @(#)pmap_rmt.h 2.1 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/pmap_rmt.h,v 1.10 1999/08/27 23:45:05 peter Exp $ - * $DragonFly: src/include/rpc/pmap_rmt.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/pmap_rmt.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -57,8 +57,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_PMAPRMT_H */ diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index 295fa1979f..a17bd4bba7 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -29,7 +29,7 @@ * from: @(#)rpc.h 1.9 88/02/08 SMI * from: @(#)rpc.h 2.4 89/07/11 4.0 RPCSRC * $FreeBSD: src/include/rpc/rpc.h,v 1.12 2000/01/26 09:02:40 shin Exp $ - * $DragonFly: src/include/rpc/rpc.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/rpc.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -80,16 +80,16 @@ struct rpcent { }; __BEGIN_DECLS -extern struct rpcent *getrpcbyname __P((char *)); -extern struct rpcent *getrpcbynumber __P((int)); -extern struct rpcent *getrpcent __P((void)); -extern int getrpcport __P((char *host, int prognum, int versnum, int proto)); -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 int getrpcport (char *host, int prognum, int versnum, int proto); +extern void setrpcent (int); +extern void endrpcent (void); -extern int bindresvport __P((int, struct sockaddr_in *)); -extern int bindresvport_sa __P((int, struct sockaddr *)); -extern int get_myaddress __P((struct sockaddr_in *)); +extern int bindresvport (int, struct sockaddr_in *); +extern int bindresvport_sa (int, struct sockaddr *); +extern int get_myaddress (struct sockaddr_in *); __END_DECLS #endif /* !_RPC_RPC_H */ diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index 4b53180b63..d21761f968 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -29,7 +29,7 @@ * from: @(#)rpc_msg.h 1.7 86/07/16 SMI * from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/rpc_msg.h,v 1.12 1999/08/27 23:45:05 peter Exp $ - * $DragonFly: src/include/rpc/rpc_msg.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/rpc_msg.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -166,7 +166,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. @@ -174,7 +174,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. @@ -182,7 +182,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 *); /* * Fills in the error part of a reply message. @@ -191,7 +191,7 @@ extern bool_t xdr_replymsg __P((XDR *, struct rpc_msg *)); * struct rpc_err *error; */ struct rpc_err; -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_RPCMSG_H */ diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 9dd627d09e..39f3695f56 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -29,7 +29,7 @@ * from: @(#)svc.h 1.20 88/02/08 SMI * from: @(#)svc.h 2.2 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/svc.h,v 1.16 1999/12/29 05:00:43 peter Exp $ - * $DragonFly: src/include/rpc/svc.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/svc.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -80,21 +80,21 @@ typedef struct __rpc_svcxprt { u_short xp_port; /* associated port number */ 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 address */ @@ -171,8 +171,8 @@ struct svc_req { * 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 /* @@ -183,7 +183,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 /* @@ -193,7 +193,7 @@ __END_DECLS * SVCXPRT *xprt; */ __BEGIN_DECLS -extern void xprt_register __P((SVCXPRT *)); +extern void xprt_register (SVCXPRT *); __END_DECLS /* @@ -203,7 +203,7 @@ __END_DECLS * SVCXPRT *xprt; */ __BEGIN_DECLS -extern void xprt_unregister __P((SVCXPRT *)); +extern void xprt_unregister (SVCXPRT *); __END_DECLS @@ -236,14 +236,14 @@ __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 *, u_long, u_long)); -extern void svcerr_auth __P((SVCXPRT *, enum auth_stat)); -extern void svcerr_noprog __P((SVCXPRT *)); -extern void svcerr_systemerr __P((SVCXPRT *)); +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 *, u_long, u_long); +extern void svcerr_auth (SVCXPRT *, enum auth_stat); +extern void svcerr_noprog (SVCXPRT *); +extern void svcerr_systemerr (SVCXPRT *); __END_DECLS /* @@ -274,10 +274,10 @@ extern void rpctest_service(); #endif __BEGIN_DECLS -extern void svc_getreq __P((int)); -extern void svc_getreqset __P((fd_set *)); -extern void svc_getreqset2 __P((fd_set *, int)); /* XXX: nonstd, undoc */ -extern void svc_run __P((void)); +extern void svc_getreq (int); +extern void svc_getreqset (fd_set *); +extern void svc_getreqset2 (fd_set *, int); /* XXX: nonstd, undoc */ +extern void svc_run (void); __END_DECLS /* @@ -293,7 +293,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 @@ -301,8 +301,8 @@ __END_DECLS * Udp based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svcudp_create __P((int)); -extern SVCXPRT *svcudp_bufcreate __P((int, u_int, u_int)); +extern SVCXPRT *svcudp_create (int); +extern SVCXPRT *svcudp_bufcreate (int, u_int, u_int); __END_DECLS @@ -310,16 +310,16 @@ __END_DECLS * Tcp based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svctcp_create __P((int, u_int, u_int)); -extern SVCXPRT *svcfd_create __P((int, u_int, u_int)); +extern SVCXPRT *svctcp_create (int, u_int, u_int); +extern SVCXPRT *svcfd_create (int, u_int, u_int); __END_DECLS /* * AF_UNIX socket based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svcunix_create __P((int, u_int, u_int, char *)); -extern SVCXPRT *svcunixfd_create __P((int, u_int, u_int)); +extern SVCXPRT *svcunix_create (int, u_int, u_int, char *); +extern SVCXPRT *svcunixfd_create (int, u_int, u_int); __END_DECLS #endif /* !_RPC_SVC_H */ diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index 60c5e1b226..409574d692 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -29,7 +29,7 @@ * from: @(#)svc_auth.h 1.6 86/07/16 SMI * from: @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/svc_auth.h,v 1.12 1999/08/27 23:45:05 peter Exp $ - * $DragonFly: src/include/rpc/svc_auth.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/svc_auth.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -48,10 +48,10 @@ struct svc_req; * 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 (*)(struct svc_req *, - struct rpc_msg *))); -extern enum auth_stat _svcauth_des __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 *)); +extern enum auth_stat _svcauth_des (struct svc_req *, struct rpc_msg *); __END_DECLS #endif /* !_RPC_SVCAUTH_H */ diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 04f3eb3d56..1e1ca7e353 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -29,7 +29,7 @@ * from: @(#)xdr.h 1.19 87/04/22 SMI * from: @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC * $FreeBSD: src/include/rpc/xdr.h,v 1.14.2.1 2003/03/20 12:59:55 jedgar Exp $ - * $DragonFly: src/include/rpc/xdr.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpc/xdr.h,v 1.3 2003/11/14 01:01:50 dillon Exp $ */ /* @@ -100,21 +100,21 @@ typedef struct __rpc_xdr { enum xdr_op x_op; /* operation; fast additional param */ 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 underlying stream */ - bool_t (*x_putlong) __P((struct __rpc_xdr *, long *)); + bool_t (*x_putlong) (struct __rpc_xdr *, long *); /* get some bytes from underlying stream */ - bool_t (*x_getbytes) __P((struct __rpc_xdr *, caddr_t, u_int)); + bool_t (*x_getbytes) (struct __rpc_xdr *, caddr_t, u_int); /* put some bytes to underlying stream */ - bool_t (*x_putbytes) __P((struct __rpc_xdr *, caddr_t, u_int)); + bool_t (*x_putbytes) (struct __rpc_xdr *, caddr_t, 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 *)); + void (*x_destroy) (struct __rpc_xdr *); } *x_ops; caddr_t x_public; /* users' data */ caddr_t x_private; /* pointer to private data */ @@ -131,12 +131,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 two args!!! */ -typedef bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */)); +typedef bool_t (*xdrproc_t) (/* XDR *, void *, u_int */); #endif /* @@ -240,36 +240,36 @@ 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 *, caddr_t, u_int)); -extern bool_t xdr_string __P((XDR *, char **, u_int)); -extern bool_t xdr_union __P((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t)); -extern unsigned long xdr_sizeof __P((xdrproc_t, void *)); -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_reference __P((XDR *, caddr_t *, u_int, xdrproc_t)); -extern bool_t xdr_pointer __P((XDR *, caddr_t *, u_int, xdrproc_t)); -extern bool_t xdr_wrapstring __P((XDR *, char **)); -extern void xdr_free __P((xdrproc_t, char *)); +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 *, caddr_t, u_int); +extern bool_t xdr_string (XDR *, char **, u_int); +extern bool_t xdr_union (XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t); +extern unsigned long xdr_sizeof (xdrproc_t, void *); +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_reference (XDR *, caddr_t *, u_int, xdrproc_t); +extern bool_t xdr_pointer (XDR *, caddr_t *, u_int, xdrproc_t); +extern bool_t xdr_wrapstring (XDR *, char **); +extern void xdr_free (xdrproc_t, char *); __END_DECLS /* @@ -282,7 +282,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 @@ -290,26 +290,26 @@ 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); #ifdef _STDIO_H_ /* XDR using stdio library */ -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((caddr_t, caddr_t, int)), - int (*) __P((caddr_t, caddr_t, int)))); +extern void xdrrec_create (XDR *, u_int, u_int, char *, + int (*) (caddr_t, caddr_t, int), + int (*) (caddr_t, caddr_t, 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 bool_t xdrrec_eof (XDR *); __END_DECLS #endif /* !_RPC_XDR_H */ diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index cb6860122c..97ba39ef11 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/rpcsvc/ypclnt.h,v 1.11.2.1 2002/02/15 00:46:53 des Exp $ - * $DragonFly: src/include/rpcsvc/ypclnt.h,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpcsvc/ypclnt.h,v 1.3 2003/11/14 01:01:51 dillon Exp $ */ #ifndef _RPCSVC_YPCLNT_H_ @@ -73,19 +73,19 @@ 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, +int yp_match (char *indomain, char *inmap, const char *inkey, int inkeylen, char **outval, - int *outvallen)); -int yp_first __P((char *indomain, char *inmap, + int *outvallen); +int yp_first (char *indomain, char *inmap, char **outkey, int *outkeylen, char **outval, - int *outvallen)); -int yp_next __P((char *indomain, char *inmap, + int *outvallen); +int yp_next (char *indomain, char *inmap, char *inkey, int inkeylen, char **outkey, - int *outkeylen, char **outval, int *outvallen)); + 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/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 2426d981fa..a2504fd7aa 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -29,7 +29,7 @@ * @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro * @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC * $FreeBSD: src/include/rpcsvc/yppasswd.x,v 1.6 1999/08/27 23:45:12 peter Exp $ - * $DragonFly: src/include/rpcsvc/yppasswd.x,v 1.2 2003/06/17 04:25:58 dillon Exp $ + * $DragonFly: src/include/rpcsvc/yppasswd.x,v 1.3 2003/11/14 01:01:51 dillon Exp $ */ /* @@ -66,6 +66,6 @@ struct yppasswd { #ifdef RPC_HDR %#include -%extern int _yppasswd __P(( char * , struct x_passwd * )); +%extern int _yppasswd ( char * , struct x_passwd * ); %#define yppasswd(x,y) _yppasswd(x,y) #endif diff --git a/include/rune.h b/include/rune.h index c1e2b88b45..3701bb7da2 100644 --- a/include/rune.h +++ b/include/rune.h @@ -34,6 +34,7 @@ * SUCH DAMAGE. * * @(#)rune.h 8.1 (Berkeley) 6/27/93 + * $DragonFly: src/include/Attic/rune.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #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 725e7c704c..dfdf5c8738 100644 --- a/include/runetype.h +++ b/include/runetype.h @@ -35,7 +35,7 @@ * * @(#)runetype.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/runetype.h,v 1.3.8.1 2002/08/08 02:42:29 imp Exp $ - * $DragonFly: src/include/Attic/runetype.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/Attic/runetype.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _RUNETYPE_H_ @@ -80,9 +80,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 d0d9654224..d6ee93a0cc 100644 --- a/include/search.h +++ b/include/search.h @@ -1,6 +1,6 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ /* $FreeBSD: src/include/search.h,v 1.3.2.1 2000/08/17 07:38:34 jhb Exp $ */ -/* $DragonFly: src/include/search.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ */ +/* $DragonFly: src/include/search.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ /* * Written by J.T. Conklin @@ -42,16 +42,16 @@ 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 50934479f6..5b14e0d5d2 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -36,6 +36,7 @@ * SUCH DAMAGE. * * @(#)setjmp.h 8.2 (Berkeley) 1/21/94 + * $DragonFly: src/include/setjmp.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _SETJMP_H_ @@ -47,18 +48,18 @@ #include __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 89ae87e584..9417750f86 100644 --- a/include/signal.h +++ b/include/signal.h @@ -33,7 +33,7 @@ * @(#)signal.h 8.3 (Berkeley) 3/30/94 * * $FreeBSD: src/include/signal.h,v 1.14 1999/10/02 19:33:23 marcel Exp $ - * $DragonFly: src/include/signal.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/signal.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _SIGNAL_H_ @@ -54,41 +54,41 @@ extern __const int sys_nsig; #endif __BEGIN_DECLS -int raise __P((int)); +int raise (int); #ifndef _ANSI_SOURCE -int kill __P((__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 (__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((__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 (__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((__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((ucontext_t *)); -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 (__pid_t, int); +int sigaltstack (const stack_t *, stack_t *); +int sigblock (int); +int siginterrupt (int, int); +int sigpause (int); +int sigreturn (ucontext_t *); +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 a825232b6f..018485921b 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -35,7 +35,7 @@ * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 * $FreeBSD: src/include/stdio.h,v 1.24.2.5 2002/11/09 08:07:20 imp Exp $ - * $DragonFly: src/include/stdio.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/stdio.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _STDIO_H_ @@ -111,10 +111,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 */ @@ -204,51 +204,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 *, __va_list)); -int vprintf __P((const char *, __va_list)); -int vsprintf __P((char *, const char *, __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 *, __va_list); +int vprintf (const char *, __va_list); +int vsprintf (char *, const char *, __va_list); __END_DECLS /* @@ -261,12 +261,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 */ @@ -277,19 +277,19 @@ __END_DECLS __BEGIN_DECLS #ifndef _FTRUNCATE_DECLARED #define _FTRUNCATE_DECLARED -int ftruncate __P((int, __off_t)); +int ftruncate (int, __off_t); #endif #ifndef _LSEEK_DECLARED #define _LSEEK_DECLARED -__off_t lseek __P((int, __off_t, int)); +__off_t lseek (int, __off_t, int); #endif #ifndef _MMAP_DECLARED #define _MMAP_DECLARED -void *mmap __P((void *, size_t, int, int, int, __off_t)); +void *mmap (void *, size_t, int, int, int, __off_t); #endif #ifndef _TRUNCATE_DECLARED #define _TRUNCATE_DECLARED -int truncate __P((const char *, __off_t)); +int truncate (const char *, __off_t); #endif __END_DECLS #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ @@ -299,32 +299,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 *, __off_t, int)); -__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 *, __va_list)) +__const char *fmtcheck (const char *, const char *) __ATTR_FORMAT_ARG; +int fpurge (FILE *); +int fseeko (FILE *, __off_t, int); +__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 *, __va_list) __printflike(2, 0); -int vsnprintf __P((char *, size_t, const char *, __va_list)) +int vsnprintf (char *, size_t, const char *, __va_list) __printflike(3, 0); -int vscanf __P((const char *, __va_list)) __scanflike(1, 0); -int vsscanf __P((const char *, const char *, __va_list)) +int vscanf (const char *, __va_list) __scanflike(1, 0); +int vsscanf (const char *, const char *, __va_list) __scanflike(2, 0); __END_DECLS @@ -339,11 +339,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) @@ -353,9 +353,9 @@ __END_DECLS * Functions internal to the implementation. */ __BEGIN_DECLS -int __srget __P((FILE *)); -int __svfscanf __P((FILE *, const char *, __va_list)); -int __swbuf __P((int, FILE *)); +int __srget (FILE *); +int __svfscanf (FILE *, const char *, __va_list); +int __swbuf (int, FILE *); __END_DECLS /* @@ -415,7 +415,7 @@ static __inline int __sputc(int _c, FILE *_p) { #define getc_unlocked(fp) __sgetc(fp) #define putc_unlocked(x, fp) __sputc(x, fp) #ifdef _THREAD_SAFE -void _flockfile_debug __P((FILE *, char *, int)); +void _flockfile_debug (FILE *, char *, int); #ifdef _FLOCK_DEBUG #define _FLOCKFILE(x) _flockfile_debug(x, __FILE__, __LINE__) #else diff --git a/include/stdlib.h b/include/stdlib.h index 36bfb71df4..ce92d441d4 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -32,7 +32,7 @@ * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 * $FreeBSD: src/include/stdlib.h,v 1.16.2.5 2002/12/13 01:34:00 tjr Exp $ - * $DragonFly: src/include/stdlib.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/stdlib.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _STDLIB_H_ @@ -86,111 +86,111 @@ 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); #ifdef __LONG_LONG_SUPPORTED long long - strtoll __P((const char *, char **, int)); + strtoll (const char *, char **, int); #endif unsigned long - strtoul __P((const char *, char **, int)); + strtoul (const char *, char **, int); #ifdef __LONG_LONG_SUPPORTED unsigned long long - strtoull __P((const char *, char **, int)); + strtoull (const char *, char **, int); #endif -int system __P((const char *)); +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) -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])); +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)); -char *getbsize __P((int *, long *)); -char *cgetcap __P((char *, char *, int)); -int cgetclose __P((void)); -int cgetent __P((char **, char **, char *)); -int cgetfirst __P((char **, char **)); -int cgetmatch __P((char *, char *)); -int cgetnext __P((char **, char **)); -int cgetnum __P((char *, char *, long *)); -int cgetset __P((char *)); -int cgetstr __P((char *, char *, char **)); -int cgetustr __P((char *, char *, char **)); - -int daemon __P((int, int)); -char *devname __P((int, int)); -int getloadavg __P((double [], int)); + arc4random (void); +void arc4random_addrandom (unsigned char *dat, int datlen); +void arc4random_stir (void); +char *getbsize (int *, long *); +char *cgetcap (char *, char *, int); +int cgetclose (void); +int cgetent (char **, char **, char *); +int cgetfirst (char **, char **); +int cgetmatch (char *, char *); +int cgetnext (char **, char **); +int cgetnum (char *, char *, long *); +int cgetset (char *); +int cgetstr (char *, char *, char **); +int cgetustr (char *, char *, char **); + +int daemon (int, int); +char *devname (int, int); +int getloadavg (double [], int); __const char * - getprogname __P((void)); - -char *group_from_gid __P((unsigned long, int)); -int heapsort __P((void *, size_t, size_t, - int (*)(const void *, const void *))); -char *initstate __P((unsigned long, char *, long)); -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 srandom __P((unsigned long)); -void srandomdev __P((void)); -char *user_from_uid __P((unsigned long, int)); + getprogname (void); + +char *group_from_gid (unsigned long, int); +int heapsort (void *, size_t, size_t, + int (*)(const void *, const void *)); +char *initstate (unsigned long, char *, long); +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 srandom (unsigned long); +void srandomdev (void); +char *user_from_uid (unsigned long, int); #ifndef __STRICT_ANSI__ -__int64_t strtoq __P((const char *, char **, int)); +__int64_t strtoq (const char *, char **, int); __uint64_t - strtouq __P((const char *, char **, int)); + strtouq (const char *, char **, int); #endif -void unsetenv __P((const char *)); +void unsetenv (const char *); #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ __END_DECLS diff --git a/include/string.h b/include/string.h index 613f3fa6c1..f144690edf 100644 --- a/include/string.h +++ b/include/string.h @@ -32,7 +32,7 @@ * * @(#)string.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/string.h,v 1.6.2.3 2001/12/25 00:36:57 ache Exp $ - * $DragonFly: src/include/string.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/string.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _STRING_H_ @@ -54,51 +54,51 @@ typedef __size_t size_t; /* open group */ #include __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 138b2a71da..4ad468197f 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -1,5 +1,3 @@ -/* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ - /* * Copyright (c) 1994 Christos Zoulas * All rights reserved. @@ -29,6 +27,9 @@ * 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. + * + * $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ + * $DragonFly: src/include/stringlist.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _STRINGLIST_H @@ -46,10 +47,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 9ff7a2d72b..4d6ec70b23 100644 --- a/include/time.h +++ b/include/time.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)time.h 8.3 (Berkeley) 1/21/94 - * $DragonFly: src/include/time.h,v 1.2 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/time.h,v 1.3 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _TIME_H_ @@ -120,38 +120,38 @@ 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 -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 bfb5a9d3da..ee76a0b19a 100644 --- a/include/ttyent.h +++ b/include/ttyent.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)ttyent.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/ttyent.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _TTYENT_H_ @@ -65,12 +66,12 @@ struct ttyent { #include __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 044e3d77a4..8db317f135 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -32,7 +32,7 @@ * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 * $FreeBSD: src/include/unistd.h,v 1.35.2.10 2002/04/15 12:52:28 nectar Exp $ - * $DragonFly: src/include/unistd.h,v 1.5 2003/11/11 00:04:17 dillon Exp $ + * $DragonFly: src/include/unistd.h,v 1.6 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _UNISTD_H_ @@ -58,176 +58,176 @@ #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 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 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 *, int, int *, 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 *, int)); -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 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 (*) __P((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 *, int, int *, 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 *, int); +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 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); int varsym_set(int, const char *, const char *); int varsym_get(int, const char *, char *, int); int varsym_list(int, char *, int, int *); 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 1ea12d0cb1..4285ba7044 100644 --- a/include/utime.h +++ b/include/utime.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)utime.h 8.1 (Berkeley) 6/2/93 + * $DragonFly: src/include/utime.h,v 1.2 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _UTIME_H_ @@ -44,7 +45,7 @@ struct utimbuf { #include __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 ad3463936c..5a764236d3 100644 --- a/include/vis.h +++ b/include/vis.h @@ -32,7 +32,7 @@ * * @(#)vis.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/vis.h,v 1.6.2.1 2000/08/17 08:25:53 jhb Exp $ - * $DragonFly: src/include/vis.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/vis.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #ifndef _VIS_H_ @@ -81,11 +81,11 @@ #include __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 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 unvis (char *, int, int *, int); __END_DECLS #endif /* !_VIS_H_ */ diff --git a/include/wchar.h b/include/wchar.h index bb19423150..af493bab2b 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/include/wchar.h,v 1.3.2.2 2002/08/08 02:42:29 imp Exp $ - * $DragonFly: src/include/wchar.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/wchar.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ /*- @@ -105,39 +105,39 @@ typedef __size_t size_t; /* open group */ __BEGIN_DECLS -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 5c0722beae..dc47384aae 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -26,7 +26,7 @@ * citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp * $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $ * $FreeBSD: src/include/wctype.h,v 1.3.2.1 2001/07/11 23:48:38 obrien Exp $ - * $DragonFly: src/include/wctype.h,v 1.3 2003/11/09 02:22:28 dillon Exp $ + * $DragonFly: src/include/wctype.h,v 1.4 2003/11/14 01:01:43 dillon Exp $ */ #if 0 @@ -49,20 +49,20 @@ typedef __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_ */ -- 2.41.0