From: Eirik Nygaard Date: Wed, 12 Nov 2003 20:21:31 +0000 (+0000) Subject: * Removed the __P macros from lib/ X-Git-Tag: v2.0.1~12654 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/064e1fb31f522fb9804a689dd25f42073f1b79e5 * Removed the __P macros from lib/ * Small fixups by me in lib/libcr, there was some stale ')' after the __P( was removed from the line above. Submitted-by: Craig Dooley --- diff --git a/lib/libatm/libatm.h b/lib/libatm/libatm.h index 1191551f9d..d889786150 100644 --- a/lib/libatm/libatm.h +++ b/lib/libatm/libatm.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/lib/libatm/libatm.h,v 1.3 1999/08/27 23:58:05 peter Exp $ - * @(#) $DragonFly: src/lib/libatm/libatm.h,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * @(#) $DragonFly: src/lib/libatm/libatm.h,v 1.3 2003/11/12 20:21:22 eirikn Exp $ * */ @@ -82,39 +82,39 @@ typedef struct harp_timer Harp_timer; */ /* atm_addr.c */ -extern int get_hex_atm_addr __P((char *, u_char *, int)); -extern char *format_atm_addr __P((Atm_addr *)); +extern int get_hex_atm_addr (char *, u_char *, int); +extern char *format_atm_addr (Atm_addr *); /* cache_key.c */ -extern void scsp_cache_key __P((Atm_addr *, - struct in_addr *, int, char *)); +extern void scsp_cache_key (Atm_addr *, + struct in_addr *, int, char *); /* ioctl_subr.c */ -extern int do_info_ioctl __P((struct atminfreq *, int)); -extern int get_vcc_info __P((char *, - struct air_vcc_rsp **)); -extern int get_subnet_mask __P((char *, - struct sockaddr_in *)); -extern int get_mtu __P((char *)); -extern int verify_nif_name __P((char *)); -extern int get_cfg_info __P((char *, struct air_cfg_rsp **)); -extern int get_intf_info __P((char *, struct air_int_rsp **)); -extern int get_netif_info __P((char *, struct air_netif_rsp **)); +extern int do_info_ioctl (struct atminfreq *, int); +extern int get_vcc_info (char *, + struct air_vcc_rsp **); +extern int get_subnet_mask (char *, + struct sockaddr_in *); +extern int get_mtu (char *); +extern int verify_nif_name (char *); +extern int get_cfg_info (char *, struct air_cfg_rsp **); +extern int get_intf_info (char *, struct air_int_rsp **); +extern int get_netif_info (char *, struct air_netif_rsp **); /* ip_addr.c */ -extern struct sockaddr_in *get_ip_addr __P((char *)); -extern char *format_ip_addr __P((struct in_addr *)); +extern struct sockaddr_in *get_ip_addr (char *); +extern char *format_ip_addr (struct in_addr *); /* ip_checksum.c */ -extern short ip_checksum __P((char *, int)); +extern short ip_checksum (char *, int); /* timer.c */ extern Harp_timer *harp_timer_head; extern int harp_timer_exec; -extern void timer_proc __P(()); -extern int init_timer __P(()); -extern int block_timer __P(()); -extern void enable_timer __P((int)); +extern void timer_proc (); +extern int init_timer (); +extern int block_timer (); +extern void enable_timer (int); #endif /* _HARP_LIBHARP_H */ diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c index 370932972a..2c9bb1e913 100644 --- a/lib/libc/db/btree/bt_close.c +++ b/lib/libc/db/btree/bt_close.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/btree/bt_close.c,v 1.5 2000/01/27 23:06:05 jasone Exp $ - * $DragonFly: src/lib/libc/db/btree/bt_close.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_close.c,v 1.3 2003/11/12 20:21:22 eirikn Exp $ * * @(#)bt_close.c 8.7 (Berkeley) 8/17/94 */ @@ -50,7 +50,7 @@ #include #include "btree.h" -static int bt_meta __P((BTREE *)); +static int bt_meta (BTREE *); /* * BT_CLOSE -- Close a btree. diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c index 30da4cf4f5..ae8c33d221 100644 --- a/lib/libc/db/btree/bt_conv.c +++ b/lib/libc/db/btree/bt_conv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_conv.c 8.5 (Berkeley) 8/17/94 - * $DragonFly: src/lib/libc/db/btree/bt_conv.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_conv.c,v 1.4 2003/11/12 20:21:22 eirikn Exp $ */ #include @@ -44,7 +44,7 @@ #include #include "btree.h" -static void mswap __P((PAGE *)); +static void mswap (PAGE *); /* * __BT_BPGIN, __BT_BPGOUT -- diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c index b24e4ff257..0661a965dc 100644 --- a/lib/libc/db/btree/bt_delete.c +++ b/lib/libc/db/btree/bt_delete.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_delete.c 8.13 (Berkeley) 7/28/94 - * $DragonFly: src/lib/libc/db/btree/bt_delete.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_delete.c,v 1.4 2003/11/12 20:21:22 eirikn Exp $ */ #include @@ -46,11 +46,11 @@ #include #include "btree.h" -static int __bt_bdelete __P((BTREE *, const DBT *)); -static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int)); -static int __bt_pdelete __P((BTREE *, PAGE *)); -static int __bt_relink __P((BTREE *, PAGE *)); -static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *)); +static int __bt_bdelete (BTREE *, const DBT *); +static int __bt_curdel (BTREE *, const DBT *, PAGE *, u_int); +static int __bt_pdelete (BTREE *, PAGE *); +static int __bt_relink (BTREE *, PAGE *); +static int __bt_stkacq (BTREE *, PAGE **, CURSOR *); /* * __bt_delete diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c index 68dab7dcef..1083e9fc4b 100644 --- a/lib/libc/db/btree/bt_open.c +++ b/lib/libc/db/btree/bt_open.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.7.2.1 2000/11/02 10:30:07 kris Exp $ - * $DragonFly: src/lib/libc/db/btree/bt_open.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_open.c,v 1.3 2003/11/12 20:21:22 eirikn Exp $ * * @(#)bt_open.c 8.10 (Berkeley) 8/17/94 */ @@ -67,9 +67,9 @@ #define MINPSIZE 128 #endif -static int byteorder __P((void)); -static int nroot __P((BTREE *)); -static int tmp __P((void)); +static int byteorder (void); +static int nroot (BTREE *); +static int tmp (void); /* * __BT_OPEN -- Open a btree. diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c index 4c5737aed1..c45412d1a1 100644 --- a/lib/libc/db/btree/bt_put.c +++ b/lib/libc/db/btree/bt_put.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_put.c 8.8 (Berkeley) 7/26/94 - * $DragonFly: src/lib/libc/db/btree/bt_put.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_put.c,v 1.4 2003/11/12 20:21:22 eirikn Exp $ */ #include @@ -47,7 +47,7 @@ #include #include "btree.h" -static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *)); +static EPG *bt_fast (BTREE *, const DBT *, const DBT *, int *); /* * __BT_PUT -- Add a btree item to the tree. diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c index 3e36b6e144..01bcdae860 100644 --- a/lib/libc/db/btree/bt_search.c +++ b/lib/libc/db/btree/bt_search.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_search.c 8.8 (Berkeley) 7/31/94 - * $DragonFly: src/lib/libc/db/btree/bt_search.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_search.c,v 1.4 2003/11/12 20:21:22 eirikn Exp $ */ #include @@ -44,8 +44,8 @@ #include #include "btree.h" -static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *)); -static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *)); +static int __bt_snext (BTREE *, PAGE *, const DBT *, int *); +static int __bt_sprev (BTREE *, PAGE *, const DBT *, int *); /* * __bt_search -- diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c index 5f83aac3cc..057bdfd6b1 100644 --- a/lib/libc/db/btree/bt_seq.c +++ b/lib/libc/db/btree/bt_seq.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_seq.c 8.7 (Berkeley) 7/20/94 - * $DragonFly: src/lib/libc/db/btree/bt_seq.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_seq.c,v 1.4 2003/11/12 20:21:22 eirikn Exp $ */ #include @@ -47,9 +47,9 @@ #include #include "btree.h" -static int __bt_first __P((BTREE *, const DBT *, EPG *, int *)); -static int __bt_seqadv __P((BTREE *, EPG *, int)); -static int __bt_seqset __P((BTREE *, EPG *, DBT *, int)); +static int __bt_first (BTREE *, const DBT *, EPG *, int *); +static int __bt_seqadv (BTREE *, EPG *, int); +static int __bt_seqset (BTREE *, EPG *, DBT *, int); /* * Sequential scan support. diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c index b9b30e838b..cb608b0137 100644 --- a/lib/libc/db/btree/bt_split.c +++ b/lib/libc/db/btree/bt_split.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_split.c 8.9 (Berkeley) 7/26/94 - * $DragonFly: src/lib/libc/db/btree/bt_split.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/bt_split.c,v 1.4 2003/11/12 20:21:22 eirikn Exp $ */ #include @@ -47,16 +47,16 @@ #include #include "btree.h" -static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *)); +static int bt_broot (BTREE *, PAGE *, PAGE *, PAGE *); static PAGE *bt_page - __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t)); -static int bt_preserve __P((BTREE *, pgno_t)); + (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t); +static int bt_preserve (BTREE *, pgno_t); static PAGE *bt_psplit - __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t)); + (BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t); static PAGE *bt_root - __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t)); -static int bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *)); -static recno_t rec_total __P((PAGE *)); + (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t); +static int bt_rroot (BTREE *, PAGE *, PAGE *, PAGE *); +static recno_t rec_total (PAGE *); #ifdef STATISTICS u_long bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved; diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h index 077170766f..3547854e85 100644 --- a/lib/libc/db/btree/btree.h +++ b/lib/libc/db/btree/btree.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)btree.h 8.11 (Berkeley) 8/17/94 - * $DragonFly: src/lib/libc/db/btree/btree.h,v 1.2 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/btree.h,v 1.3 2003/11/12 20:21:22 eirikn Exp $ */ /* Macros to set/clear/test flags. */ @@ -336,11 +336,11 @@ typedef struct _btree { EPGNO bt_last; /* last insert */ /* B: key comparison function */ - int (*bt_cmp) __P((const DBT *, const DBT *)); + int (*bt_cmp) (const DBT *, const DBT *); /* B: prefix comparison function */ - size_t (*bt_pfx) __P((const DBT *, const DBT *)); + size_t (*bt_pfx) (const DBT *, const DBT *); /* R: recno input function */ - int (*bt_irec) __P((struct _btree *, recno_t)); + int (*bt_irec) (struct _btree *, recno_t); FILE *bt_rfp; /* R: record FILE pointer */ int bt_rfd; /* R: record file descriptor */ diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h index fd743f8254..58c3405417 100644 --- a/lib/libc/db/btree/extern.h +++ b/lib/libc/db/btree/extern.h @@ -31,41 +31,41 @@ * SUCH DAMAGE. * * @(#)extern.h 8.10 (Berkeley) 7/20/94 - * $DragonFly: src/lib/libc/db/btree/extern.h,v 1.2 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/btree/extern.h,v 1.3 2003/11/12 20:21:22 eirikn Exp $ */ -int __bt_close __P((DB *)); -int __bt_cmp __P((BTREE *, const DBT *, EPG *)); -int __bt_crsrdel __P((BTREE *, EPGNO *)); -int __bt_defcmp __P((const DBT *, const DBT *)); -size_t __bt_defpfx __P((const DBT *, const DBT *)); -int __bt_delete __P((const DB *, const DBT *, u_int)); -int __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int)); -int __bt_fd __P((const DB *)); -int __bt_free __P((BTREE *, PAGE *)); -int __bt_get __P((const DB *, const DBT *, DBT *, u_int)); -PAGE *__bt_new __P((BTREE *, pgno_t *)); -void __bt_pgin __P((void *, pgno_t, void *)); -void __bt_pgout __P((void *, pgno_t, void *)); -int __bt_push __P((BTREE *, pgno_t, int)); -int __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int)); -int __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int)); -EPG *__bt_search __P((BTREE *, const DBT *, int *)); -int __bt_seq __P((const DB *, DBT *, DBT *, u_int)); -void __bt_setcur __P((BTREE *, pgno_t, u_int)); -int __bt_split __P((BTREE *, PAGE *, - const DBT *, const DBT *, int, size_t, u_int32_t)); -int __bt_sync __P((const DB *, u_int)); +int __bt_close (DB *); +int __bt_cmp (BTREE *, const DBT *, EPG *); +int __bt_crsrdel (BTREE *, EPGNO *); +int __bt_defcmp (const DBT *, const DBT *); +size_t __bt_defpfx (const DBT *, const DBT *); +int __bt_delete (const DB *, const DBT *, u_int); +int __bt_dleaf (BTREE *, const DBT *, PAGE *, u_int); +int __bt_fd (const DB *); +int __bt_free (BTREE *, PAGE *); +int __bt_get (const DB *, const DBT *, DBT *, u_int); +PAGE *__bt_new (BTREE *, pgno_t *); +void __bt_pgin (void *, pgno_t, void *); +void __bt_pgout (void *, pgno_t, void *); +int __bt_push (BTREE *, pgno_t, int); +int __bt_put (const DB *dbp, DBT *, const DBT *, u_int); +int __bt_ret (BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int); +EPG *__bt_search (BTREE *, const DBT *, int *); +int __bt_seq (const DB *, DBT *, DBT *, u_int); +void __bt_setcur (BTREE *, pgno_t, u_int); +int __bt_split (BTREE *, PAGE *, + const DBT *, const DBT *, int, size_t, u_int32_t); +int __bt_sync (const DB *, u_int); -int __ovfl_delete __P((BTREE *, void *)); -int __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *)); -int __ovfl_put __P((BTREE *, const DBT *, pgno_t *)); +int __ovfl_delete (BTREE *, void *); +int __ovfl_get (BTREE *, void *, size_t *, void **, size_t *); +int __ovfl_put (BTREE *, const DBT *, pgno_t *); #ifdef DEBUG -void __bt_dnpage __P((DB *, pgno_t)); -void __bt_dpage __P((PAGE *)); -void __bt_dump __P((DB *)); +void __bt_dnpage (DB *, pgno_t); +void __bt_dpage (PAGE *); +void __bt_dump (DB *); #endif #ifdef STATISTICS -void __bt_stat __P((DB *)); +void __bt_stat (DB *); #endif diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h index d62df597e2..5bc3cbb79a 100644 --- a/lib/libc/db/hash/extern.h +++ b/lib/libc/db/hash/extern.h @@ -31,35 +31,35 @@ * SUCH DAMAGE. * * @(#)extern.h 8.4 (Berkeley) 6/16/94 - * $DragonFly: src/lib/libc/db/hash/extern.h,v 1.2 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/hash/extern.h,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ -BUFHEAD *__add_ovflpage __P((HTAB *, BUFHEAD *)); -int __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *)); -int __big_delete __P((HTAB *, BUFHEAD *)); -int __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *)); -int __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int)); -int __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int)); -int __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, - int, u_int32_t, SPLIT_RETURN *)); -int __buf_free __P((HTAB *, int, int)); -void __buf_init __P((HTAB *, int)); -u_int32_t __call_hash __P((HTAB *, char *, int)); -int __delpair __P((HTAB *, BUFHEAD *, int)); -int __expand_table __P((HTAB *)); -int __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int)); -u_int16_t __find_last_page __P((HTAB *, BUFHEAD **)); -void __free_ovflpage __P((HTAB *, BUFHEAD *)); -BUFHEAD *__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int)); -int __get_page __P((HTAB *, char *, u_int32_t, int, int, int)); -int __ibitmap __P((HTAB *, int, int, int)); -u_int32_t __log2 __P((u_int32_t)); -int __put_page __P((HTAB *, char *, u_int32_t, int, int)); -void __reclaim_buf __P((HTAB *, BUFHEAD *)); -int __split_page __P((HTAB *, u_int32_t, u_int32_t)); +BUFHEAD *__add_ovflpage (HTAB *, BUFHEAD *); +int __addel (HTAB *, BUFHEAD *, const DBT *, const DBT *); +int __big_delete (HTAB *, BUFHEAD *); +int __big_insert (HTAB *, BUFHEAD *, const DBT *, const DBT *); +int __big_keydata (HTAB *, BUFHEAD *, DBT *, DBT *, int); +int __big_return (HTAB *, BUFHEAD *, int, DBT *, int); +int __big_split (HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, + int, u_int32_t, SPLIT_RETURN *); +int __buf_free (HTAB *, int, int); +void __buf_init (HTAB *, int); +u_int32_t __call_hash (HTAB *, char *, int); +int __delpair (HTAB *, BUFHEAD *, int); +int __expand_table (HTAB *); +int __find_bigpair (HTAB *, BUFHEAD *, int, char *, int); +u_int16_t __find_last_page (HTAB *, BUFHEAD **); +void __free_ovflpage (HTAB *, BUFHEAD *); +BUFHEAD *__get_buf (HTAB *, u_int32_t, BUFHEAD *, int); +int __get_page (HTAB *, char *, u_int32_t, int, int, int); +int __ibitmap (HTAB *, int, int, int); +u_int32_t __log2 (u_int32_t); +int __put_page (HTAB *, char *, u_int32_t, int, int); +void __reclaim_buf (HTAB *, BUFHEAD *); +int __split_page (HTAB *, u_int32_t, u_int32_t); /* Default hash routine. */ -extern u_int32_t (*__default_hash) __P((const void *, size_t)); +extern u_int32_t (*__default_hash) (const void *, size_t); #ifdef HASH_STATISTICS extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows; diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index 826a168208..fa616f7022 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/hash/hash.c,v 1.8 2000/01/27 23:06:08 jasone Exp $ - * $DragonFly: src/lib/libc/db/hash/hash.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libc/db/hash/hash.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)hash.c 8.9 (Berkeley) 6/16/94 */ @@ -57,23 +57,23 @@ #include "page.h" #include "extern.h" -static int alloc_segs __P((HTAB *, int)); -static int flush_meta __P((HTAB *)); -static int hash_access __P((HTAB *, ACTION, DBT *, DBT *)); -static int hash_close __P((DB *)); -static int hash_delete __P((const DB *, const DBT *, u_int32_t)); -static int hash_fd __P((const DB *)); -static int hash_get __P((const DB *, const DBT *, DBT *, u_int32_t)); -static int hash_put __P((const DB *, DBT *, const DBT *, u_int32_t)); -static void *hash_realloc __P((SEGMENT **, int, int)); -static int hash_seq __P((const DB *, DBT *, DBT *, u_int32_t)); -static int hash_sync __P((const DB *, u_int32_t)); -static int hdestroy __P((HTAB *)); -static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *)); -static int init_htab __P((HTAB *, int)); +static int alloc_segs (HTAB *, int); +static int flush_meta (HTAB *); +static int hash_access (HTAB *, ACTION, DBT *, DBT *); +static int hash_close (DB *); +static int hash_delete (const DB *, const DBT *, u_int32_t); +static int hash_fd (const DB *); +static int hash_get (const DB *, const DBT *, DBT *, u_int32_t); +static int hash_put (const DB *, DBT *, const DBT *, u_int32_t); +static void *hash_realloc (SEGMENT **, int, int); +static int hash_seq (const DB *, DBT *, DBT *, u_int32_t); +static int hash_sync (const DB *, u_int32_t); +static int hdestroy (HTAB *); +static HTAB *init_hash (HTAB *, const char *, HASHINFO *); +static int init_htab (HTAB *, int); #if BYTE_ORDER == LITTLE_ENDIAN -static void swap_header __P((HTAB *)); -static void swap_header_copy __P((HASHHDR *, HASHHDR *)); +static void swap_header (HTAB *); +static void swap_header_copy (HASHHDR *, HASHHDR *); #endif /* Fast arithmetic, relying on powers of 2, */ diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h index dc1561baa5..4d6e152bb4 100644 --- a/lib/libc/db/hash/hash.h +++ b/lib/libc/db/hash/hash.h @@ -35,7 +35,7 @@ * * @(#)hash.h 8.3 (Berkeley) 5/31/94 * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.4.8.1 2001/03/05 03:50:02 kris Exp $ - * $DragonFly: src/lib/libc/db/hash/hash.h,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libc/db/hash/hash.h,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ /* Operations */ @@ -97,7 +97,7 @@ typedef struct htab { /* Memory resident data structure */ int exsegs; /* Number of extra allocated * segments */ u_int32_t /* Hash function */ - (*hash)__P((const void *, size_t)); + (*hash)(const void *, size_t); int flags; /* Flag values */ int fp; /* File pointer */ char *tmp_buf; /* Temporary Buffer for BIG data */ diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c index 3bef80f2fa..c42ef81b0e 100644 --- a/lib/libc/db/hash/hash_bigkey.c +++ b/lib/libc/db/hash/hash_bigkey.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94 - * $DragonFly: src/lib/libc/db/hash/hash_bigkey.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/hash/hash_bigkey.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $ */ /* @@ -71,8 +71,8 @@ #include "page.h" #include "extern.h" -static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int)); -static int collect_data __P((HTAB *, BUFHEAD *, int, int)); +static int collect_key (HTAB *, BUFHEAD *, int, DBT *, int); +static int collect_data (HTAB *, BUFHEAD *, int, int); /* * Big_insert diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c index 0db2f495cd..34b5ea3184 100644 --- a/lib/libc/db/hash/hash_buf.c +++ b/lib/libc/db/hash/hash_buf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.4.8.1 2001/03/05 07:38:05 obrien Exp $ - * $DragonFly: src/lib/libc/db/hash/hash_buf.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libc/db/hash/hash_buf.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)hash_buf.c 8.5 (Berkeley) 7/15/94 */ @@ -70,7 +70,7 @@ #include "page.h" #include "extern.h" -static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *)); +static BUFHEAD *newbuf (HTAB *, u_int32_t, BUFHEAD *); /* Unlink B from its place in the lru */ #define BUF_REMOVE(B) { \ diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c index d8925dbc8d..35ad6902c0 100644 --- a/lib/libc/db/hash/hash_func.c +++ b/lib/libc/db/hash/hash_func.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)hash_func.c 8.2 (Berkeley) 2/21/94 - * $DragonFly: src/lib/libc/db/hash/hash_func.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/hash/hash_func.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -44,13 +44,13 @@ #include "page.h" #include "extern.h" -static u_int32_t hash1 __P((const void *, size_t)); -static u_int32_t hash2 __P((const void *, size_t)); -static u_int32_t hash3 __P((const void *, size_t)); -static u_int32_t hash4 __P((const void *, size_t)); +static u_int32_t hash1 (const void *, size_t); +static u_int32_t hash2 (const void *, size_t); +static u_int32_t hash3 (const void *, size_t); +static u_int32_t hash4 (const void *, size_t); /* Global default hash function */ -u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4; +u_int32_t (*__default_hash) (const void *, size_t) = hash4; /* * HASH FUNCTIONS diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c index 62055e97ba..b8fd971b54 100644 --- a/lib/libc/db/hash/hash_page.c +++ b/lib/libc/db/hash/hash_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.5 2000/01/27 23:06:08 jasone Exp $ - * $DragonFly: src/lib/libc/db/hash/hash_page.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libc/db/hash/hash_page.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)hash_page.c 8.7 (Berkeley) 8/16/94 */ @@ -73,14 +73,14 @@ #include "page.h" #include "extern.h" -static u_int32_t *fetch_bitmap __P((HTAB *, int)); -static u_int32_t first_free __P((u_int32_t)); -static int open_temp __P((HTAB *)); -static u_int16_t overflow_page __P((HTAB *)); -static void putpair __P((char *, const DBT *, const DBT *)); -static void squeeze_key __P((u_int16_t *, const DBT *, const DBT *)); +static u_int32_t *fetch_bitmap (HTAB *, int); +static u_int32_t first_free (u_int32_t); +static int open_temp (HTAB *); +static u_int16_t overflow_page (HTAB *); +static void putpair (char *, const DBT *, const DBT *); +static void squeeze_key (u_int16_t *, const DBT *, const DBT *); static int ugly_split - __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int)); + (HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int); #define PAGE_INIT(P) { \ ((u_int16_t *)(P))[0] = 0; \ diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 0c9db5f942..488c773675 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.5.2.1 2001/03/05 23:05:01 obrien Exp $ - * $DragonFly: src/lib/libc/db/mpool/mpool.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/db/mpool/mpool.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)mpool.c 8.5 (Berkeley) 7/26/94 */ @@ -51,9 +51,9 @@ #define __MPOOLINTERFACE_PRIVATE #include -static BKT *mpool_bkt __P((MPOOL *)); -static BKT *mpool_look __P((MPOOL *, pgno_t)); -static int mpool_write __P((MPOOL *, BKT *)); +static BKT *mpool_bkt (MPOOL *); +static BKT *mpool_look (MPOOL *, pgno_t); +static int mpool_write (MPOOL *, BKT *); /* * mpool_open -- @@ -102,8 +102,8 @@ mpool_open(key, fd, pagesize, maxcache) void mpool_filter(mp, pgin, pgout, pgcookie) MPOOL *mp; - void (*pgin) __P((void *, pgno_t, void *)); - void (*pgout) __P((void *, pgno_t, void *)); + void (*pgin) (void *, pgno_t, void *); + void (*pgout) (void *, pgno_t, void *); void *pgcookie; { mp->pgin = pgin; diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h index 96d99cfef0..c2706abc23 100644 --- a/lib/libc/db/recno/extern.h +++ b/lib/libc/db/recno/extern.h @@ -31,25 +31,25 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 6/4/94 - * $DragonFly: src/lib/libc/db/recno/extern.h,v 1.2 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/recno/extern.h,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #include "../btree/extern.h" -int __rec_close __P((DB *)); -int __rec_delete __P((const DB *, const DBT *, u_int)); -int __rec_dleaf __P((BTREE *, PAGE *, u_int32_t)); -int __rec_fd __P((const DB *)); -int __rec_fmap __P((BTREE *, recno_t)); -int __rec_fout __P((BTREE *)); -int __rec_fpipe __P((BTREE *, recno_t)); -int __rec_get __P((const DB *, const DBT *, DBT *, u_int)); -int __rec_iput __P((BTREE *, recno_t, const DBT *, u_int)); -int __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int)); -int __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *)); -EPG *__rec_search __P((BTREE *, recno_t, enum SRCHOP)); -int __rec_seq __P((const DB *, DBT *, DBT *, u_int)); -int __rec_sync __P((const DB *, u_int)); -int __rec_vmap __P((BTREE *, recno_t)); -int __rec_vout __P((BTREE *)); -int __rec_vpipe __P((BTREE *, recno_t)); +int __rec_close (DB *); +int __rec_delete (const DB *, const DBT *, u_int); +int __rec_dleaf (BTREE *, PAGE *, u_int32_t); +int __rec_fd (const DB *); +int __rec_fmap (BTREE *, recno_t); +int __rec_fout (BTREE *); +int __rec_fpipe (BTREE *, recno_t); +int __rec_get (const DB *, const DBT *, DBT *, u_int); +int __rec_iput (BTREE *, recno_t, const DBT *, u_int); +int __rec_put (const DB *dbp, DBT *, const DBT *, u_int); +int __rec_ret (BTREE *, EPG *, recno_t, DBT *, DBT *); +EPG *__rec_search (BTREE *, recno_t, enum SRCHOP); +int __rec_seq (const DB *, DBT *, DBT *, u_int); +int __rec_sync (const DB *, u_int); +int __rec_vmap (BTREE *, recno_t); +int __rec_vout (BTREE *); +int __rec_vpipe (BTREE *, recno_t); diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c index 19ec6d6c4d..fbe01d5f0f 100644 --- a/lib/libc/db/recno/rec_delete.c +++ b/lib/libc/db/recno/rec_delete.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)rec_delete.c 8.7 (Berkeley) 7/14/94 - * $DragonFly: src/lib/libc/db/recno/rec_delete.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/db/recno/rec_delete.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -46,7 +46,7 @@ #include #include "recno.h" -static int rec_rdelete __P((BTREE *, recno_t)); +static int rec_rdelete (BTREE *, recno_t); /* * __REC_DELETE -- Delete the item(s) referenced by a key. diff --git a/lib/libc/db/test/btree.tests/main.c b/lib/libc/db/test/btree.tests/main.c index 776abcddfc..93fb6280d4 100644 --- a/lib/libc/db/test/btree.tests/main.c +++ b/lib/libc/db/test/btree.tests/main.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)main.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libc/db/test/btree.tests/main.c,v 1.3 2003/11/12 18:07:00 eirikn Exp $ + * $DragonFly: src/lib/libc/db/test/btree.tests/main.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -51,37 +51,37 @@ typedef struct cmd_table { char *cmd; int nargs; int rconv; - void (*func) __P((DB *, char **)); + void (*func) (DB *, char **); char *usage, *descrip; } cmd_table; int stopstop; DB *globaldb; -void append __P((DB *, char **)); -void bstat __P((DB *, char **)); -void cursor __P((DB *, char **)); -void delcur __P((DB *, char **)); -void delete __P((DB *, char **)); -void dump __P((DB *, char **)); -void first __P((DB *, char **)); -void get __P((DB *, char **)); -void help __P((DB *, char **)); -void iafter __P((DB *, char **)); -void ibefore __P((DB *, char **)); -void icursor __P((DB *, char **)); -void insert __P((DB *, char **)); -void keydata __P((DBT *, DBT *)); -void last __P((DB *, char **)); -void list __P((DB *, char **)); -void load __P((DB *, char **)); -void mstat __P((DB *, char **)); -void next __P((DB *, char **)); -int parse __P((char *, char **, int)); -void previous __P((DB *, char **)); -void show __P((DB *, char **)); -void usage __P((void)); -void user __P((DB *)); +void append (DB *, char **); +void bstat (DB *, char **); +void cursor (DB *, char **); +void delcur (DB *, char **); +void delete (DB *, char **); +void dump (DB *, char **); +void first (DB *, char **); +void get (DB *, char **); +void help (DB *, char **); +void iafter (DB *, char **); +void ibefore (DB *, char **); +void icursor (DB *, char **); +void insert (DB *, char **); +void keydata (DBT *, DBT *); +void last (DB *, char **); +void list (DB *, char **); +void load (DB *, char **); +void mstat (DB *, char **); +void next (DB *, char **); +int parse (char *, char **, int); +void previous (DB *, char **); +void show (DB *, char **); +void usage (void); +void user (DB *); cmd_table commands[] = { "?", 0, 0, help, "help", NULL, diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c index 8aefb84bc1..fa05b2651f 100644 --- a/lib/libc/db/test/dbtest.c +++ b/lib/libc/db/test/dbtest.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)dbtest.c 8.17 (Berkeley) 9/1/94 * $FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.3.8.1 2000/08/21 22:44:47 jhb Exp $ - * $DragonFly: src/lib/libc/db/test/dbtest.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/db/test/dbtest.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -52,22 +52,22 @@ enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA }; -void compare __P((DBT *, DBT *)); -DBTYPE dbtype __P((char *)); -void dump __P((DB *, int)); -void err __P((const char *, ...)); -void get __P((DB *, DBT *)); -void getdata __P((DB *, DBT *, DBT *)); -void put __P((DB *, DBT *, DBT *)); -void rem __P((DB *, DBT *)); -char *sflags __P((int)); -void synk __P((DB *)); -void *rfile __P((char *, size_t *)); -void seq __P((DB *, DBT *)); -u_int setflags __P((char *)); -void *setinfo __P((DBTYPE, char *)); -void usage __P((void)); -void *xmalloc __P((char *, size_t)); +void compare (DBT *, DBT *); +DBTYPE dbtype (char *); +void dump (DB *, int); +void err (const char *, ...); +void get (DB *, DBT *); +void getdata (DB *, DBT *, DBT *); +void put (DB *, DBT *, DBT *); +void rem (DB *, DBT *); +char *sflags (int); +void synk (DB *); +void *rfile (char *, size_t *); +void seq (DB *, DBT *); +u_int setflags (char *); +void *setinfo (DBTYPE, char *); +void usage (void); +void *xmalloc (char *, size_t); DBTYPE type; /* Database type. */ void *infop; /* Iflags. */ diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c index e6b44bfb58..d4201c847d 100644 --- a/lib/libc/gen/closedir.c +++ b/lib/libc/gen/closedir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/closedir.c,v 1.6.2.1 2001/03/05 08:29:56 obrien Exp $ - * $DragonFly: src/lib/libc/gen/closedir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/closedir.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)closedir.c 8.1 (Berkeley) 6/10/93 */ @@ -41,7 +41,7 @@ #include #include -extern void _reclaim_telldir __P((DIR *)); +extern void _reclaim_telldir (DIR *); /* * close a directory. diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c index cb137aa57f..e280568313 100644 --- a/lib/libc/gen/disklabel.c +++ b/lib/libc/gen/disklabel.c @@ -32,7 +32,7 @@ * * @(#)disklabel.c 8.2 (Berkeley) 5/3/95 * $FreeBSD: src/lib/libc/gen/disklabel.c,v 1.9.2.1 2001/03/05 08:40:47 obrien Exp $ - * $DragonFly: src/lib/libc/gen/disklabel.c,v 1.3 2003/08/08 04:18:33 dillon Exp $ + * $DragonFly: src/lib/libc/gen/disklabel.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -48,7 +48,7 @@ #include #include -static int gettype __P((char *, char **)); +static int gettype (char *, char **); struct disklabel * getdiskbyname(name) diff --git a/lib/libc/gen/disktab.c b/lib/libc/gen/disktab.c index a0df4d5e9f..ab85b8ecd7 100644 --- a/lib/libc/gen/disktab.c +++ b/lib/libc/gen/disktab.c @@ -32,7 +32,7 @@ * * @(#)disklabel.c 8.2 (Berkeley) 5/3/95 * $FreeBSD: src/lib/libc/gen/disklabel.c,v 1.9.2.1 2001/03/05 08:40:47 obrien Exp $ - * $DragonFly: src/lib/libc/gen/disktab.c,v 1.3 2003/08/08 04:18:33 dillon Exp $ + * $DragonFly: src/lib/libc/gen/disktab.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -48,7 +48,7 @@ #include #include -static int gettype __P((char *, char **)); +static int gettype (char *, char **); struct disklabel * getdiskbyname(name) diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c index c886265eae..1c22de7aa6 100644 --- a/lib/libc/gen/fnmatch.c +++ b/lib/libc/gen/fnmatch.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)fnmatch.c 8.2 (Berkeley) 4/16/94 - * $DragonFly: src/lib/libc/gen/fnmatch.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libc/gen/fnmatch.c,v 1.4 2003/11/12 20:21:23 eirikn Exp $ */ /* @@ -55,7 +55,7 @@ #define RANGE_NOMATCH 0 #define RANGE_ERROR (-1) -static int rangematch __P((const char *, char, int, char **)); +static int rangematch (const char *, char, int, char **); int fnmatch(pattern, string, flags) diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c index acf12184f0..e4e0b29f59 100644 --- a/lib/libc/gen/fstab.c +++ b/lib/libc/gen/fstab.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/fstab.c,v 1.8 2000/01/27 23:06:15 jasone Exp $ - * $DragonFly: src/lib/libc/gen/fstab.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/fstab.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)fstab.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gen/fstab.c,v 1.8 2000/01/27 23:06:15 jasone Exp $ @@ -53,9 +53,9 @@ static FILE *_fs_fp; static struct fstab _fs_fstab; static int LineNo = 0; -static void error __P((int)); -static void fixfsfile __P((void)); -static int fstabscan __P((void)); +static void error (int); +static void fixfsfile (void); +static int fstabscan (void); static void fixfsfile() diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index dac7cfeeaf..897b04e693 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -33,7 +33,7 @@ * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $ * * $FreeBSD: src/lib/libc/gen/fts.c,v 1.14.2.4 2001/06/01 22:00:34 kris Exp $ - * $DragonFly: src/lib/libc/gen/fts.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/fts.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)fts.c 8.6 (Berkeley) 8/14/94 * $FreeBSD: src/lib/libc/gen/fts.c,v 1.14.2.4 2001/06/01 22:00:34 kris Exp $ @@ -50,16 +50,16 @@ #include #include -static FTSENT *fts_alloc __P((FTS *, char *, int)); -static FTSENT *fts_build __P((FTS *, int)); -static void fts_lfree __P((FTSENT *)); -static void fts_load __P((FTS *, FTSENT *)); -static size_t fts_maxarglen __P((char * const *)); -static void fts_padjust __P((FTS *, FTSENT *)); -static int fts_palloc __P((FTS *, size_t)); -static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); -static u_short fts_stat __P((FTS *, FTSENT *, int)); -static int fts_safe_changedir __P((FTS *, FTSENT *, int, char *)); +static FTSENT *fts_alloc (FTS *, char *, int); +static FTSENT *fts_build (FTS *, int); +static void fts_lfree (FTSENT *); +static void fts_load (FTS *, FTSENT *); +static size_t fts_maxarglen (char * const *); +static void fts_padjust (FTS *, FTSENT *); +static int fts_palloc (FTS *, size_t); +static FTSENT *fts_sort (FTS *, FTSENT *, int); +static u_short fts_stat (FTS *, FTSENT *, int); +static int fts_safe_changedir (FTS *, FTSENT *, int, char *); #define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) @@ -78,7 +78,7 @@ FTS * fts_open(argv, options, compar) char * const *argv; register int options; - int (*compar) __P((const FTSENT **, const FTSENT **)); + int (*compar) (const FTSENT **, const FTSENT **); { register FTS *sp; register FTSENT *p, *root; diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c index d269e2e04d..6f294182aa 100644 --- a/lib/libc/gen/getcap.c +++ b/lib/libc/gen/getcap.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/getcap.c,v 1.11.2.2 2001/01/15 06:48:09 gad Exp $ - * $DragonFly: src/lib/libc/gen/getcap.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/getcap.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)getcap.c 8.3 (Berkeley) 3/25/94 */ @@ -65,9 +65,9 @@ static size_t topreclen; /* toprec length */ static char *toprec; /* Additional record specified by cgetset() */ static int gottoprec; /* Flag indicating retrieval of toprecord */ -static int cdbget __P((DB *, char **, char *)); -static int getent __P((char **, u_int *, char **, int, char *, int, char *)); -static int nfcmp __P((char *, char *)); +static int cdbget (DB *, char **, char *); +static int getent (char **, u_int *, char **, int, char *, int, char *); +static int nfcmp (char *, char *); /* * Cgetset() allows the addition of a user specified buffer to be added diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index c0a1921f81..6159cd5fd0 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -32,7 +32,7 @@ * * @(#)getpwent.c 8.2 (Berkeley) 4/27/95 * $FreeBSD: src/lib/libc/gen/getpwent.c,v 1.53.2.2 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libc/gen/getpwent.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/getpwent.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -49,9 +49,9 @@ #include #include -extern void setnetgrent __P(( char * )); -extern int getnetgrent __P(( char **, char **, char ** )); -extern int innetgr __P(( const char *, const char *, const char *, const char * )); +extern void setnetgrent ( char * ); +extern int getnetgrent ( char **, char **, char ** ); +extern int innetgr ( const char *, const char *, const char *, const char * ); /* * The lookup techniques and data extraction code here must be kept @@ -79,16 +79,16 @@ static char _ypnam[YPMAXRECORD]; #define YP_HAVE_NONE 0 static int _gotmaster; static char *_pw_yp_domain; -static inline int unwind __P(( char * )); -static void _ypinitdb __P(( void )); -static int _havemaster __P((char *)); -static int _getyppass __P((struct passwd *, const char *, const char * )); -static int _nextyppass __P((struct passwd *)); -static inline int lookup __P((const char *)); -static inline void store __P((const char *)); -static inline int ingr __P((const char *, const char*)); -static inline int verf __P((const char *)); -static char * _get_adjunct_pw __P((const char *)); +static inline int unwind ( char * ); +static void _ypinitdb ( void ); +static int _havemaster (char *); +static int _getyppass (struct passwd *, const char *, const char * ); +static int _nextyppass (struct passwd *); +static inline int lookup (const char *); +static inline void store (const char *); +static inline int ingr (const char *, const char*); +static inline int verf (const char *); +static char * _get_adjunct_pw (const char *); #endif static int __hashpw(DBT *); static int __initdb(void); diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c index 9f7a748c77..ed418ab84a 100644 --- a/lib/libc/gen/getttyent.c +++ b/lib/libc/gen/getttyent.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/getttyent.c,v 1.11 1999/11/04 04:16:27 ache Exp $ - * $DragonFly: src/lib/libc/gen/getttyent.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/getttyent.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)getttyent.c 8.1 (Berkeley) 6/4/93 */ @@ -49,8 +49,8 @@ static char *line; #define MALLOCCHUNK 100 -static char *skip __P((char *)); -static char *value __P((char *)); +static char *skip (char *); +static char *value (char *); struct ttyent * getttynam(tty) diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c index d5ce5a7254..5f930bbdca 100644 --- a/lib/libc/gen/getusershell.c +++ b/lib/libc/gen/getusershell.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/getusershell.c,v 1.3.2.1 2001/03/05 09:17:52 obrien Exp $ - * $DragonFly: src/lib/libc/gen/getusershell.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/getusershell.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)getusershell.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gen/getusershell.c,v 1.3.2.1 2001/03/05 09:17:52 obrien Exp $ @@ -54,7 +54,7 @@ static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; static char **curshell, **shells, *strings; -static char **initshells __P((void)); +static char **initshells (void); /* * Get a list of shells from _PATH_SHELLS, if it exists. diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c index 4e7b1814ee..46f2e310dc 100644 --- a/lib/libc/gen/nlist.c +++ b/lib/libc/gen/nlist.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/nlist.c,v 1.12.2.1 2001/07/11 23:59:09 obrien Exp $ - * $DragonFly: src/lib/libc/gen/nlist.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/nlist.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)nlist.c 8.1 (Berkeley) 6/4/93 */ @@ -55,9 +55,9 @@ #include #endif -int __fdnlist __P((int, struct nlist *)); -int __aout_fdnlist __P((int, struct nlist *)); -int __elf_fdnlist __P((int, struct nlist *)); +int __fdnlist (int, struct nlist *); +int __aout_fdnlist (int, struct nlist *); +int __elf_fdnlist (int, struct nlist *); int nlist(name, list) @@ -75,7 +75,7 @@ nlist(name, list) } static struct nlist_handlers { - int (*fn) __P((int fd, struct nlist *list)); + int (*fn) (int fd, struct nlist *list); } nlist_fn[] = { #ifdef _NLIST_DO_AOUT { __aout_fdnlist }, @@ -199,7 +199,7 @@ __aout_fdnlist(fd, list) #endif #ifdef _NLIST_DO_ELF -static void elf_sym_to_nlist __P((struct nlist *, Elf_Sym *, Elf_Shdr *, int)); +static void elf_sym_to_nlist (struct nlist *, Elf_Sym *, Elf_Shdr *, int); /* * __elf_is_okay__ - Determine if ehdr really diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h index 702f44985d..62ee06fa53 100644 --- a/lib/libc/gen/rand48.h +++ b/lib/libc/gen/rand48.h @@ -10,7 +10,7 @@ * of any kind. I shall in no event be liable for anything that happens * to anyone/anything when using this software. * - * $DragonFly: src/lib/libc/gen/rand48.h,v 1.2 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libc/gen/rand48.h,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #ifndef _RAND48_H_ @@ -19,7 +19,7 @@ #include #include -void _dorand48 __P((unsigned short[3])); +void _dorand48 (unsigned short[3]); #define RAND48_SEED_0 (0x330e) #define RAND48_SEED_1 (0xabcd) diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c index f19d81920b..666c2a3019 100644 --- a/lib/libc/gen/rewinddir.c +++ b/lib/libc/gen/rewinddir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/rewinddir.c,v 1.2.8.1 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libc/gen/rewinddir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/rewinddir.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)rewinddir.c 8.1 (Berkeley) 6/8/93 */ @@ -39,7 +39,7 @@ #include #include -extern void _seekdir __P(( DIR *, long )); +extern void _seekdir ( DIR *, long ); void rewinddir(dirp) diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index 59d685fb8e..ab36edfc73 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/scandir.c,v 1.5.6.1 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libc/gen/scandir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/scandir.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)scandir.c 8.3 (Berkeley) 1/2/94 */ @@ -64,8 +64,8 @@ int scandir(dirname, namelist, select, dcomp) const char *dirname; struct dirent ***namelist; - int (*select) __P((struct dirent *)); - int (*dcomp) __P((const void *, const void *)); + int (*select) (struct dirent *); + int (*dcomp) (const void *, const void *); { register struct dirent *d, *p, **names = NULL; register size_t nitems = 0; diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c index 2a175299ea..c099d9cafb 100644 --- a/lib/libc/gen/seekdir.c +++ b/lib/libc/gen/seekdir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/seekdir.c,v 1.2.8.1 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libc/gen/seekdir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/seekdir.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)seekdir.c 8.1 (Berkeley) 6/4/93 */ @@ -39,7 +39,7 @@ #include #include -extern void _seekdir __P(( DIR *, long )); +extern void _seekdir ( DIR *, long ); /* * Seek to an entry in a directory. diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c index 7f7d853274..b0bf65acf2 100644 --- a/lib/libc/gen/setmode.c +++ b/lib/libc/gen/setmode.c @@ -35,7 +35,7 @@ * * @(#)setmode.c 8.2 (Berkeley) 3/25/94 * $FreeBSD: src/lib/libc/gen/setmode.c,v 1.5.2.1 2001/03/05 09:34:10 obrien Exp $ - * $DragonFly: src/lib/libc/gen/setmode.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/setmode.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -65,10 +65,10 @@ typedef struct bitcmd { #define CMD2_OBITS 0x08 #define CMD2_UBITS 0x10 -static BITCMD *addcmd __P((BITCMD *, int, int, int, u_int)); -static void compress_mode __P((BITCMD *)); +static BITCMD *addcmd (BITCMD *, int, int, int, u_int); +static void compress_mode (BITCMD *); #ifdef SETMODE_DEBUG -static void dumpmode __P((BITCMD *)); +static void dumpmode (BITCMD *); #endif /* diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c index 7f3c75dd6b..d3a8d58fe9 100644 --- a/lib/libc/gen/syslog.c +++ b/lib/libc/gen/syslog.c @@ -32,7 +32,7 @@ * * @(#)syslog.c 8.5 (Berkeley) 4/29/95 * $FreeBSD: src/lib/libc/gen/syslog.c,v 1.21.2.3 2002/11/18 11:49:55 ru Exp $ - * $DragonFly: src/lib/libc/gen/syslog.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/syslog.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ */ #include @@ -65,8 +65,8 @@ static int LogFacility = LOG_USER; /* default facility code */ static int LogMask = 0xff; /* mask of priorities to be logged */ extern char *__progname; /* Program name, from crt0. */ -static void disconnectlog __P((void)); /* disconnect from syslogd */ -static void connectlog __P((void)); /* (re)connect to syslogd */ +static void disconnectlog (void); /* disconnect from syslogd */ +static void connectlog (void); /* (re)connect to syslogd */ /* * Format of the magic cookie passed through the stdio hook diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c index 035a7f42a3..bd903b16dd 100644 --- a/lib/libc/gen/ttyname.c +++ b/lib/libc/gen/ttyname.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/ttyname.c,v 1.10.6.2 2002/10/15 19:46:46 fjoe Exp $ - * $DragonFly: src/lib/libc/gen/ttyname.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/ttyname.c,v 1.3 2003/11/12 20:21:23 eirikn Exp $ * * @(#)ttyname.c 8.2 (Berkeley) 1/27/94 */ @@ -155,7 +155,7 @@ ttyname_r(int fd, char *buf, size_t len) } #else static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; -static char *oldttyname __P((int, struct stat *)); +static char *oldttyname (int, struct stat *); char * ttyname(fd) diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c index df8858ad99..f7cc5428a8 100644 --- a/lib/libc/gmon/gmon.c +++ b/lib/libc/gmon/gmon.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gmon/gmon.c,v 1.8 2000/01/27 23:06:25 jasone Exp $ - * $DragonFly: src/lib/libc/gmon/gmon.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gmon/gmon.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * @(#)gmon.c 8.1 (Berkeley) 6/4/93 */ @@ -63,8 +63,8 @@ static int s_scale; #define ERR(s) _write(2, s, sizeof(s)) -void moncontrol __P((int)); -static int hertz __P((void)); +void moncontrol (int); +static int hertz (void); void monstartup(lowpc, highpc) diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c index b5f1cc4c06..782e75afbd 100644 --- a/lib/libc/gmon/mcount.c +++ b/lib/libc/gmon/mcount.c @@ -32,7 +32,7 @@ * * @(#)mcount.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gmon/mcount.c,v 1.17 1999/12/29 05:04:13 peter Exp $ - * $DragonFly: src/lib/libc/gmon/mcount.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gmon/mcount.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -42,10 +42,10 @@ #include #include #include -void bintr __P((void)); -void btrap __P((void)); -void eintr __P((void)); -void user __P((void)); +void bintr (void); +void btrap (void); +void eintr (void); +void user (void); #endif /* diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h index c2a8149537..047f41140d 100644 --- a/lib/libc/include/spinlock.h +++ b/lib/libc/include/spinlock.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.4 1999/08/27 23:59:48 peter Exp $ - * $DragonFly: src/lib/libc/include/spinlock.h,v 1.2 2003/06/17 04:26:43 dillon Exp $ + * $DragonFly: src/lib/libc/include/spinlock.h,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * Lock definitions used in both libc and libpthread. * @@ -64,9 +64,9 @@ typedef struct { * Thread function prototype definitions: */ __BEGIN_DECLS -long _atomic_lock __P((volatile long *)); -void _spinlock __P((spinlock_t *)); -void _spinlock_debug __P((spinlock_t *, char *, int)); +long _atomic_lock (volatile long *); +void _spinlock (spinlock_t *); +void _spinlock_debug (spinlock_t *, char *, int); __END_DECLS #endif /* _SPINLOCK_H_ */ diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c index 885a411f02..364cc27bb4 100644 --- a/lib/libc/locale/big5.c +++ b/lib/libc/locale/big5.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/big5.c,v 1.3.2.2 2001/03/05 10:02:54 obrien Exp $ - * $DragonFly: src/lib/libc/locale/Attic/big5.c,v 1.2 2003/06/17 04:26:43 dillon Exp $ + * $DragonFly: src/lib/libc/locale/Attic/big5.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * @(#)big5.c 8.1 (Berkeley) 6/4/93 */ @@ -45,8 +45,8 @@ #include #include -rune_t _BIG5_sgetrune __P((const char *, size_t, char const **)); -int _BIG5_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _BIG5_sgetrune (const char *, size_t, char const **); +int _BIG5_sputrune (rune_t, char *, size_t, char **); int _BIG5_init(rl) diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c index ce4c164f6e..2f74a0e366 100644 --- a/lib/libc/locale/mskanji.c +++ b/lib/libc/locale/mskanji.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/mskanji.c,v 1.2.8.2 2001/03/05 10:22:45 obrien Exp $ - * $DragonFly: src/lib/libc/locale/Attic/mskanji.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/locale/Attic/mskanji.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * @(#)mskanji.c 1.0 (Phase One) 5/5/95 */ @@ -43,8 +43,8 @@ #include #include -rune_t _MSKanji_sgetrune __P((const char *, size_t, char const **)); -int _MSKanji_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _MSKanji_sgetrune (const char *, size_t, char const **); +int _MSKanji_sputrune (rune_t, char *, size_t, char **); int _MSKanji_init(rl) diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c index 1e9d0edacb..fba1ec56d6 100644 --- a/lib/libc/locale/none.c +++ b/lib/libc/locale/none.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/none.c,v 1.2.8.1 2001/03/05 10:25:03 obrien Exp $ - * $DragonFly: src/lib/libc/locale/Attic/none.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/locale/Attic/none.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * @(#)none.c 8.1 (Berkeley) 6/4/93 */ @@ -44,8 +44,8 @@ #include #include -rune_t _none_sgetrune __P((const char *, size_t, char const **)); -int _none_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _none_sgetrune (const char *, size_t, char const **); +int _none_sputrune (rune_t, char *, size_t, char **); int _none_init(rl) diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c index 450dc4f89b..430473e307 100644 --- a/lib/libc/locale/table.c +++ b/lib/libc/locale/table.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/table.c,v 1.13.2.1 2000/06/04 21:47:39 ache Exp $ - * $DragonFly: src/lib/libc/locale/Attic/table.c,v 1.3 2003/11/09 02:34:01 dillon Exp $ + * $DragonFly: src/lib/libc/locale/Attic/table.c,v 1.4 2003/11/12 20:21:24 eirikn Exp $ * * @(#)table.c 8.1 (Berkeley) 6/27/93 */ @@ -43,9 +43,9 @@ #include #include -extern rune_t _none_sgetrune __P((const char *, size_t, char const **)); -extern int _none_sputrune __P((rune_t, char *, size_t, char **)); -extern int _none_init __P((char *, char **)); +extern rune_t _none_sgetrune (const char *, size_t, char const **); +extern int _none_sputrune (rune_t, char *, size_t, char **); +extern int _none_init (char *, char **); _RuneLocale _DefaultRuneLocale = { _RUNE_MAGIC_1, diff --git a/lib/libc/locale/utf2.c b/lib/libc/locale/utf2.c index af51a41cc2..052f039876 100644 --- a/lib/libc/locale/utf2.c +++ b/lib/libc/locale/utf2.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/utf2.c,v 1.3.2.2 2001/03/05 10:27:18 obrien Exp $ - * $DragonFly: src/lib/libc/locale/Attic/utf2.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/locale/Attic/utf2.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * @(#)utf2.c 8.1 (Berkeley) 6/4/93 */ @@ -44,8 +44,8 @@ #include #include -rune_t _UTF2_sgetrune __P((const char *, size_t, char const **)); -int _UTF2_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _UTF2_sgetrune (const char *, size_t, char const **); +int _UTF2_sputrune (rune_t, char *, size_t, char **); static int _utf_count[16] = { 1, 1, 1, 1, 1, 1, 1, 1, diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 5158bc4186..dae9fc1134 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.9.2.14 2002/11/08 17:49:31 ume Exp $ */ -/* $DragonFly: src/lib/libc/net/getaddrinfo.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ */ +/* $DragonFly: src/lib/libc/net/getaddrinfo.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ /* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */ /* @@ -184,44 +184,44 @@ struct res_target { int n; /* result length */ }; -static int str_isnumber __P((const char *)); -static int explore_fqdn __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int explore_null __P((const struct addrinfo *, - const char *, struct addrinfo **)); -static int explore_numeric __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int explore_numeric_scope __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int get_canonname __P((const struct addrinfo *, - struct addrinfo *, const char *)); -static struct addrinfo *get_ai __P((const struct addrinfo *, - const struct afd *, const char *)); -static int get_portmatch __P((const struct addrinfo *, const char *)); -static int get_port __P((struct addrinfo *, const char *, int)); -static const struct afd *find_afd __P((int)); -static int addrconfig __P((struct addrinfo *)); +static int str_isnumber (const char *); +static int explore_fqdn (const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int explore_null (const struct addrinfo *, + const char *, struct addrinfo **); +static int explore_numeric (const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int explore_numeric_scope (const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int get_canonname (const struct addrinfo *, + struct addrinfo *, const char *); +static struct addrinfo *get_ai (const struct addrinfo *, + const struct afd *, const char *); +static int get_portmatch (const struct addrinfo *, const char *); +static int get_port (struct addrinfo *, const char *, int); +static const struct afd *find_afd (int); +static int addrconfig (struct addrinfo *); #ifdef INET6 -static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *, u_int32_t *)); +static int ip6_str2scopeid (char *, struct sockaddr_in6 *, u_int32_t *); #endif -static struct addrinfo *getanswer __P((const querybuf *, int, const char *, - int, const struct addrinfo *)); -static int _dns_getaddrinfo __P((const struct addrinfo *, const char *, - struct addrinfo **)); -static struct addrinfo *_gethtent __P((FILE *fp, const char *, - const struct addrinfo *)); -static int _files_getaddrinfo __P((const struct addrinfo *, const char *, - struct addrinfo **)); +static struct addrinfo *getanswer (const querybuf *, int, const char *, + int, const struct addrinfo *); +static int _dns_getaddrinfo (const struct addrinfo *, const char *, + struct addrinfo **); +static struct addrinfo *_gethtent (FILE *fp, const char *, + const struct addrinfo *); +static int _files_getaddrinfo (const struct addrinfo *, const char *, + struct addrinfo **); #ifdef YP -static int _nis_getaddrinfo __P((const struct addrinfo *, const char *, - struct addrinfo **)); +static int _nis_getaddrinfo (const struct addrinfo *, const char *, + struct addrinfo **); #endif -static int res_queryN __P((const char *, struct res_target *)); -static int res_searchN __P((const char *, struct res_target *)); -static int res_querydomainN __P((const char *, const char *, - struct res_target *)); +static int res_queryN (const char *, struct res_target *); +static int res_searchN (const char *, struct res_target *); +static int res_querydomainN (const char *, const char *, + struct res_target *); static char *ai_errlist[] = { "Success", @@ -1295,7 +1295,7 @@ getanswer(answer, anslen, qname, qtype, pai) int type, class, ancount, qdcount; int haveanswer, had_error; char tbuf[MAXDNAME]; - int (*name_ok) __P((const char *)); + int (*name_ok) (const char *); char hostbuf[8*1024]; memset(&sentinel, 0, sizeof(sentinel)); @@ -1759,7 +1759,7 @@ free: /* resolver logic */ -extern const char *__hostalias __P((const char *)); +extern const char *__hostalias (const char *); extern int h_errno; /* diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c index e67c959afc..dbac3c2453 100644 --- a/lib/libc/net/gethostbydns.c +++ b/lib/libc/net/gethostbydns.c @@ -55,7 +55,7 @@ * @(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93 * $From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $ * $FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.27.2.5 2002/11/02 18:54:57 ume Exp $ - * $DragonFly: src/lib/libc/net/gethostbydns.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/gethostbydns.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -93,7 +93,7 @@ static char hostbuf[8*1024]; static u_char host_addr[16]; /* IPv4 or IPv6 */ #ifdef RESOLVSORT -static void addrsort __P((char **, int)); +static void addrsort (char **, int); #endif #define MAXPACKET (64*1024) @@ -162,7 +162,7 @@ gethostanswer(answer, anslen, qname, qtype) int toobig = 0; char tbuf[MAXDNAME]; const char *tname; - int (*name_ok) __P((const char *)); + int (*name_ok) (const char *); tname = qname; host.h_name = NULL; diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index ad59ac1c0a..a14736bfa9 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.4.2.5 2002/07/31 10:11:09 ume Exp $ */ -/* $DragonFly: src/lib/libc/net/getnameinfo.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ */ +/* $DragonFly: src/lib/libc/net/getnameinfo.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ /* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */ /* @@ -79,9 +79,9 @@ struct sockinet { }; #ifdef INET6 -static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *, - size_t, int)); -static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int)); +static int ip6_parsenumeric (const struct sockaddr *, const char *, char *, + size_t, int); +static int ip6_sa2str (const struct sockaddr_in6 *, char *, size_t, int); #endif int diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c index 4e1c3a9b64..ab69a38007 100644 --- a/lib/libc/net/getservent.c +++ b/lib/libc/net/getservent.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)getservent.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libc/net/getservent.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libc/net/getservent.c,v 1.4 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -45,7 +45,7 @@ #include #include static int serv_stepping_yp = 0; -extern int _yp_check __P(( char ** )); +extern int _yp_check ( char ** ); #endif diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c index 5100d2a5ba..e85df69be7 100644 --- a/lib/libc/net/inet_net_ntop.c +++ b/lib/libc/net/inet_net_ntop.c @@ -15,7 +15,7 @@ * SOFTWARE. * * $FreeBSD: src/lib/libc/net/inet_net_ntop.c,v 1.5 1999/08/28 00:00:10 peter Exp $ - * $DragonFly: src/lib/libc/net/inet_net_ntop.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/inet_net_ntop.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -34,8 +34,8 @@ # define SPRINTF(x) ((size_t)sprintf x) #endif -static char * inet_net_ntop_ipv4 __P((const u_char *src, int bits, - char *dst, size_t size)); +static char * inet_net_ntop_ipv4 (const u_char *src, int bits, + char *dst, size_t size); /* * char * diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c index 19419178eb..286f8d6d16 100644 --- a/lib/libc/net/inet_net_pton.c +++ b/lib/libc/net/inet_net_pton.c @@ -16,7 +16,7 @@ * * $From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $ * $FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.6 1999/08/28 00:00:10 peter Exp $ - * $DragonFly: src/lib/libc/net/inet_net_pton.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/inet_net_pton.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -37,8 +37,8 @@ # define SPRINTF(x) ((size_t)sprintf x) #endif -static int inet_net_pton_ipv4 __P((const char *src, u_char *dst, - size_t size)); +static int inet_net_pton_ipv4 (const char *src, u_char *dst, + size_t size); /* * static int diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c index e6ff6d7f21..2d35d58899 100644 --- a/lib/libc/net/inet_ntop.c +++ b/lib/libc/net/inet_ntop.c @@ -14,7 +14,7 @@ * SOFTWARE. * * $FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.6.2.2 2002/12/16 15:19:35 robert Exp $ - * $DragonFly: src/lib/libc/net/inet_ntop.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/inet_ntop.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -32,8 +32,8 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size)); -static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size)); +static const char *inet_ntop4 (const u_char *src, char *dst, size_t size); +static const char *inet_ntop6 (const u_char *src, char *dst, size_t size); /* char * * inet_ntop(af, src, dst, size) diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c index 3cdb714975..568066ef78 100644 --- a/lib/libc/net/inet_pton.c +++ b/lib/libc/net/inet_pton.c @@ -16,7 +16,7 @@ * SOFTWARE. * * $FreeBSD: src/lib/libc/net/inet_pton.c,v 1.6.2.1 2002/04/28 05:40:24 suz Exp $ - * $DragonFly: src/lib/libc/net/inet_pton.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/inet_pton.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ #include @@ -33,8 +33,8 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static int inet_pton4 __P((const char *src, u_char *dst)); -static int inet_pton6 __P((const char *src, u_char *dst)); +static int inet_pton4 (const char *src, u_char *dst); +static int inet_pton6 (const char *src, u_char *dst); /* int * inet_pton(af, src, dst) diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c index 9f4c7bde1c..5d72799b24 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/name6.c,v 1.6.2.9 2002/11/02 18:54:57 ume Exp $ */ -/* $DragonFly: src/lib/libc/net/name6.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ */ +/* $DragonFly: src/lib/libc/net/name6.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ /* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */ /* @@ -1025,8 +1025,8 @@ typedef union { u_char buf[MAXPACKET]; } querybuf; -static struct hostent *getanswer __P((const querybuf *, int, const char *, - int, struct hostent *, int *)); +static struct hostent *getanswer (const querybuf *, int, const char *, + int, struct hostent *, int *); /* * we don't need to take care about sorting, nor IPv4 mapped address here. @@ -1049,7 +1049,7 @@ getanswer(answer, anslen, qname, qtype, template, errp) int haveanswer, had_error; char tbuf[MAXDNAME]; const char *tname; - int (*name_ok) __P((const char *)); + int (*name_ok) (const char *); static char *h_addr_ptrs[MAXADDRS + 1]; static char *host_aliases[MAXALIASES]; static char hostbuf[8*1024]; diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index e751f455c3..1e740646aa 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/net/rcmd.c,v 1.23.2.7 2002/08/26 16:17:49 jdp Exp $ - * $DragonFly: src/lib/libc/net/rcmd.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/rcmd.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ * * @(#)rcmd.c 8.3 (Berkeley) 3/26/94 */ @@ -65,17 +65,17 @@ #define NI_WITHSCOPEID 0 #endif -extern int innetgr __P(( const char *, const char *, const char *, const char * )); +extern int innetgr ( const char *, const char *, const char *, const char * ); #define max(a, b) ((a > b) ? a : b) -int __ivaliduser __P((FILE *, u_int32_t, const char *, const char *)); -int __ivaliduser_af __P((FILE *,const void *, const char *, const char *, - int, int)); -int __ivaliduser_sa __P((FILE *, const struct sockaddr *, socklen_t, - const char *,const char *)); -static int __icheckhost __P((const struct sockaddr *, socklen_t, - const char *)); +int __ivaliduser (FILE *, u_int32_t, const char *, const char *); +int __ivaliduser_af (FILE *,const void *, const char *, const char *, + int, int); +int __ivaliduser_sa (FILE *, const struct sockaddr *, socklen_t, + const char *,const char *); +static int __icheckhost (const struct sockaddr *, socklen_t, + const char *); char paddr[NI_MAXHOST]; diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c index feda1080bb..9ab18d446a 100644 --- a/lib/libc/net/res_init.c +++ b/lib/libc/net/res_init.c @@ -33,7 +33,7 @@ * @(#)res_init.c 8.1 (Berkeley) 6/7/93 * $From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $ * $FreeBSD: src/lib/libc/net/res_init.c,v 1.19.2.7 2002/02/04 18:30:55 ume Exp $ - * $DragonFly: src/lib/libc/net/res_init.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/res_init.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ /* @@ -90,12 +90,12 @@ #include "res_config.h" -static void res_setoptions __P((char *, char *)); +static void res_setoptions (char *, char *); #ifdef RESOLVSORT static const char sort_mask[] = "/&"; #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL) -static u_int32_t net_mask __P((struct in_addr)); +static u_int32_t net_mask (struct in_addr); #endif #if !defined(isascii) /* XXX - could be a function */ diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index 725ce5b141..79a79970f2 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -33,7 +33,7 @@ * @(#)res_send.c 8.1 (Berkeley) 6/4/93 * $From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $ * $FreeBSD: src/lib/libc/net/res_send.c,v 1.31.2.9 2002/04/11 17:30:24 ume Exp $ - * $DragonFly: src/lib/libc/net/res_send.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/net/res_send.c,v 1.3 2003/11/12 20:21:24 eirikn Exp $ */ /* @@ -121,8 +121,8 @@ static res_send_rhook Rhook = NULL; } else {} static char abuf[NI_MAXHOST]; static char pbuf[NI_MAXSERV]; -static void Aerror __P((FILE *, char *, int, struct sockaddr *)); -static void Perror __P((FILE *, char *, int)); +static void Aerror (FILE *, char *, int, struct sockaddr *); +static void Perror (FILE *, char *, int); static void Aerror(file, string, error, address) @@ -177,7 +177,7 @@ res_send_setrhook(hook) Rhook = hook; } -static struct sockaddr * get_nsaddr __P((size_t)); +static struct sockaddr * get_nsaddr (size_t); /* * pick appropriate nsaddr_list for use. see res_init() for initialization. diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h index 3085dcb7fb..2c3448ac56 100644 --- a/lib/libc/quad/quad.h +++ b/lib/libc/quad/quad.h @@ -36,7 +36,7 @@ * * @(#)quad.h 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/quad/quad.h,v 1.5 1999/08/28 00:00:29 peter Exp $ - * $DragonFly: src/lib/libc/quad/quad.h,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/quad/quad.h,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* @@ -97,11 +97,11 @@ union uu { #define LHALF(x) ((x) & ((1 << HALF_BITS) - 1)) #define LHUP(x) ((x) << HALF_BITS) -quad_t __divdi3 __P((quad_t a, quad_t b)); -quad_t __moddi3 __P((quad_t a, quad_t b)); -u_quad_t __qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem)); -u_quad_t __udivdi3 __P((u_quad_t a, u_quad_t b)); -u_quad_t __umoddi3 __P((u_quad_t a, u_quad_t b)); +quad_t __divdi3 (quad_t a, quad_t b); +quad_t __moddi3 (quad_t a, quad_t b); +u_quad_t __qdivrem (u_quad_t u, u_quad_t v, u_quad_t *rem); +u_quad_t __udivdi3 (u_quad_t a, u_quad_t b); +u_quad_t __umoddi3 (u_quad_t a, u_quad_t b); /* * XXX diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c index fd15847096..f77d03b79c 100644 --- a/lib/libc/regex/engine.c +++ b/lib/libc/regex/engine.c @@ -37,7 +37,7 @@ * @(#)engine.c 8.5 (Berkeley) 3/20/94 * * $FreeBSD: src/lib/libc/regex/engine.c,v 1.5.8.1 2000/07/31 06:30:37 dcs Exp $ - * $DragonFly: src/lib/libc/regex/engine.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/regex/engine.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* @@ -93,12 +93,12 @@ extern "C" { #endif /* === engine.c === */ -static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags)); -static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev)); -static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft)); +static int matcher (struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags); +static char *dissect (struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static char *backref (struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev); +static char *fast (struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static char *slow (struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static states step (struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft); #define BOL (OUT+1) #define EOL (BOL+1) #define BOLEOL (BOL+2) @@ -109,13 +109,13 @@ static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, #define NONCHAR(c) ((c) > CHAR_MAX) #define NNONCHAR (CODEMAX-CHAR_MAX) #ifdef REDEBUG -static void print __P((struct match *m, char *caption, states st, int ch, FILE *d)); +static void print (struct match *m, char *caption, states st, int ch, FILE *d); #endif #ifdef REDEBUG -static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst)); +static void at (struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst); #endif #ifdef REDEBUG -static char *pchar __P((int ch)); +static char *pchar (int ch); #endif #ifdef __cplusplus diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index b904bb69a2..59fef853ef 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -37,7 +37,7 @@ * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 * * $FreeBSD: src/lib/libc/regex/regcomp.c,v 1.13.2.2 2002/03/20 13:13:15 dcs Exp $ - * $DragonFly: src/lib/libc/regex/regcomp.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/regex/regcomp.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ * * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 */ @@ -82,51 +82,51 @@ extern "C" { #endif /* === regcomp.c === */ -static void p_ere __P((struct parse *p, int stop)); -static void p_ere_exp __P((struct parse *p)); -static void p_str __P((struct parse *p)); -static void p_bre __P((struct parse *p, int end1, int end2)); -static int p_simp_re __P((struct parse *p, int starordinary)); -static int p_count __P((struct parse *p)); -static void p_bracket __P((struct parse *p)); -static void p_b_term __P((struct parse *p, cset *cs)); -static void p_b_cclass __P((struct parse *p, cset *cs)); -static void p_b_eclass __P((struct parse *p, cset *cs)); -static char p_b_symbol __P((struct parse *p)); -static char p_b_coll_elem __P((struct parse *p, int endc)); -static char othercase __P((int ch)); -static void bothcases __P((struct parse *p, int ch)); -static void ordinary __P((struct parse *p, int ch)); -static void nonnewline __P((struct parse *p)); -static void repeat __P((struct parse *p, sopno start, int from, int to)); -static int seterr __P((struct parse *p, int e)); -static cset *allocset __P((struct parse *p)); -static void freeset __P((struct parse *p, cset *cs)); -static int freezeset __P((struct parse *p, cset *cs)); -static int firstch __P((struct parse *p, cset *cs)); -static int nch __P((struct parse *p, cset *cs)); -static void mcadd __P((struct parse *p, cset *cs, char *cp)); +static void p_ere (struct parse *p, int stop); +static void p_ere_exp (struct parse *p); +static void p_str (struct parse *p); +static void p_bre (struct parse *p, int end1, int end2); +static int p_simp_re (struct parse *p, int starordinary); +static int p_count (struct parse *p); +static void p_bracket (struct parse *p); +static void p_b_term (struct parse *p, cset *cs); +static void p_b_cclass (struct parse *p, cset *cs); +static void p_b_eclass (struct parse *p, cset *cs); +static char p_b_symbol (struct parse *p); +static char p_b_coll_elem (struct parse *p, int endc); +static char othercase (int ch); +static void bothcases (struct parse *p, int ch); +static void ordinary (struct parse *p, int ch); +static void nonnewline (struct parse *p); +static void repeat (struct parse *p, sopno start, int from, int to); +static int seterr (struct parse *p, int e); +static cset *allocset (struct parse *p); +static void freeset (struct parse *p, cset *cs); +static int freezeset (struct parse *p, cset *cs); +static int firstch (struct parse *p, cset *cs); +static int nch (struct parse *p, cset *cs); +static void mcadd (struct parse *p, cset *cs, char *cp); #if used -static void mcsub __P((cset *cs, char *cp)); -static int mcin __P((cset *cs, char *cp)); -static char *mcfind __P((cset *cs, char *cp)); +static void mcsub (cset *cs, char *cp); +static int mcin (cset *cs, char *cp); +static char *mcfind (cset *cs, char *cp); #endif -static void mcinvert __P((struct parse *p, cset *cs)); -static void mccase __P((struct parse *p, cset *cs)); -static int isinsets __P((struct re_guts *g, int c)); -static int samesets __P((struct re_guts *g, int c1, int c2)); -static void categorize __P((struct parse *p, struct re_guts *g)); -static sopno dupl __P((struct parse *p, sopno start, sopno finish)); -static void doemit __P((struct parse *p, sop op, size_t opnd)); -static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos)); -static void dofwd __P((struct parse *p, sopno pos, sop value)); -static void enlarge __P((struct parse *p, sopno size)); -static void stripsnug __P((struct parse *p, struct re_guts *g)); -static void findmust __P((struct parse *p, struct re_guts *g)); -static int altoffset __P((sop *scan, int offset, int mccs)); -static void computejumps __P((struct parse *p, struct re_guts *g)); -static void computematchjumps __P((struct parse *p, struct re_guts *g)); -static sopno pluscount __P((struct parse *p, struct re_guts *g)); +static void mcinvert (struct parse *p, cset *cs); +static void mccase (struct parse *p, cset *cs); +static int isinsets (struct re_guts *g, int c); +static int samesets (struct re_guts *g, int c1, int c2); +static void categorize (struct parse *p, struct re_guts *g); +static sopno dupl (struct parse *p, sopno start, sopno finish); +static void doemit (struct parse *p, sop op, size_t opnd); +static void doinsert (struct parse *p, sop op, size_t opnd, sopno pos); +static void dofwd (struct parse *p, sopno pos, sop value); +static void enlarge (struct parse *p, sopno size); +static void stripsnug (struct parse *p, struct re_guts *g); +static void findmust (struct parse *p, struct re_guts *g); +static int altoffset (sop *scan, int offset, int mccs); +static void computejumps (struct parse *p, struct re_guts *g); +static void computematchjumps (struct parse *p, struct re_guts *g); +static sopno pluscount (struct parse *p, struct re_guts *g); #ifdef __cplusplus } diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c index 13f6b49743..19572d0c1a 100644 --- a/lib/libc/regex/regerror.c +++ b/lib/libc/regex/regerror.c @@ -37,7 +37,7 @@ * @(#)regerror.c 8.4 (Berkeley) 3/20/94 * * @(#)regerror.c 8.4 (Berkeley) 3/20/94 - * $DragonFly: src/lib/libc/regex/regerror.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libc/regex/regerror.c,v 1.4 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -55,7 +55,7 @@ extern "C" { #endif /* === regerror.c === */ -static char *regatoi __P((const regex_t *preg, char *localbuf)); +static char *regatoi (const regex_t *preg, char *localbuf); #ifdef __cplusplus } diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c index 42630adead..ee11bd487c 100644 --- a/lib/libc/rpc/auth_des.c +++ b/lib/libc/rpc/auth_des.c @@ -28,7 +28,7 @@ * * @(#)auth_des.c 2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.3 1999/08/28 00:00:32 peter Exp $ - * $DragonFly: src/lib/libc/rpc/auth_des.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/auth_des.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* * Copyright (c) 1988 by Sun Microsystems, Inc. @@ -50,11 +50,11 @@ #undef NIS #include -extern bool_t __rpc_get_time_offset __P(( struct timeval *, nis_server *, - char *, char **, struct sockaddr_in * )); -extern int rtime __P(( struct sockaddr_in *, struct timeval *, struct timeval *)); -extern bool_t xdr_authdes_cred __P(( XDR *, struct authdes_cred * )); -extern bool_t xdr_authdes_verf __P(( XDR *, struct authdes_verf * )); +extern bool_t __rpc_get_time_offset ( struct timeval *, nis_server *, + char *, char **, struct sockaddr_in * ); +extern int rtime ( struct sockaddr_in *, struct timeval *, struct timeval *); +extern bool_t xdr_authdes_cred ( XDR *, struct authdes_cred * ); +extern bool_t xdr_authdes_verf ( XDR *, struct authdes_verf * ); #define MILLION 1000000L #define RTIME_TIMEOUT 5 /* seconds to wait for sync */ @@ -82,7 +82,7 @@ static struct auth_ops authdes_ops = { authdes_destroy }; #ifdef foo -static bool_t synchronize __P(( struct sockaddr *, struct timeval *)); +static bool_t synchronize ( struct sockaddr *, struct timeval *); #endif /* * This struct is pointed to by the ah_private field of an "AUTH *" diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c index a97d94e94c..573792e388 100644 --- a/lib/libc/rpc/des_crypt.c +++ b/lib/libc/rpc/des_crypt.c @@ -28,7 +28,7 @@ * * @(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.3 1999/08/28 00:00:38 peter Exp $ - * $DragonFly: src/lib/libc/rpc/des_crypt.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/des_crypt.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* * des_crypt.c, DES encryption library routines @@ -39,9 +39,9 @@ #include #include -static int common_crypt __P(( char *, char *, register unsigned, unsigned, struct desparams * )); +static int common_crypt ( char *, char *, register unsigned, unsigned, struct desparams * ); int (*__des_crypt_LOCAL)() = 0; -extern _des_crypt_call __P(( char *, int, struct desparams * )); +extern _des_crypt_call ( char *, int, struct desparams * ); /* * Copy 8 bytes */ diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c index 2d1f4926e4..f522772e9f 100644 --- a/lib/libc/rpc/key_call.c +++ b/lib/libc/rpc/key_call.c @@ -30,7 +30,7 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. * * $FreeBSD: src/lib/libc/rpc/key_call.c,v 1.3 2000/01/27 23:06:39 jasone Exp $ - * $DragonFly: src/lib/libc/rpc/key_call.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/key_call.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #ident "@(#)key_call.c 1.25 94/04/24 SMI" @@ -82,7 +82,7 @@ cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; des_block *(*__key_gendes_LOCAL)() = 0; -static int key_call __P(( u_long, xdrproc_t, char *, xdrproc_t, char * )); +static int key_call ( u_long, xdrproc_t, char *, xdrproc_t, char * ); int key_setsecret(secretkey) diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c index bac21f119e..b5c5891d24 100644 --- a/lib/libc/rpc/netnamer.c +++ b/lib/libc/rpc/netnamer.c @@ -28,7 +28,7 @@ * Mountain View, California 94043 * * $FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.3.6.1 2000/09/20 04:43:11 jkh Exp $ - * $DragonFly: src/lib/libc/rpc/netnamer.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/netnamer.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ * * @(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro */ @@ -57,8 +57,8 @@ static char *OPSYS = "unix"; static char *NETID = "netid.byname"; static char *NETIDFILE = "/etc/netid"; -static int getnetid __P(( char *, char * )); -static int _getgroups __P(( char *, gid_t * )); +static int getnetid ( char *, char * ); +static int _getgroups ( char *, gid_t * ); #ifndef NGROUPS #define NGROUPS 16 diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c index 74130e12ab..c47879a748 100644 --- a/lib/libc/rpc/rtime.c +++ b/lib/libc/rpc/rtime.c @@ -28,7 +28,7 @@ * * @(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/rtime.c,v 1.5 2000/01/27 23:06:41 jasone Exp $ - * $DragonFly: src/lib/libc/rpc/rtime.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/rtime.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* @@ -56,12 +56,12 @@ #include #include -extern int _rpc_dtablesize __P(( void )); +extern int _rpc_dtablesize ( void ); #define NYEARS (unsigned long)(1970 - 1900) #define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4))) -static void do_close __P(( int )); +static void do_close ( int ); int rtime(addrp, timep, timeout) diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c index 8ace5ff3cc..5db97eb2de 100644 --- a/lib/libc/rpc/svc_udp.c +++ b/lib/libc/rpc/svc_udp.c @@ -29,7 +29,7 @@ * @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro * @(#)svc_udp.c 2.2 88/07/29 4.0 RPCSRC * $FreeBSD: src/lib/libc/rpc/svc_udp.c,v 1.13 2000/01/27 23:06:41 jasone Exp $ - * $DragonFly: src/lib/libc/rpc/svc_udp.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/rpc/svc_udp.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* @@ -57,8 +57,8 @@ static enum xprt_stat svcudp_stat(); static bool_t svcudp_getargs(); static bool_t svcudp_freeargs(); static void svcudp_destroy(); -static void cache_set __P((SVCXPRT *, u_long)); -static int cache_get __P((SVCXPRT *, struct rpc_msg *, char **, u_long *)); +static void cache_set (SVCXPRT *, u_long); +static int cache_get (SVCXPRT *, struct rpc_msg *, char **, u_long *); static struct xp_ops svcudp_op = { svcudp_recv, diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c index 8358c3ab7e..9bdb7afd04 100644 --- a/lib/libc/stdio/findfp.c +++ b/lib/libc/stdio/findfp.c @@ -35,7 +35,7 @@ * * @(#)findfp.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/lib/libc/stdio/findfp.c,v 1.7.2.3 2001/08/17 02:56:31 peter Exp $ - * $DragonFly: src/lib/libc/stdio/findfp.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/findfp.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -81,7 +81,7 @@ FILE *__stdinp = &__sF[0]; FILE *__stdoutp = &__sF[1]; FILE *__stderrp = &__sF[2]; -static struct glue * moreglue __P((int)); +static struct glue * moreglue (int); static spinlock_t thread_lock = _SPINLOCK_INITIALIZER; #define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock) diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c index 0098701441..60502a1fe3 100644 --- a/lib/libc/stdio/fseek.c +++ b/lib/libc/stdio/fseek.c @@ -35,7 +35,7 @@ * * @(#)fseek.c 8.3 (Berkeley) 1/2/94 * $FreeBSD: src/lib/libc/stdio/fseek.c,v 1.9.2.1 2001/03/05 10:56:58 obrien Exp $ - * $DragonFly: src/lib/libc/stdio/fseek.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/fseek.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -68,7 +68,7 @@ fseeko(fp, offset, whence) off_t offset; int whence; { - register fpos_t (*seekfn) __P((void *, fpos_t, int)); + register fpos_t (*seekfn) (void *, fpos_t, int); fpos_t target, curoff; size_t n; struct stat st; diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index 7d83609f97..95619297b6 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -36,7 +36,7 @@ * @(#)local.h 8.3 (Berkeley) 7/3/94 * * $FreeBSD: src/lib/libc/stdio/local.h,v 1.1.1.2.6.1 2001/03/05 11:27:49 obrien Exp $ - * $DragonFly: src/lib/libc/stdio/local.h,v 1.3 2003/11/09 02:34:02 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/local.h,v 1.4 2003/11/12 20:21:25 eirikn Exp $ */ #ifndef _MACHINE_STDINT_H_ @@ -48,21 +48,21 @@ * in particular, macros and private variables. */ -extern int __sflush __P((FILE *)); -extern FILE *__sfp __P((void)); -extern int __srefill __P((FILE *)); -extern int __sread __P((void *, char *, int)); -extern int __swrite __P((void *, char const *, int)); -extern fpos_t __sseek __P((void *, fpos_t, int)); -extern int __sclose __P((void *)); -extern void __sinit __P((void)); -extern void _cleanup __P((void)); -extern void (*__cleanup) __P((void)); -extern void __smakebuf __P((FILE *)); -extern int __swhatbuf __P((FILE *, __size_t *, int *)); -extern int _fwalk __P((int (*)(FILE *))); -extern int __swsetup __P((FILE *)); -extern int __sflags __P((const char *, int *)); +extern int __sflush (FILE *); +extern FILE *__sfp (void); +extern int __srefill (FILE *); +extern int __sread (void *, char *, int); +extern int __swrite (void *, char const *, int); +extern fpos_t __sseek (void *, fpos_t, int); +extern int __sclose (void *); +extern void __sinit (void); +extern void _cleanup (void); +extern void (*__cleanup) (void); +extern void __smakebuf (FILE *); +extern int __swhatbuf (FILE *, __size_t *, int *); +extern int _fwalk (int (*)(FILE *)); +extern int __swsetup (FILE *); +extern int __sflags (const char *, int *); extern int __sdidinit; diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c index 7a117a1d41..7546b1ceb7 100644 --- a/lib/libc/stdio/mktemp.c +++ b/lib/libc/stdio/mktemp.c @@ -32,7 +32,7 @@ * * @(#)mktemp.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/mktemp.c,v 1.19.2.3 2002/06/18 09:53:07 robert Exp $ - * $DragonFly: src/lib/libc/stdio/mktemp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/mktemp.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -45,9 +45,9 @@ #include #include -char *_mktemp __P((char *)); +char *_mktemp (char *); -static int _gettemp __P((char *, int *, int, int)); +static int _gettemp (char *, int *, int, int); static const unsigned char padchar[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c index c640db9e6e..f01b24294e 100644 --- a/lib/libc/stdio/refill.c +++ b/lib/libc/stdio/refill.c @@ -35,7 +35,7 @@ * * @(#)refill.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/refill.c,v 1.8.2.1 2001/03/05 11:27:49 obrien Exp $ - * $DragonFly: src/lib/libc/stdio/refill.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/refill.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include #include "local.h" -static int lflush __P((FILE *)); +static int lflush (FILE *); static int lflush(FILE *fp) diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c index 0282488d35..b935b3a782 100644 --- a/lib/libc/stdio/sscanf.c +++ b/lib/libc/stdio/sscanf.c @@ -35,7 +35,7 @@ * * @(#)sscanf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.6 1999/08/28 00:01:17 peter Exp $ - * $DragonFly: src/lib/libc/stdio/sscanf.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/sscanf.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -47,7 +47,7 @@ #endif #include "local.h" -static int eofread __P((void *, char *, int)); +static int eofread (void *, char *, int); /* ARGSUSED */ static int diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c index 8813ea9349..8ad5819a13 100644 --- a/lib/libc/stdio/tempnam.c +++ b/lib/libc/stdio/tempnam.c @@ -32,7 +32,7 @@ * * @(#)tempnam.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/tempnam.c,v 1.8 1999/10/24 11:57:24 ache Exp $ - * $DragonFly: src/lib/libc/stdio/tempnam.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/tempnam.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -46,7 +46,7 @@ __warn_references(tempnam, "warning: tempnam() possibly used unsafely; consider using mkstemp()"); -extern char *_mktemp __P((char *)); +extern char *_mktemp (char *); char * tempnam(dir, pfx) diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c index 48a0ae01f3..43775419d6 100644 --- a/lib/libc/stdio/tmpnam.c +++ b/lib/libc/stdio/tmpnam.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.3 1999/10/24 11:57:24 ache Exp $ - * $DragonFly: src/lib/libc/stdio/tmpnam.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/tmpnam.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ * * @(#)tmpnam.c 8.3 (Berkeley) 3/28/94 */ @@ -47,7 +47,7 @@ __warn_references(tmpnam, "warning: tmpnam() possibly used unsafely; consider using mkstemp()"); -extern char *_mktemp __P((char *)); +extern char *_mktemp (char *); char * tmpnam(s) diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c index 1dede01866..5ac7348a63 100644 --- a/lib/libc/stdio/ungetc.c +++ b/lib/libc/stdio/ungetc.c @@ -35,7 +35,7 @@ * * @(#)ungetc.c 8.2 (Berkeley) 11/3/93 * $FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.7.2.1 2001/03/05 11:27:49 obrien Exp $ - * $DragonFly: src/lib/libc/stdio/ungetc.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/ungetc.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -44,7 +44,7 @@ #include "local.h" #include "libc_private.h" -static int __submore __P((FILE *)); +static int __submore (FILE *); /* * Expand the ungetc buffer `in place'. That is, adjust fp->_p when diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index a77578e5ac..719da8cc31 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -35,7 +35,7 @@ * * @(#)vfprintf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.22.2.5 2002/10/12 10:46:37 schweikh Exp $ - * $DragonFly: src/lib/libc/stdio/vfprintf.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/vfprintf.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* @@ -64,12 +64,12 @@ /* Define FLOATING_POINT to get floating point. */ #define FLOATING_POINT -static int __sprint __P((FILE *, struct __suio *)); -static int __sbprintf __P((FILE *, const char *, va_list)); -static char * __ultoa __P((u_long, char *, int, int, char *)); -static char * __uqtoa __P((u_quad_t, char *, int, int, char *)); -static void __find_arguments __P((const char *, va_list, void ***)); -static void __grow_type_table __P((int, unsigned char **, int *)); +static int __sprint (FILE *, struct __suio *); +static int __sbprintf (FILE *, const char *, va_list); +static char * __ultoa (u_long, char *, int, int, char *); +static char * __uqtoa (u_quad_t, char *, int, int, char *); +static void __find_arguments (const char *, va_list, void ***); +static void __grow_type_table (int, unsigned char **, int *); /* * Flush out all the vectors defined by the given uio, @@ -248,8 +248,8 @@ __uqtoa(u_quad_t val, char *endp, int base, int octzero, char *xdigs) #define BUF (MAXEXP+MAXFRACT+1) /* + decimal point */ #define DEFPREC 6 -static char *cvt __P((double, int, int, char *, int *, int, int *, char **)); -static int exponent __P((char *, int, int)); +static char *cvt (double, int, int, char *, int *, int, int *, char **); +static int exponent (char *, int, int); #else /* no FLOATING_POINT */ @@ -1190,7 +1190,7 @@ __grow_type_table (int nextarg, unsigned char **typetable, int *tablesize) #ifdef FLOATING_POINT -extern char *__dtoa __P((double, int, int, int *, int *, char **, char **)); +extern char *__dtoa (double, int, int, int *, int *, char **, char **); static char * cvt(double value, int ndigits, int flags, char *sign, int *decpt, diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c index d6bba0d437..605f5ecc87 100644 --- a/lib/libc/stdio/vsscanf.c +++ b/lib/libc/stdio/vsscanf.c @@ -35,7 +35,7 @@ * * @(#)vsscanf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.7 1999/08/28 00:01:22 peter Exp $ - * $DragonFly: src/lib/libc/stdio/vsscanf.c,v 1.3 2003/11/09 02:34:02 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/vsscanf.c,v 1.4 2003/11/12 20:21:25 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include static int -eofread __P((void *, char *, int)); +eofread (void *, char *, int); /* ARGSUSED */ static int diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c index eb0191493f..65dd50fce6 100644 --- a/lib/libc/xdr/xdr_rec.c +++ b/lib/libc/xdr/xdr_rec.c @@ -29,7 +29,7 @@ * @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro * @(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC * $FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.12 2000/01/19 06:12:32 wpaul Exp $ - * $DragonFly: src/lib/libc/xdr/xdr_rec.c,v 1.2 2003/06/17 04:26:47 dillon Exp $ + * $DragonFly: src/lib/libc/xdr/xdr_rec.c,v 1.3 2003/11/12 20:21:25 eirikn Exp $ */ /* @@ -103,7 +103,7 @@ typedef struct rec_strm { /* * out-goung bits */ - int (*writeit) __P((caddr_t, caddr_t, int)); + int (*writeit) (caddr_t, caddr_t, int); caddr_t out_base; /* output buffer (points to frag header) */ caddr_t out_finger; /* next output position */ caddr_t out_boundry; /* data cannot up to this address */ @@ -112,7 +112,7 @@ typedef struct rec_strm { /* * in-coming bits */ - int (*readit) __P((caddr_t, caddr_t, int)); + int (*readit) (caddr_t, caddr_t, int); u_long in_size; /* fixed size of the input buffer */ caddr_t in_base; caddr_t in_finger; /* location of next byte to be had */ diff --git a/lib/libcr/db/btree/bt_close.c b/lib/libcr/db/btree/bt_close.c index 584275c13c..b9a4dc4c09 100644 --- a/lib/libcr/db/btree/bt_close.c +++ b/lib/libcr/db/btree/bt_close.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/btree/bt_close.c,v 1.5 2000/01/27 23:06:05 jasone Exp $ - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_close.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_close.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ * * @(#)bt_close.c 8.7 (Berkeley) 8/17/94 */ @@ -50,7 +50,7 @@ #include #include "btree.h" -static int bt_meta __P((BTREE *)); +static int bt_meta (BTREE *); /* * BT_CLOSE -- Close a btree. diff --git a/lib/libcr/db/btree/bt_conv.c b/lib/libcr/db/btree/bt_conv.c index eae4797b47..076bd4d4d3 100644 --- a/lib/libcr/db/btree/bt_conv.c +++ b/lib/libcr/db/btree/bt_conv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_conv.c 8.5 (Berkeley) 8/17/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_conv.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_conv.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -44,7 +44,7 @@ #include #include "btree.h" -static void mswap __P((PAGE *)); +static void mswap (PAGE *); /* * __BT_BPGIN, __BT_BPGOUT -- diff --git a/lib/libcr/db/btree/bt_delete.c b/lib/libcr/db/btree/bt_delete.c index 1b8d6f7d19..174a71fbe9 100644 --- a/lib/libcr/db/btree/bt_delete.c +++ b/lib/libcr/db/btree/bt_delete.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_delete.c 8.13 (Berkeley) 7/28/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_delete.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_delete.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -46,11 +46,11 @@ #include #include "btree.h" -static int __bt_bdelete __P((BTREE *, const DBT *)); -static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int)); -static int __bt_pdelete __P((BTREE *, PAGE *)); -static int __bt_relink __P((BTREE *, PAGE *)); -static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *)); +static int __bt_bdelete (BTREE *, const DBT *); +static int __bt_curdel (BTREE *, const DBT *, PAGE *, u_int); +static int __bt_pdelete (BTREE *, PAGE *); +static int __bt_relink (BTREE *, PAGE *); +static int __bt_stkacq (BTREE *, PAGE **, CURSOR *); /* * __bt_delete diff --git a/lib/libcr/db/btree/bt_open.c b/lib/libcr/db/btree/bt_open.c index 034a0da520..7dfabbb760 100644 --- a/lib/libcr/db/btree/bt_open.c +++ b/lib/libcr/db/btree/bt_open.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.7.2.1 2000/11/02 10:30:07 kris Exp $ - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_open.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_open.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ * * @(#)bt_open.c 8.10 (Berkeley) 8/17/94 */ @@ -67,9 +67,9 @@ #define MINPSIZE 128 #endif -static int byteorder __P((void)); -static int nroot __P((BTREE *)); -static int tmp __P((void)); +static int byteorder (void); +static int nroot (BTREE *); +static int tmp (void); /* * __BT_OPEN -- Open a btree. diff --git a/lib/libcr/db/btree/bt_put.c b/lib/libcr/db/btree/bt_put.c index 2ac34531a7..adfdf08b3c 100644 --- a/lib/libcr/db/btree/bt_put.c +++ b/lib/libcr/db/btree/bt_put.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_put.c 8.8 (Berkeley) 7/26/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_put.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_put.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -47,7 +47,7 @@ #include #include "btree.h" -static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *)); +static EPG *bt_fast (BTREE *, const DBT *, const DBT *, int *); /* * __BT_PUT -- Add a btree item to the tree. diff --git a/lib/libcr/db/btree/bt_search.c b/lib/libcr/db/btree/bt_search.c index d0d55e2644..6127fee629 100644 --- a/lib/libcr/db/btree/bt_search.c +++ b/lib/libcr/db/btree/bt_search.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_search.c 8.8 (Berkeley) 7/31/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_search.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_search.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -44,8 +44,8 @@ #include #include "btree.h" -static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *)); -static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *)); +static int __bt_snext (BTREE *, PAGE *, const DBT *, int *); +static int __bt_sprev (BTREE *, PAGE *, const DBT *, int *); /* * __bt_search -- diff --git a/lib/libcr/db/btree/bt_seq.c b/lib/libcr/db/btree/bt_seq.c index c5a746a340..7cfae8d83a 100644 --- a/lib/libcr/db/btree/bt_seq.c +++ b/lib/libcr/db/btree/bt_seq.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_seq.c 8.7 (Berkeley) 7/20/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_seq.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_seq.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -47,9 +47,9 @@ #include #include "btree.h" -static int __bt_first __P((BTREE *, const DBT *, EPG *, int *)); -static int __bt_seqadv __P((BTREE *, EPG *, int)); -static int __bt_seqset __P((BTREE *, EPG *, DBT *, int)); +static int __bt_first (BTREE *, const DBT *, EPG *, int *); +static int __bt_seqadv (BTREE *, EPG *, int); +static int __bt_seqset (BTREE *, EPG *, DBT *, int); /* * Sequential scan support. diff --git a/lib/libcr/db/btree/bt_split.c b/lib/libcr/db/btree/bt_split.c index 0ddeb52bcb..37a6d16123 100644 --- a/lib/libcr/db/btree/bt_split.c +++ b/lib/libcr/db/btree/bt_split.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)bt_split.c 8.9 (Berkeley) 7/26/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/bt_split.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/bt_split.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -47,16 +47,16 @@ #include #include "btree.h" -static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *)); +static int bt_broot (BTREE *, PAGE *, PAGE *, PAGE *); static PAGE *bt_page - __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t)); -static int bt_preserve __P((BTREE *, pgno_t)); + (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t); +static int bt_preserve (BTREE *, pgno_t); static PAGE *bt_psplit - __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t)); + (BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t); static PAGE *bt_root - __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t)); -static int bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *)); -static recno_t rec_total __P((PAGE *)); + (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t); +static int bt_rroot (BTREE *, PAGE *, PAGE *, PAGE *); +static recno_t rec_total (PAGE *); #ifdef STATISTICS u_long bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved; diff --git a/lib/libcr/db/btree/btree.h b/lib/libcr/db/btree/btree.h index 56fb83eb8e..d14626d114 100644 --- a/lib/libcr/db/btree/btree.h +++ b/lib/libcr/db/btree/btree.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)btree.h 8.11 (Berkeley) 8/17/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/btree.h,v 1.2 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/btree.h,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ /* Macros to set/clear/test flags. */ @@ -336,11 +336,11 @@ typedef struct _btree { EPGNO bt_last; /* last insert */ /* B: key comparison function */ - int (*bt_cmp) __P((const DBT *, const DBT *)); + int (*bt_cmp) (const DBT *, const DBT *); /* B: prefix comparison function */ - size_t (*bt_pfx) __P((const DBT *, const DBT *)); + size_t (*bt_pfx) (const DBT *, const DBT *); /* R: recno input function */ - int (*bt_irec) __P((struct _btree *, recno_t)); + int (*bt_irec) (struct _btree *, recno_t); FILE *bt_rfp; /* R: record FILE pointer */ int bt_rfd; /* R: record file descriptor */ diff --git a/lib/libcr/db/btree/extern.h b/lib/libcr/db/btree/extern.h index 47f7799edc..cd9712b230 100644 --- a/lib/libcr/db/btree/extern.h +++ b/lib/libcr/db/btree/extern.h @@ -31,41 +31,41 @@ * SUCH DAMAGE. * * @(#)extern.h 8.10 (Berkeley) 7/20/94 - * $DragonFly: src/lib/libcr/db/btree/Attic/extern.h,v 1.2 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/btree/Attic/extern.h,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ -int __bt_close __P((DB *)); -int __bt_cmp __P((BTREE *, const DBT *, EPG *)); -int __bt_crsrdel __P((BTREE *, EPGNO *)); -int __bt_defcmp __P((const DBT *, const DBT *)); -size_t __bt_defpfx __P((const DBT *, const DBT *)); -int __bt_delete __P((const DB *, const DBT *, u_int)); -int __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int)); -int __bt_fd __P((const DB *)); -int __bt_free __P((BTREE *, PAGE *)); -int __bt_get __P((const DB *, const DBT *, DBT *, u_int)); -PAGE *__bt_new __P((BTREE *, pgno_t *)); -void __bt_pgin __P((void *, pgno_t, void *)); -void __bt_pgout __P((void *, pgno_t, void *)); -int __bt_push __P((BTREE *, pgno_t, int)); -int __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int)); -int __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int)); -EPG *__bt_search __P((BTREE *, const DBT *, int *)); -int __bt_seq __P((const DB *, DBT *, DBT *, u_int)); -void __bt_setcur __P((BTREE *, pgno_t, u_int)); -int __bt_split __P((BTREE *, PAGE *, - const DBT *, const DBT *, int, size_t, u_int32_t)); -int __bt_sync __P((const DB *, u_int)); +int __bt_close (DB *); +int __bt_cmp (BTREE *, const DBT *, EPG *); +int __bt_crsrdel (BTREE *, EPGNO *); +int __bt_defcmp (const DBT *, const DBT *); +size_t __bt_defpfx (const DBT *, const DBT *); +int __bt_delete (const DB *, const DBT *, u_int); +int __bt_dleaf (BTREE *, const DBT *, PAGE *, u_int); +int __bt_fd (const DB *); +int __bt_free (BTREE *, PAGE *); +int __bt_get (const DB *, const DBT *, DBT *, u_int); +PAGE *__bt_new (BTREE *, pgno_t *); +void __bt_pgin (void *, pgno_t, void *); +void __bt_pgout (void *, pgno_t, void *); +int __bt_push (BTREE *, pgno_t, int); +int __bt_put (const DB *dbp, DBT *, const DBT *, u_int); +int __bt_ret (BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int); +EPG *__bt_search (BTREE *, const DBT *, int *); +int __bt_seq (const DB *, DBT *, DBT *, u_int); +void __bt_setcur (BTREE *, pgno_t, u_int); +int __bt_split (BTREE *, PAGE *, + const DBT *, const DBT *, int, size_t, u_int32_t); +int __bt_sync (const DB *, u_int); -int __ovfl_delete __P((BTREE *, void *)); -int __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *)); -int __ovfl_put __P((BTREE *, const DBT *, pgno_t *)); +int __ovfl_delete (BTREE *, void *); +int __ovfl_get (BTREE *, void *, size_t *, void **, size_t *); +int __ovfl_put (BTREE *, const DBT *, pgno_t *); #ifdef DEBUG -void __bt_dnpage __P((DB *, pgno_t)); -void __bt_dpage __P((PAGE *)); -void __bt_dump __P((DB *)); +void __bt_dnpage (DB *, pgno_t); +void __bt_dpage (PAGE *); +void __bt_dump (DB *); #endif #ifdef STATISTICS -void __bt_stat __P((DB *)); +void __bt_stat (DB *); #endif diff --git a/lib/libcr/db/hash/extern.h b/lib/libcr/db/hash/extern.h index 078759b54d..5289b6158b 100644 --- a/lib/libcr/db/hash/extern.h +++ b/lib/libcr/db/hash/extern.h @@ -31,35 +31,35 @@ * SUCH DAMAGE. * * @(#)extern.h 8.4 (Berkeley) 6/16/94 - * $DragonFly: src/lib/libcr/db/hash/Attic/extern.h,v 1.2 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/extern.h,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ -BUFHEAD *__add_ovflpage __P((HTAB *, BUFHEAD *)); -int __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *)); -int __big_delete __P((HTAB *, BUFHEAD *)); -int __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *)); -int __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int)); -int __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int)); -int __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, - int, u_int32_t, SPLIT_RETURN *)); -int __buf_free __P((HTAB *, int, int)); -void __buf_init __P((HTAB *, int)); -u_int32_t __call_hash __P((HTAB *, char *, int)); -int __delpair __P((HTAB *, BUFHEAD *, int)); -int __expand_table __P((HTAB *)); -int __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int)); -u_int16_t __find_last_page __P((HTAB *, BUFHEAD **)); -void __free_ovflpage __P((HTAB *, BUFHEAD *)); -BUFHEAD *__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int)); -int __get_page __P((HTAB *, char *, u_int32_t, int, int, int)); -int __ibitmap __P((HTAB *, int, int, int)); -u_int32_t __log2 __P((u_int32_t)); -int __put_page __P((HTAB *, char *, u_int32_t, int, int)); -void __reclaim_buf __P((HTAB *, BUFHEAD *)); -int __split_page __P((HTAB *, u_int32_t, u_int32_t)); +BUFHEAD *__add_ovflpage (HTAB *, BUFHEAD *); +int __addel (HTAB *, BUFHEAD *, const DBT *, const DBT *); +int __big_delete (HTAB *, BUFHEAD *); +int __big_insert (HTAB *, BUFHEAD *, const DBT *, const DBT *); +int __big_keydata (HTAB *, BUFHEAD *, DBT *, DBT *, int); +int __big_return (HTAB *, BUFHEAD *, int, DBT *, int); +int __big_split (HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, + int, u_int32_t, SPLIT_RETURN *); +int __buf_free (HTAB *, int, int); +void __buf_init (HTAB *, int); +u_int32_t __call_hash (HTAB *, char *, int); +int __delpair (HTAB *, BUFHEAD *, int); +int __expand_table (HTAB *); +int __find_bigpair (HTAB *, BUFHEAD *, int, char *, int); +u_int16_t __find_last_page (HTAB *, BUFHEAD **); +void __free_ovflpage (HTAB *, BUFHEAD *); +BUFHEAD *__get_buf (HTAB *, u_int32_t, BUFHEAD *, int); +int __get_page (HTAB *, char *, u_int32_t, int, int, int); +int __ibitmap (HTAB *, int, int, int); +u_int32_t __log2 (u_int32_t); +int __put_page (HTAB *, char *, u_int32_t, int, int); +void __reclaim_buf (HTAB *, BUFHEAD *); +int __split_page (HTAB *, u_int32_t, u_int32_t); /* Default hash routine. */ -extern u_int32_t (*__default_hash) __P((const void *, size_t)); +extern u_int32_t (*__default_hash) (const void *, size_t); #ifdef HASH_STATISTICS extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows; diff --git a/lib/libcr/db/hash/hash.c b/lib/libcr/db/hash/hash.c index ca5579dcc9..fa0af9e99c 100644 --- a/lib/libcr/db/hash/hash.c +++ b/lib/libcr/db/hash/hash.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/hash/hash.c,v 1.8 2000/01/27 23:06:08 jasone Exp $ - * $DragonFly: src/lib/libcr/db/hash/Attic/hash.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/hash.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ * * @(#)hash.c 8.9 (Berkeley) 6/16/94 */ @@ -57,23 +57,23 @@ #include "page.h" #include "extern.h" -static int alloc_segs __P((HTAB *, int)); -static int flush_meta __P((HTAB *)); -static int hash_access __P((HTAB *, ACTION, DBT *, DBT *)); -static int hash_close __P((DB *)); -static int hash_delete __P((const DB *, const DBT *, u_int32_t)); -static int hash_fd __P((const DB *)); -static int hash_get __P((const DB *, const DBT *, DBT *, u_int32_t)); -static int hash_put __P((const DB *, DBT *, const DBT *, u_int32_t)); -static void *hash_realloc __P((SEGMENT **, int, int)); -static int hash_seq __P((const DB *, DBT *, DBT *, u_int32_t)); -static int hash_sync __P((const DB *, u_int32_t)); -static int hdestroy __P((HTAB *)); -static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *)); -static int init_htab __P((HTAB *, int)); +static int alloc_segs (HTAB *, int); +static int flush_meta (HTAB *); +static int hash_access (HTAB *, ACTION, DBT *, DBT *); +static int hash_close (DB *); +static int hash_delete (const DB *, const DBT *, u_int32_t); +static int hash_fd (const DB *); +static int hash_get (const DB *, const DBT *, DBT *, u_int32_t); +static int hash_put (const DB *, DBT *, const DBT *, u_int32_t); +static void *hash_realloc (SEGMENT **, int, int); +static int hash_seq (const DB *, DBT *, DBT *, u_int32_t); +static int hash_sync (const DB *, u_int32_t); +static int hdestroy (HTAB *); +static HTAB *init_hash (HTAB *, const char *, HASHINFO *); +static int init_htab (HTAB *, int); #if BYTE_ORDER == LITTLE_ENDIAN -static void swap_header __P((HTAB *)); -static void swap_header_copy __P((HASHHDR *, HASHHDR *)); +static void swap_header (HTAB *); +static void swap_header_copy (HASHHDR *, HASHHDR *); #endif /* Fast arithmetic, relying on powers of 2, */ diff --git a/lib/libcr/db/hash/hash.h b/lib/libcr/db/hash/hash.h index b1635bdb72..38be5f7c90 100644 --- a/lib/libcr/db/hash/hash.h +++ b/lib/libcr/db/hash/hash.h @@ -35,7 +35,7 @@ * * @(#)hash.h 8.3 (Berkeley) 5/31/94 * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.4.8.1 2001/03/05 03:50:02 kris Exp $ - * $DragonFly: src/lib/libcr/db/hash/Attic/hash.h,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/hash.h,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ /* Operations */ @@ -97,7 +97,7 @@ typedef struct htab { /* Memory resident data structure */ int exsegs; /* Number of extra allocated * segments */ u_int32_t /* Hash function */ - (*hash)__P((const void *, size_t)); + (*hash)(const void *, size_t); int flags; /* Flag values */ int fp; /* File pointer */ char *tmp_buf; /* Temporary Buffer for BIG data */ diff --git a/lib/libcr/db/hash/hash_bigkey.c b/lib/libcr/db/hash/hash_bigkey.c index 307123ff49..ec7aa103c0 100644 --- a/lib/libcr/db/hash/hash_bigkey.c +++ b/lib/libcr/db/hash/hash_bigkey.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94 - * $DragonFly: src/lib/libcr/db/hash/Attic/hash_bigkey.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/hash_bigkey.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ /* @@ -71,8 +71,8 @@ #include "page.h" #include "extern.h" -static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int)); -static int collect_data __P((HTAB *, BUFHEAD *, int, int)); +static int collect_key (HTAB *, BUFHEAD *, int, DBT *, int); +static int collect_data (HTAB *, BUFHEAD *, int, int); /* * Big_insert diff --git a/lib/libcr/db/hash/hash_buf.c b/lib/libcr/db/hash/hash_buf.c index bf84b2ea54..18fd5e5cc9 100644 --- a/lib/libcr/db/hash/hash_buf.c +++ b/lib/libcr/db/hash/hash_buf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.4.8.1 2001/03/05 07:38:05 obrien Exp $ - * $DragonFly: src/lib/libcr/db/hash/Attic/hash_buf.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/hash_buf.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ * * @(#)hash_buf.c 8.5 (Berkeley) 7/15/94 */ @@ -70,7 +70,7 @@ #include "page.h" #include "extern.h" -static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *)); +static BUFHEAD *newbuf (HTAB *, u_int32_t, BUFHEAD *); /* Unlink B from its place in the lru */ #define BUF_REMOVE(B) { \ diff --git a/lib/libcr/db/hash/hash_func.c b/lib/libcr/db/hash/hash_func.c index 533492da3f..2cd57059fe 100644 --- a/lib/libcr/db/hash/hash_func.c +++ b/lib/libcr/db/hash/hash_func.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)hash_func.c 8.2 (Berkeley) 2/21/94 - * $DragonFly: src/lib/libcr/db/hash/Attic/hash_func.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/hash_func.c,v 1.4 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -44,13 +44,13 @@ #include "page.h" #include "extern.h" -static u_int32_t hash1 __P((const void *, size_t)); -static u_int32_t hash2 __P((const void *, size_t)); -static u_int32_t hash3 __P((const void *, size_t)); -static u_int32_t hash4 __P((const void *, size_t)); +static u_int32_t hash1 (const void *, size_t); +static u_int32_t hash2 (const void *, size_t); +static u_int32_t hash3 (const void *, size_t); +static u_int32_t hash4 (const void *, size_t); /* Global default hash function */ -u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4; +u_int32_t (*__default_hash) (const void *, size_t) = hash4; /* * HASH FUNCTIONS diff --git a/lib/libcr/db/hash/hash_page.c b/lib/libcr/db/hash/hash_page.c index 58326ab971..3f24095ae5 100644 --- a/lib/libcr/db/hash/hash_page.c +++ b/lib/libcr/db/hash/hash_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.5 2000/01/27 23:06:08 jasone Exp $ - * $DragonFly: src/lib/libcr/db/hash/Attic/hash_page.c,v 1.2 2003/06/17 04:26:41 dillon Exp $ + * $DragonFly: src/lib/libcr/db/hash/Attic/hash_page.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ * * @(#)hash_page.c 8.7 (Berkeley) 8/16/94 */ @@ -73,14 +73,14 @@ #include "page.h" #include "extern.h" -static u_int32_t *fetch_bitmap __P((HTAB *, int)); -static u_int32_t first_free __P((u_int32_t)); -static int open_temp __P((HTAB *)); -static u_int16_t overflow_page __P((HTAB *)); -static void putpair __P((char *, const DBT *, const DBT *)); -static void squeeze_key __P((u_int16_t *, const DBT *, const DBT *)); +static u_int32_t *fetch_bitmap (HTAB *, int); +static u_int32_t first_free (u_int32_t); +static int open_temp (HTAB *); +static u_int16_t overflow_page (HTAB *); +static void putpair (char *, const DBT *, const DBT *); +static void squeeze_key (u_int16_t *, const DBT *, const DBT *); static int ugly_split - __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int)); + (HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int); #define PAGE_INIT(P) { \ ((u_int16_t *)(P))[0] = 0; \ diff --git a/lib/libcr/db/mpool/mpool.c b/lib/libcr/db/mpool/mpool.c index 442ac2b7f2..823c926d4e 100644 --- a/lib/libcr/db/mpool/mpool.c +++ b/lib/libcr/db/mpool/mpool.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.5.2.1 2001/03/05 23:05:01 obrien Exp $ - * $DragonFly: src/lib/libcr/db/mpool/Attic/mpool.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/db/mpool/Attic/mpool.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ * * @(#)mpool.c 8.5 (Berkeley) 7/26/94 */ @@ -51,9 +51,9 @@ #define __MPOOLINTERFACE_PRIVATE #include -static BKT *mpool_bkt __P((MPOOL *)); -static BKT *mpool_look __P((MPOOL *, pgno_t)); -static int mpool_write __P((MPOOL *, BKT *)); +static BKT *mpool_bkt (MPOOL *); +static BKT *mpool_look (MPOOL *, pgno_t); +static int mpool_write (MPOOL *, BKT *); /* * mpool_open -- @@ -102,8 +102,8 @@ mpool_open(key, fd, pagesize, maxcache) void mpool_filter(mp, pgin, pgout, pgcookie) MPOOL *mp; - void (*pgin) __P((void *, pgno_t, void *)); - void (*pgout) __P((void *, pgno_t, void *)); + void (*pgin) (void *, pgno_t, void *); + void (*pgout) (void *, pgno_t, void *); void *pgcookie; { mp->pgin = pgin; diff --git a/lib/libcr/db/recno/extern.h b/lib/libcr/db/recno/extern.h index 7bb68183ff..390f83935e 100644 --- a/lib/libcr/db/recno/extern.h +++ b/lib/libcr/db/recno/extern.h @@ -31,25 +31,25 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 6/4/94 - * $DragonFly: src/lib/libcr/db/recno/Attic/extern.h,v 1.2 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/recno/Attic/extern.h,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ #include "../btree/extern.h" -int __rec_close __P((DB *)); -int __rec_delete __P((const DB *, const DBT *, u_int)); -int __rec_dleaf __P((BTREE *, PAGE *, u_int32_t)); -int __rec_fd __P((const DB *)); -int __rec_fmap __P((BTREE *, recno_t)); -int __rec_fout __P((BTREE *)); -int __rec_fpipe __P((BTREE *, recno_t)); -int __rec_get __P((const DB *, const DBT *, DBT *, u_int)); -int __rec_iput __P((BTREE *, recno_t, const DBT *, u_int)); -int __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int)); -int __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *)); -EPG *__rec_search __P((BTREE *, recno_t, enum SRCHOP)); -int __rec_seq __P((const DB *, DBT *, DBT *, u_int)); -int __rec_sync __P((const DB *, u_int)); -int __rec_vmap __P((BTREE *, recno_t)); -int __rec_vout __P((BTREE *)); -int __rec_vpipe __P((BTREE *, recno_t)); +int __rec_close (DB *); +int __rec_delete (const DB *, const DBT *, u_int); +int __rec_dleaf (BTREE *, PAGE *, u_int32_t); +int __rec_fd (const DB *); +int __rec_fmap (BTREE *, recno_t); +int __rec_fout (BTREE *); +int __rec_fpipe (BTREE *, recno_t); +int __rec_get (const DB *, const DBT *, DBT *, u_int); +int __rec_iput (BTREE *, recno_t, const DBT *, u_int); +int __rec_put (const DB *dbp, DBT *, const DBT *, u_int); +int __rec_ret (BTREE *, EPG *, recno_t, DBT *, DBT *); +EPG *__rec_search (BTREE *, recno_t, enum SRCHOP); +int __rec_seq (const DB *, DBT *, DBT *, u_int); +int __rec_sync (const DB *, u_int); +int __rec_vmap (BTREE *, recno_t); +int __rec_vout (BTREE *); +int __rec_vpipe (BTREE *, recno_t); diff --git a/lib/libcr/db/recno/rec_delete.c b/lib/libcr/db/recno/rec_delete.c index 747a2161b3..47fc2b3423 100644 --- a/lib/libcr/db/recno/rec_delete.c +++ b/lib/libcr/db/recno/rec_delete.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)rec_delete.c 8.7 (Berkeley) 7/14/94 - * $DragonFly: src/lib/libcr/db/recno/Attic/rec_delete.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/db/recno/Attic/rec_delete.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -46,7 +46,7 @@ #include #include "recno.h" -static int rec_rdelete __P((BTREE *, recno_t)); +static int rec_rdelete (BTREE *, recno_t); /* * __REC_DELETE -- Delete the item(s) referenced by a key. diff --git a/lib/libcr/db/test/btree.tests/main.c b/lib/libcr/db/test/btree.tests/main.c index 07b4a1e98b..f76f066b5e 100644 --- a/lib/libcr/db/test/btree.tests/main.c +++ b/lib/libcr/db/test/btree.tests/main.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)main.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libcr/db/test/btree.tests/Attic/main.c,v 1.3 2003/11/12 18:07:01 eirikn Exp $ + * $DragonFly: src/lib/libcr/db/test/btree.tests/Attic/main.c,v 1.4 2003/11/12 20:21:27 eirikn Exp $ */ #include @@ -51,37 +51,37 @@ typedef struct cmd_table { char *cmd; int nargs; int rconv; - void (*func) __P((DB *, char **)); + void (*func) (DB *, char **); char *usage, *descrip; } cmd_table; int stopstop; DB *globaldb; -void append __P((DB *, char **)); -void bstat __P((DB *, char **)); -void cursor __P((DB *, char **)); -void delcur __P((DB *, char **)); -void delete __P((DB *, char **)); -void dump __P((DB *, char **)); -void first __P((DB *, char **)); -void get __P((DB *, char **)); -void help __P((DB *, char **)); -void iafter __P((DB *, char **)); -void ibefore __P((DB *, char **)); -void icursor __P((DB *, char **)); -void insert __P((DB *, char **)); -void keydata __P((DBT *, DBT *)); -void last __P((DB *, char **)); -void list __P((DB *, char **)); -void load __P((DB *, char **)); -void mstat __P((DB *, char **)); -void next __P((DB *, char **)); -int parse __P((char *, char **, int)); -void previous __P((DB *, char **)); -void show __P((DB *, char **)); -void usage __P((void)); -void user __P((DB *)); +void append (DB *, char **); +void bstat (DB *, char **); +void cursor (DB *, char **); +void delcur (DB *, char **); +void delete (DB *, char **); +void dump (DB *, char **); +void first (DB *, char **); +void get (DB *, char **); +void help (DB *, char **); +void iafter (DB *, char **); +void ibefore (DB *, char **); +void icursor (DB *, char **); +void insert (DB *, char **); +void keydata (DBT *, DBT *); +void last (DB *, char **); +void list (DB *, char **); +void load (DB *, char **); +void mstat (DB *, char **); +void next (DB *, char **); +int parse (char *, char **, int); +void previous (DB *, char **); +void show (DB *, char **); +void usage (void); +void user (DB *); cmd_table commands[] = { "?", 0, 0, help, "help", NULL, diff --git a/lib/libcr/db/test/dbtest.c b/lib/libcr/db/test/dbtest.c index 85781c3bbb..271f017795 100644 --- a/lib/libcr/db/test/dbtest.c +++ b/lib/libcr/db/test/dbtest.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)dbtest.c 8.17 (Berkeley) 9/1/94 * $FreeBSD: src/lib/libc/db/test/dbtest.c,v 1.3.8.1 2000/08/21 22:44:47 jhb Exp $ - * $DragonFly: src/lib/libcr/db/test/Attic/dbtest.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/db/test/Attic/dbtest.c,v 1.3 2003/11/12 20:21:26 eirikn Exp $ */ #include @@ -52,22 +52,22 @@ enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA }; -void compare __P((DBT *, DBT *)); -DBTYPE dbtype __P((char *)); -void dump __P((DB *, int)); -void err __P((const char *, ...)); -void get __P((DB *, DBT *)); -void getdata __P((DB *, DBT *, DBT *)); -void put __P((DB *, DBT *, DBT *)); -void rem __P((DB *, DBT *)); -char *sflags __P((int)); -void synk __P((DB *)); -void *rfile __P((char *, size_t *)); -void seq __P((DB *, DBT *)); -u_int setflags __P((char *)); -void *setinfo __P((DBTYPE, char *)); -void usage __P((void)); -void *xmalloc __P((char *, size_t)); +void compare (DBT *, DBT *); +DBTYPE dbtype (char *); +void dump (DB *, int); +void err (const char *, ...); +void get (DB *, DBT *); +void getdata (DB *, DBT *, DBT *); +void put (DB *, DBT *, DBT *); +void rem (DB *, DBT *); +char *sflags (int); +void synk (DB *); +void *rfile (char *, size_t *); +void seq (DB *, DBT *); +u_int setflags (char *); +void *setinfo (DBTYPE, char *); +void usage (void); +void *xmalloc (char *, size_t); DBTYPE type; /* Database type. */ void *infop; /* Iflags. */ diff --git a/lib/libcr/gen/closedir.c b/lib/libcr/gen/closedir.c index d8549e34e2..3e2c2d589a 100644 --- a/lib/libcr/gen/closedir.c +++ b/lib/libcr/gen/closedir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/closedir.c,v 1.6.2.1 2001/03/05 08:29:56 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/closedir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/closedir.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)closedir.c 8.1 (Berkeley) 6/10/93 */ @@ -41,7 +41,7 @@ #include #include -extern void _reclaim_telldir __P((DIR *)); +extern void _reclaim_telldir (DIR *); /* * close a directory. diff --git a/lib/libcr/gen/disklabel.c b/lib/libcr/gen/disklabel.c index f1762f1948..551f0368b4 100644 --- a/lib/libcr/gen/disklabel.c +++ b/lib/libcr/gen/disklabel.c @@ -32,7 +32,7 @@ * * @(#)disklabel.c 8.2 (Berkeley) 5/3/95 * $FreeBSD: src/lib/libc/gen/disklabel.c,v 1.9.2.1 2001/03/05 08:40:47 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/disklabel.c,v 1.3 2003/08/08 04:18:34 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/disklabel.c,v 1.4 2003/11/12 20:21:27 eirikn Exp $ */ #include @@ -48,7 +48,7 @@ #include #include -static int gettype __P((char *, char **)); +static int gettype (char *, char **); struct disklabel * getdiskbyname(name) diff --git a/lib/libcr/gen/fnmatch.c b/lib/libcr/gen/fnmatch.c index 3ff6a715ba..4a7aff0f80 100644 --- a/lib/libcr/gen/fnmatch.c +++ b/lib/libcr/gen/fnmatch.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)fnmatch.c 8.2 (Berkeley) 4/16/94 - * $DragonFly: src/lib/libcr/gen/Attic/fnmatch.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/fnmatch.c,v 1.4 2003/11/12 20:21:27 eirikn Exp $ */ /* @@ -55,7 +55,7 @@ #define RANGE_NOMATCH 0 #define RANGE_ERROR (-1) -static int rangematch __P((const char *, char, int, char **)); +static int rangematch (const char *, char, int, char **); int fnmatch(pattern, string, flags) diff --git a/lib/libcr/gen/fstab.c b/lib/libcr/gen/fstab.c index 2d2657f22e..5547bcca5e 100644 --- a/lib/libcr/gen/fstab.c +++ b/lib/libcr/gen/fstab.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/fstab.c,v 1.8 2000/01/27 23:06:15 jasone Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/fstab.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/fstab.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)fstab.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gen/fstab.c,v 1.8 2000/01/27 23:06:15 jasone Exp $ @@ -53,9 +53,9 @@ static FILE *_fs_fp; static struct fstab _fs_fstab; static int LineNo = 0; -static void error __P((int)); -static void fixfsfile __P((void)); -static int fstabscan __P((void)); +static void error (int); +static void fixfsfile (void); +static int fstabscan (void); static void fixfsfile() diff --git a/lib/libcr/gen/fts.c b/lib/libcr/gen/fts.c index 783a7ff784..94299b5035 100644 --- a/lib/libcr/gen/fts.c +++ b/lib/libcr/gen/fts.c @@ -33,7 +33,7 @@ * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $ * * $FreeBSD: src/lib/libc/gen/fts.c,v 1.14.2.4 2001/06/01 22:00:34 kris Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/fts.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/fts.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)fts.c 8.6 (Berkeley) 8/14/94 * $FreeBSD: src/lib/libc/gen/fts.c,v 1.14.2.4 2001/06/01 22:00:34 kris Exp $ @@ -50,16 +50,16 @@ #include #include -static FTSENT *fts_alloc __P((FTS *, char *, int)); -static FTSENT *fts_build __P((FTS *, int)); -static void fts_lfree __P((FTSENT *)); -static void fts_load __P((FTS *, FTSENT *)); -static size_t fts_maxarglen __P((char * const *)); -static void fts_padjust __P((FTS *, FTSENT *)); -static int fts_palloc __P((FTS *, size_t)); -static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); -static u_short fts_stat __P((FTS *, FTSENT *, int)); -static int fts_safe_changedir __P((FTS *, FTSENT *, int, char *)); +static FTSENT *fts_alloc (FTS *, char *, int); +static FTSENT *fts_build (FTS *, int); +static void fts_lfree (FTSENT *); +static void fts_load (FTS *, FTSENT *); +static size_t fts_maxarglen (char * const *); +static void fts_padjust (FTS *, FTSENT *); +static int fts_palloc (FTS *, size_t); +static FTSENT *fts_sort (FTS *, FTSENT *, int); +static u_short fts_stat (FTS *, FTSENT *, int); +static int fts_safe_changedir (FTS *, FTSENT *, int, char *); #define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) @@ -78,7 +78,7 @@ FTS * fts_open(argv, options, compar) char * const *argv; register int options; - int (*compar) __P((const FTSENT **, const FTSENT **)); + int (*compar) (const FTSENT **, const FTSENT **); { register FTS *sp; register FTSENT *p, *root; diff --git a/lib/libcr/gen/getcap.c b/lib/libcr/gen/getcap.c index 3dbac86aec..d4c0398679 100644 --- a/lib/libcr/gen/getcap.c +++ b/lib/libcr/gen/getcap.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/getcap.c,v 1.11.2.2 2001/01/15 06:48:09 gad Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/getcap.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/getcap.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)getcap.c 8.3 (Berkeley) 3/25/94 */ @@ -65,9 +65,9 @@ static size_t topreclen; /* toprec length */ static char *toprec; /* Additional record specified by cgetset() */ static int gottoprec; /* Flag indicating retrieval of toprecord */ -static int cdbget __P((DB *, char **, char *)); -static int getent __P((char **, u_int *, char **, int, char *, int, char *)); -static int nfcmp __P((char *, char *)); +static int cdbget (DB *, char **, char *); +static int getent (char **, u_int *, char **, int, char *, int, char *); +static int nfcmp (char *, char *); /* * Cgetset() allows the addition of a user specified buffer to be added diff --git a/lib/libcr/gen/getpwent.c b/lib/libcr/gen/getpwent.c index afbdc0d2ae..fabae69a9b 100644 --- a/lib/libcr/gen/getpwent.c +++ b/lib/libcr/gen/getpwent.c @@ -32,7 +32,7 @@ * * @(#)getpwent.c 8.2 (Berkeley) 4/27/95 * $FreeBSD: src/lib/libc/gen/getpwent.c,v 1.53.2.2 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/getpwent.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/getpwent.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ */ #include @@ -49,9 +49,9 @@ #include #include -extern void setnetgrent __P(( char * )); -extern int getnetgrent __P(( char **, char **, char ** )); -extern int innetgr __P(( const char *, const char *, const char *, const char * )); +extern void setnetgrent ( char * ); +extern int getnetgrent ( char **, char **, char ** ); +extern int innetgr ( const char *, const char *, const char *, const char * ); /* * The lookup techniques and data extraction code here must be kept @@ -79,16 +79,16 @@ static char _ypnam[YPMAXRECORD]; #define YP_HAVE_NONE 0 static int _gotmaster; static char *_pw_yp_domain; -static inline int unwind __P(( char * )); -static void _ypinitdb __P(( void )); -static int _havemaster __P((char *)); -static int _getyppass __P((struct passwd *, const char *, const char * )); -static int _nextyppass __P((struct passwd *)); -static inline int lookup __P((const char *)); -static inline void store __P((const char *)); -static inline int ingr __P((const char *, const char*)); -static inline int verf __P((const char *)); -static char * _get_adjunct_pw __P((const char *)); +static inline int unwind ( char * ); +static void _ypinitdb ( void ); +static int _havemaster (char *); +static int _getyppass (struct passwd *, const char *, const char * ); +static int _nextyppass (struct passwd *); +static inline int lookup (const char *); +static inline void store (const char *); +static inline int ingr (const char *, const char*); +static inline int verf (const char *); +static char * _get_adjunct_pw (const char *); #endif static int __hashpw(DBT *); static int __initdb(void); diff --git a/lib/libcr/gen/getttyent.c b/lib/libcr/gen/getttyent.c index 0091ef5b8f..e6934948de 100644 --- a/lib/libcr/gen/getttyent.c +++ b/lib/libcr/gen/getttyent.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/getttyent.c,v 1.11 1999/11/04 04:16:27 ache Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/getttyent.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/getttyent.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)getttyent.c 8.1 (Berkeley) 6/4/93 */ @@ -49,8 +49,8 @@ static char *line; #define MALLOCCHUNK 100 -static char *skip __P((char *)); -static char *value __P((char *)); +static char *skip (char *); +static char *value (char *); struct ttyent * getttynam(tty) diff --git a/lib/libcr/gen/getusershell.c b/lib/libcr/gen/getusershell.c index 7695915848..1677e0a5a8 100644 --- a/lib/libcr/gen/getusershell.c +++ b/lib/libcr/gen/getusershell.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/getusershell.c,v 1.3.2.1 2001/03/05 09:17:52 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/getusershell.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/getusershell.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)getusershell.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gen/getusershell.c,v 1.3.2.1 2001/03/05 09:17:52 obrien Exp $ @@ -54,7 +54,7 @@ static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; static char **curshell, **shells, *strings; -static char **initshells __P((void)); +static char **initshells (void); /* * Get a list of shells from _PATH_SHELLS, if it exists. diff --git a/lib/libcr/gen/nlist.c b/lib/libcr/gen/nlist.c index a03df9f559..8a739485d6 100644 --- a/lib/libcr/gen/nlist.c +++ b/lib/libcr/gen/nlist.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/nlist.c,v 1.12.2.1 2001/07/11 23:59:09 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/nlist.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/nlist.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)nlist.c 8.1 (Berkeley) 6/4/93 */ @@ -55,9 +55,9 @@ #include #endif -int __fdnlist __P((int, struct nlist *)); -int __aout_fdnlist __P((int, struct nlist *)); -int __elf_fdnlist __P((int, struct nlist *)); +int __fdnlist (int, struct nlist *); +int __aout_fdnlist (int, struct nlist *); +int __elf_fdnlist (int, struct nlist *); int nlist(name, list) @@ -75,7 +75,7 @@ nlist(name, list) } static struct nlist_handlers { - int (*fn) __P((int fd, struct nlist *list)); + int (*fn) (int fd, struct nlist *list); } nlist_fn[] = { #ifdef _NLIST_DO_AOUT { __aout_fdnlist }, @@ -199,7 +199,7 @@ __aout_fdnlist(fd, list) #endif #ifdef _NLIST_DO_ELF -static void elf_sym_to_nlist __P((struct nlist *, Elf_Sym *, Elf_Shdr *, int)); +static void elf_sym_to_nlist (struct nlist *, Elf_Sym *, Elf_Shdr *, int); /* * __elf_is_okay__ - Determine if ehdr really diff --git a/lib/libcr/gen/rand48.h b/lib/libcr/gen/rand48.h index b1b7a76b9f..95275dc2b9 100644 --- a/lib/libcr/gen/rand48.h +++ b/lib/libcr/gen/rand48.h @@ -9,7 +9,7 @@ * This software is provided ``as is'', and comes with no warranties * of any kind. I shall in no event be liable for anything that happens * to anyone/anything when using this software. - * $DragonFly: src/lib/libcr/gen/Attic/rand48.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/rand48.h,v 1.3 2003/11/12 20:21:27 eirikn Exp $ */ #ifndef _RAND48_H_ @@ -18,7 +18,7 @@ #include #include -void _dorand48 __P((unsigned short[3])); +void _dorand48 (unsigned short[3]); #define RAND48_SEED_0 (0x330e) #define RAND48_SEED_1 (0xabcd) diff --git a/lib/libcr/gen/rewinddir.c b/lib/libcr/gen/rewinddir.c index 5bd0b1d008..cba544bdb4 100644 --- a/lib/libcr/gen/rewinddir.c +++ b/lib/libcr/gen/rewinddir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/rewinddir.c,v 1.2.8.1 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/rewinddir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/rewinddir.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)rewinddir.c 8.1 (Berkeley) 6/8/93 */ @@ -39,7 +39,7 @@ #include #include -extern void _seekdir __P(( DIR *, long )); +extern void _seekdir ( DIR *, long ); void rewinddir(dirp) diff --git a/lib/libcr/gen/scandir.c b/lib/libcr/gen/scandir.c index d810763f30..8872c7301e 100644 --- a/lib/libcr/gen/scandir.c +++ b/lib/libcr/gen/scandir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/scandir.c,v 1.5.6.1 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/scandir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/scandir.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)scandir.c 8.3 (Berkeley) 1/2/94 */ @@ -64,8 +64,8 @@ int scandir(dirname, namelist, select, dcomp) const char *dirname; struct dirent ***namelist; - int (*select) __P((struct dirent *)); - int (*dcomp) __P((const void *, const void *)); + int (*select) (struct dirent *); + int (*dcomp) (const void *, const void *); { register struct dirent *d, *p, **names = NULL; register size_t nitems = 0; diff --git a/lib/libcr/gen/seekdir.c b/lib/libcr/gen/seekdir.c index 52592bf050..fd675ef64e 100644 --- a/lib/libcr/gen/seekdir.c +++ b/lib/libcr/gen/seekdir.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/seekdir.c,v 1.2.8.1 2001/03/05 09:52:13 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/seekdir.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/seekdir.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)seekdir.c 8.1 (Berkeley) 6/4/93 */ @@ -39,7 +39,7 @@ #include #include -extern void _seekdir __P(( DIR *, long )); +extern void _seekdir ( DIR *, long ); /* * Seek to an entry in a directory. diff --git a/lib/libcr/gen/setmode.c b/lib/libcr/gen/setmode.c index 188d17d758..1f73c2df32 100644 --- a/lib/libcr/gen/setmode.c +++ b/lib/libcr/gen/setmode.c @@ -35,7 +35,7 @@ * * @(#)setmode.c 8.2 (Berkeley) 3/25/94 * $FreeBSD: src/lib/libc/gen/setmode.c,v 1.5.2.1 2001/03/05 09:34:10 obrien Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/setmode.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/setmode.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ */ #include @@ -65,10 +65,10 @@ typedef struct bitcmd { #define CMD2_OBITS 0x08 #define CMD2_UBITS 0x10 -static BITCMD *addcmd __P((BITCMD *, int, int, int, u_int)); -static void compress_mode __P((BITCMD *)); +static BITCMD *addcmd (BITCMD *, int, int, int, u_int); +static void compress_mode (BITCMD *); #ifdef SETMODE_DEBUG -static void dumpmode __P((BITCMD *)); +static void dumpmode (BITCMD *); #endif /* diff --git a/lib/libcr/gen/syslog.c b/lib/libcr/gen/syslog.c index c091fd5e63..b7ffa55f78 100644 --- a/lib/libcr/gen/syslog.c +++ b/lib/libcr/gen/syslog.c @@ -32,7 +32,7 @@ * * @(#)syslog.c 8.5 (Berkeley) 4/29/95 * $FreeBSD: src/lib/libc/gen/syslog.c,v 1.21.2.3 2002/11/18 11:49:55 ru Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/syslog.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/syslog.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ */ #include @@ -65,8 +65,8 @@ static int LogFacility = LOG_USER; /* default facility code */ static int LogMask = 0xff; /* mask of priorities to be logged */ extern char *__progname; /* Program name, from crt0. */ -static void disconnectlog __P((void)); /* disconnect from syslogd */ -static void connectlog __P((void)); /* (re)connect to syslogd */ +static void disconnectlog (void); /* disconnect from syslogd */ +static void connectlog (void); /* (re)connect to syslogd */ /* * Format of the magic cookie passed through the stdio hook diff --git a/lib/libcr/gen/ttyname.c b/lib/libcr/gen/ttyname.c index c0bfeee8c9..4c3cdf5cd9 100644 --- a/lib/libcr/gen/ttyname.c +++ b/lib/libcr/gen/ttyname.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/ttyname.c,v 1.10.6.2 2002/10/15 19:46:46 fjoe Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/ttyname.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/ttyname.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)ttyname.c 8.2 (Berkeley) 1/27/94 */ @@ -155,7 +155,7 @@ ttyname_r(int fd, char *buf, size_t len) } #else static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; -static char *oldttyname __P((int, struct stat *)); +static char *oldttyname (int, struct stat *); char * ttyname(fd) diff --git a/lib/libcr/gmon/gmon.c b/lib/libcr/gmon/gmon.c index 2368d859ee..34eac053cb 100644 --- a/lib/libcr/gmon/gmon.c +++ b/lib/libcr/gmon/gmon.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gmon/gmon.c,v 1.8 2000/01/27 23:06:25 jasone Exp $ - * $DragonFly: src/lib/libcr/gmon/Attic/gmon.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gmon/Attic/gmon.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)gmon.c 8.1 (Berkeley) 6/4/93 */ @@ -63,8 +63,8 @@ static int s_scale; #define ERR(s) _write(2, s, sizeof(s)) -void moncontrol __P((int)); -static int hertz __P((void)); +void moncontrol (int); +static int hertz (void); void monstartup(lowpc, highpc) diff --git a/lib/libcr/gmon/mcount.c b/lib/libcr/gmon/mcount.c index 3b005a62e8..ac3d5672ab 100644 --- a/lib/libcr/gmon/mcount.c +++ b/lib/libcr/gmon/mcount.c @@ -32,7 +32,7 @@ * * @(#)mcount.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/gmon/mcount.c,v 1.17 1999/12/29 05:04:13 peter Exp $ - * $DragonFly: src/lib/libcr/gmon/Attic/mcount.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gmon/Attic/mcount.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ */ #include @@ -42,10 +42,10 @@ #include #include #include -void bintr __P((void)); -void btrap __P((void)); -void eintr __P((void)); -void user __P((void)); +void bintr (void); +void btrap (void); +void eintr (void); +void user (void); #endif /* diff --git a/lib/libcr/include/spinlock.h b/lib/libcr/include/spinlock.h index deb20e7196..7377cf106b 100644 --- a/lib/libcr/include/spinlock.h +++ b/lib/libcr/include/spinlock.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/include/spinlock.h,v 1.4 1999/08/27 23:59:48 peter Exp $ - * $DragonFly: src/lib/libcr/include/Attic/spinlock.h,v 1.2 2003/06/17 04:26:43 dillon Exp $ + * $DragonFly: src/lib/libcr/include/Attic/spinlock.h,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * Lock definitions used in both libc and libpthread. * @@ -64,9 +64,9 @@ typedef struct { * Thread function prototype definitions: */ __BEGIN_DECLS -long _atomic_lock __P((volatile long *)); -void _spinlock __P((spinlock_t *)); -void _spinlock_debug __P((spinlock_t *, char *, int)); +long _atomic_lock (volatile long *); +void _spinlock (spinlock_t *); +void _spinlock_debug (spinlock_t *, char *, int); __END_DECLS #endif /* _SPINLOCK_H_ */ diff --git a/lib/libcr/locale/big5.c b/lib/libcr/locale/big5.c index c496988768..aa556188d9 100644 --- a/lib/libcr/locale/big5.c +++ b/lib/libcr/locale/big5.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/big5.c,v 1.3.2.2 2001/03/05 10:02:54 obrien Exp $ - * $DragonFly: src/lib/libcr/locale/Attic/big5.c,v 1.2 2003/06/17 04:26:43 dillon Exp $ + * $DragonFly: src/lib/libcr/locale/Attic/big5.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)big5.c 8.1 (Berkeley) 6/4/93 */ @@ -45,8 +45,8 @@ #include #include -rune_t _BIG5_sgetrune __P((const char *, size_t, char const **)); -int _BIG5_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _BIG5_sgetrune (const char *, size_t, char const **); +int _BIG5_sputrune (rune_t, char *, size_t, char **); int _BIG5_init(rl) diff --git a/lib/libcr/locale/mskanji.c b/lib/libcr/locale/mskanji.c index 61f54bc64c..d95a9851c2 100644 --- a/lib/libcr/locale/mskanji.c +++ b/lib/libcr/locale/mskanji.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/mskanji.c,v 1.2.8.2 2001/03/05 10:22:45 obrien Exp $ - * $DragonFly: src/lib/libcr/locale/Attic/mskanji.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/locale/Attic/mskanji.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)mskanji.c 1.0 (Phase One) 5/5/95 */ @@ -43,8 +43,8 @@ #include #include -rune_t _MSKanji_sgetrune __P((const char *, size_t, char const **)); -int _MSKanji_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _MSKanji_sgetrune (const char *, size_t, char const **); +int _MSKanji_sputrune (rune_t, char *, size_t, char **); int _MSKanji_init(rl) diff --git a/lib/libcr/locale/none.c b/lib/libcr/locale/none.c index 6ba5bc4838..8cde58caaf 100644 --- a/lib/libcr/locale/none.c +++ b/lib/libcr/locale/none.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/none.c,v 1.2.8.1 2001/03/05 10:25:03 obrien Exp $ - * $DragonFly: src/lib/libcr/locale/Attic/none.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/locale/Attic/none.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)none.c 8.1 (Berkeley) 6/4/93 */ @@ -44,8 +44,8 @@ #include #include -rune_t _none_sgetrune __P((const char *, size_t, char const **)); -int _none_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _none_sgetrune (const char *, size_t, char const **); +int _none_sputrune (rune_t, char *, size_t, char **); int _none_init(rl) diff --git a/lib/libcr/locale/table.c b/lib/libcr/locale/table.c index da61c09def..7af3afc92d 100644 --- a/lib/libcr/locale/table.c +++ b/lib/libcr/locale/table.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/table.c,v 1.13.2.1 2000/06/04 21:47:39 ache Exp $ - * $DragonFly: src/lib/libcr/locale/Attic/table.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/locale/Attic/table.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)table.c 8.1 (Berkeley) 6/27/93 */ @@ -42,9 +42,9 @@ #include #include -extern rune_t _none_sgetrune __P((const char *, size_t, char const **)); -extern int _none_sputrune __P((rune_t, char *, size_t, char **)); -extern int _none_init __P((char *, char **)); +extern rune_t _none_sgetrune (const char *, size_t, char const **); +extern int _none_sputrune (rune_t, char *, size_t, char **); +extern int _none_init (char *, char **); _RuneLocale _DefaultRuneLocale = { _RUNE_MAGIC_1, diff --git a/lib/libcr/locale/utf2.c b/lib/libcr/locale/utf2.c index 85901058cb..33ec727948 100644 --- a/lib/libcr/locale/utf2.c +++ b/lib/libcr/locale/utf2.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/locale/utf2.c,v 1.3.2.2 2001/03/05 10:27:18 obrien Exp $ - * $DragonFly: src/lib/libcr/locale/Attic/utf2.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/locale/Attic/utf2.c,v 1.3 2003/11/12 20:21:27 eirikn Exp $ * * @(#)utf2.c 8.1 (Berkeley) 6/4/93 */ @@ -44,8 +44,8 @@ #include #include -rune_t _UTF2_sgetrune __P((const char *, size_t, char const **)); -int _UTF2_sputrune __P((rune_t, char *, size_t, char **)); +rune_t _UTF2_sgetrune (const char *, size_t, char const **); +int _UTF2_sputrune (rune_t, char *, size_t, char **); static int _utf_count[16] = { 1, 1, 1, 1, 1, 1, 1, 1, diff --git a/lib/libcr/net/getaddrinfo.c b/lib/libcr/net/getaddrinfo.c index 655edcf357..f7ad009773 100644 --- a/lib/libcr/net/getaddrinfo.c +++ b/lib/libcr/net/getaddrinfo.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.9.2.14 2002/11/08 17:49:31 ume Exp $ */ -/* $DragonFly: src/lib/libcr/net/Attic/getaddrinfo.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ */ +/* $DragonFly: src/lib/libcr/net/Attic/getaddrinfo.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */ /* @@ -184,44 +184,44 @@ struct res_target { int n; /* result length */ }; -static int str_isnumber __P((const char *)); -static int explore_fqdn __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int explore_null __P((const struct addrinfo *, - const char *, struct addrinfo **)); -static int explore_numeric __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int explore_numeric_scope __P((const struct addrinfo *, const char *, - const char *, struct addrinfo **)); -static int get_canonname __P((const struct addrinfo *, - struct addrinfo *, const char *)); -static struct addrinfo *get_ai __P((const struct addrinfo *, - const struct afd *, const char *)); -static int get_portmatch __P((const struct addrinfo *, const char *)); -static int get_port __P((struct addrinfo *, const char *, int)); -static const struct afd *find_afd __P((int)); -static int addrconfig __P((struct addrinfo *)); +static int str_isnumber (const char *); +static int explore_fqdn (const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int explore_null (const struct addrinfo *, + const char *, struct addrinfo **); +static int explore_numeric (const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int explore_numeric_scope (const struct addrinfo *, const char *, + const char *, struct addrinfo **); +static int get_canonname (const struct addrinfo *, + struct addrinfo *, const char *); +static struct addrinfo *get_ai (const struct addrinfo *, + const struct afd *, const char *); +static int get_portmatch (const struct addrinfo *, const char *); +static int get_port (struct addrinfo *, const char *, int); +static const struct afd *find_afd (int); +static int addrconfig (struct addrinfo *); #ifdef INET6 -static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *, u_int32_t *)); +static int ip6_str2scopeid (char *, struct sockaddr_in6 *, u_int32_t *); #endif -static struct addrinfo *getanswer __P((const querybuf *, int, const char *, - int, const struct addrinfo *)); -static int _dns_getaddrinfo __P((const struct addrinfo *, const char *, - struct addrinfo **)); -static struct addrinfo *_gethtent __P((FILE *fp, const char *, - const struct addrinfo *)); -static int _files_getaddrinfo __P((const struct addrinfo *, const char *, - struct addrinfo **)); +static struct addrinfo *getanswer (const querybuf *, int, const char *, + int, const struct addrinfo *); +static int _dns_getaddrinfo (const struct addrinfo *, const char *, + struct addrinfo **); +static struct addrinfo *_gethtent (FILE *fp, const char *, + const struct addrinfo *); +static int _files_getaddrinfo (const struct addrinfo *, const char *, + struct addrinfo **); #ifdef YP -static int _nis_getaddrinfo __P((const struct addrinfo *, const char *, - struct addrinfo **)); +static int _nis_getaddrinfo (const struct addrinfo *, const char *, + struct addrinfo **); #endif -static int res_queryN __P((const char *, struct res_target *)); -static int res_searchN __P((const char *, struct res_target *)); -static int res_querydomainN __P((const char *, const char *, - struct res_target *)); +static int res_queryN (const char *, struct res_target *); +static int res_searchN (const char *, struct res_target *); +static int res_querydomainN (const char *, const char *, + struct res_target *); static char *ai_errlist[] = { "Success", @@ -1295,7 +1295,7 @@ getanswer(answer, anslen, qname, qtype, pai) int type, class, ancount, qdcount; int haveanswer, had_error; char tbuf[MAXDNAME]; - int (*name_ok) __P((const char *)); + int (*name_ok) (const char *); char hostbuf[8*1024]; memset(&sentinel, 0, sizeof(sentinel)); @@ -1759,7 +1759,7 @@ free: /* resolver logic */ -extern const char *__hostalias __P((const char *)); +extern const char *__hostalias (const char *); extern int h_errno; /* diff --git a/lib/libcr/net/gethostbydns.c b/lib/libcr/net/gethostbydns.c index 51ac7c1e59..9ffcd9d10f 100644 --- a/lib/libcr/net/gethostbydns.c +++ b/lib/libcr/net/gethostbydns.c @@ -55,7 +55,7 @@ * @(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93 * $From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $ * $FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.27.2.5 2002/11/02 18:54:57 ume Exp $ - * $DragonFly: src/lib/libcr/net/Attic/gethostbydns.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/gethostbydns.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -93,7 +93,7 @@ static char hostbuf[8*1024]; static u_char host_addr[16]; /* IPv4 or IPv6 */ #ifdef RESOLVSORT -static void addrsort __P((char **, int)); +static void addrsort (char **, int); #endif #define MAXPACKET (64*1024) @@ -162,7 +162,7 @@ gethostanswer(answer, anslen, qname, qtype) int toobig = 0; char tbuf[MAXDNAME]; const char *tname; - int (*name_ok) __P((const char *)); + int (*name_ok) (const char *); tname = qname; host.h_name = NULL; diff --git a/lib/libcr/net/getnameinfo.c b/lib/libcr/net/getnameinfo.c index 154f1ee314..cccab9f91b 100644 --- a/lib/libcr/net/getnameinfo.c +++ b/lib/libcr/net/getnameinfo.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.4.2.5 2002/07/31 10:11:09 ume Exp $ */ -/* $DragonFly: src/lib/libcr/net/Attic/getnameinfo.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ */ +/* $DragonFly: src/lib/libcr/net/Attic/getnameinfo.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */ /* @@ -79,9 +79,9 @@ struct sockinet { }; #ifdef INET6 -static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *, - size_t, int)); -static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int)); +static int ip6_parsenumeric (const struct sockaddr *, const char *, char *, + size_t, int); +static int ip6_sa2str (const struct sockaddr_in6 *, char *, size_t, int); #endif int diff --git a/lib/libcr/net/getservent.c b/lib/libcr/net/getservent.c index 17705b45d0..e69e7948d7 100644 --- a/lib/libcr/net/getservent.c +++ b/lib/libcr/net/getservent.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)getservent.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libcr/net/Attic/getservent.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libcr/net/Attic/getservent.c,v 1.4 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -45,7 +45,7 @@ #include #include static int serv_stepping_yp = 0; -extern int _yp_check __P(( char ** )); +extern int _yp_check ( char ** ); #endif diff --git a/lib/libcr/net/inet_net_ntop.c b/lib/libcr/net/inet_net_ntop.c index 7b57779f1e..d4ea912b67 100644 --- a/lib/libcr/net/inet_net_ntop.c +++ b/lib/libcr/net/inet_net_ntop.c @@ -15,7 +15,7 @@ * SOFTWARE. * * $FreeBSD: src/lib/libc/net/inet_net_ntop.c,v 1.5 1999/08/28 00:00:10 peter Exp $ - * $DragonFly: src/lib/libcr/net/Attic/inet_net_ntop.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/inet_net_ntop.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -34,8 +34,8 @@ # define SPRINTF(x) ((size_t)sprintf x) #endif -static char * inet_net_ntop_ipv4 __P((const u_char *src, int bits, - char *dst, size_t size)); +static char * inet_net_ntop_ipv4 (const u_char *src, int bits, + char *dst, size_t size); /* * char * diff --git a/lib/libcr/net/inet_net_pton.c b/lib/libcr/net/inet_net_pton.c index 6840a42eab..7bb9fa10bd 100644 --- a/lib/libcr/net/inet_net_pton.c +++ b/lib/libcr/net/inet_net_pton.c @@ -16,7 +16,7 @@ * * $From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $ * $FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.6 1999/08/28 00:00:10 peter Exp $ - * $DragonFly: src/lib/libcr/net/Attic/inet_net_pton.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/inet_net_pton.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -37,8 +37,8 @@ # define SPRINTF(x) ((size_t)sprintf x) #endif -static int inet_net_pton_ipv4 __P((const char *src, u_char *dst, - size_t size)); +static int inet_net_pton_ipv4 (const char *src, u_char *dst, + size_t size); /* * static int diff --git a/lib/libcr/net/inet_ntop.c b/lib/libcr/net/inet_ntop.c index 5f3b5efba0..3cf26f5f34 100644 --- a/lib/libcr/net/inet_ntop.c +++ b/lib/libcr/net/inet_ntop.c @@ -14,7 +14,7 @@ * SOFTWARE. * * $FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.6.2.2 2002/12/16 15:19:35 robert Exp $ - * $DragonFly: src/lib/libcr/net/Attic/inet_ntop.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/inet_ntop.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -32,8 +32,8 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size)); -static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size)); +static const char *inet_ntop4 (const u_char *src, char *dst, size_t size); +static const char *inet_ntop6 (const u_char *src, char *dst, size_t size); /* char * * inet_ntop(af, src, dst, size) diff --git a/lib/libcr/net/inet_pton.c b/lib/libcr/net/inet_pton.c index 4d9dba922e..f61363ddc7 100644 --- a/lib/libcr/net/inet_pton.c +++ b/lib/libcr/net/inet_pton.c @@ -16,7 +16,7 @@ * SOFTWARE. * * $FreeBSD: src/lib/libc/net/inet_pton.c,v 1.6.2.1 2002/04/28 05:40:24 suz Exp $ - * $DragonFly: src/lib/libcr/net/Attic/inet_pton.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/inet_pton.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -33,8 +33,8 @@ * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static int inet_pton4 __P((const char *src, u_char *dst)); -static int inet_pton6 __P((const char *src, u_char *dst)); +static int inet_pton4 (const char *src, u_char *dst); +static int inet_pton6 (const char *src, u_char *dst); /* int * inet_pton(af, src, dst) diff --git a/lib/libcr/net/name6.c b/lib/libcr/net/name6.c index f3083166b4..6de935506e 100644 --- a/lib/libcr/net/name6.c +++ b/lib/libcr/net/name6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libc/net/name6.c,v 1.6.2.9 2002/11/02 18:54:57 ume Exp $ */ -/* $DragonFly: src/lib/libcr/net/Attic/name6.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ */ +/* $DragonFly: src/lib/libcr/net/Attic/name6.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */ /* @@ -1025,8 +1025,8 @@ typedef union { u_char buf[MAXPACKET]; } querybuf; -static struct hostent *getanswer __P((const querybuf *, int, const char *, - int, struct hostent *, int *)); +static struct hostent *getanswer (const querybuf *, int, const char *, + int, struct hostent *, int *); /* * we don't need to take care about sorting, nor IPv4 mapped address here. @@ -1049,7 +1049,7 @@ getanswer(answer, anslen, qname, qtype, template, errp) int haveanswer, had_error; char tbuf[MAXDNAME]; const char *tname; - int (*name_ok) __P((const char *)); + int (*name_ok) (const char *); static char *h_addr_ptrs[MAXADDRS + 1]; static char *host_aliases[MAXALIASES]; static char hostbuf[8*1024]; diff --git a/lib/libcr/net/rcmd.c b/lib/libcr/net/rcmd.c index 664a819855..77e218fb9a 100644 --- a/lib/libcr/net/rcmd.c +++ b/lib/libcr/net/rcmd.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/net/rcmd.c,v 1.23.2.7 2002/08/26 16:17:49 jdp Exp $ - * $DragonFly: src/lib/libcr/net/Attic/rcmd.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/rcmd.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ * * @(#)rcmd.c 8.3 (Berkeley) 3/26/94 */ @@ -65,17 +65,17 @@ #define NI_WITHSCOPEID 0 #endif -extern int innetgr __P(( const char *, const char *, const char *, const char * )); +extern int innetgr ( const char *, const char *, const char *, const char * ); #define max(a, b) ((a > b) ? a : b) -int __ivaliduser __P((FILE *, u_int32_t, const char *, const char *)); -int __ivaliduser_af __P((FILE *,const void *, const char *, const char *, - int, int)); -int __ivaliduser_sa __P((FILE *, const struct sockaddr *, socklen_t, - const char *,const char *)); -static int __icheckhost __P((const struct sockaddr *, socklen_t, - const char *)); +int __ivaliduser (FILE *, u_int32_t, const char *, const char *); +int __ivaliduser_af (FILE *,const void *, const char *, const char *, + int, int); +int __ivaliduser_sa (FILE *, const struct sockaddr *, socklen_t, + const char *,const char *); +static int __icheckhost (const struct sockaddr *, socklen_t, + const char *); char paddr[NI_MAXHOST]; diff --git a/lib/libcr/net/res_init.c b/lib/libcr/net/res_init.c index b03c9c3715..0a4c97bfa7 100644 --- a/lib/libcr/net/res_init.c +++ b/lib/libcr/net/res_init.c @@ -33,7 +33,7 @@ * @(#)res_init.c 8.1 (Berkeley) 6/7/93 * $From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $ * $FreeBSD: src/lib/libc/net/res_init.c,v 1.19.2.7 2002/02/04 18:30:55 ume Exp $ - * $DragonFly: src/lib/libcr/net/Attic/res_init.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/res_init.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -90,12 +90,12 @@ #include "res_config.h" -static void res_setoptions __P((char *, char *)); +static void res_setoptions (char *, char *); #ifdef RESOLVSORT static const char sort_mask[] = "/&"; #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL) -static u_int32_t net_mask __P((struct in_addr)); +static u_int32_t net_mask (struct in_addr); #endif #if !defined(isascii) /* XXX - could be a function */ diff --git a/lib/libcr/net/res_send.c b/lib/libcr/net/res_send.c index 40f26e44ab..7b6664e17c 100644 --- a/lib/libcr/net/res_send.c +++ b/lib/libcr/net/res_send.c @@ -33,7 +33,7 @@ * @(#)res_send.c 8.1 (Berkeley) 6/4/93 * $From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $ * $FreeBSD: src/lib/libc/net/res_send.c,v 1.31.2.9 2002/04/11 17:30:24 ume Exp $ - * $DragonFly: src/lib/libcr/net/Attic/res_send.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/net/Attic/res_send.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -121,8 +121,8 @@ static res_send_rhook Rhook = NULL; } else {} static char abuf[NI_MAXHOST]; static char pbuf[NI_MAXSERV]; -static void Aerror __P((FILE *, char *, int, struct sockaddr *)); -static void Perror __P((FILE *, char *, int)); +static void Aerror (FILE *, char *, int, struct sockaddr *); +static void Perror (FILE *, char *, int); static void Aerror(file, string, error, address) @@ -177,7 +177,7 @@ res_send_setrhook(hook) Rhook = hook; } -static struct sockaddr * get_nsaddr __P((size_t)); +static struct sockaddr * get_nsaddr (size_t); /* * pick appropriate nsaddr_list for use. see res_init() for initialization. diff --git a/lib/libcr/quad/quad.h b/lib/libcr/quad/quad.h index 2367edfd22..ee17a3c3ad 100644 --- a/lib/libcr/quad/quad.h +++ b/lib/libcr/quad/quad.h @@ -36,7 +36,7 @@ * * @(#)quad.h 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/quad/quad.h,v 1.5 1999/08/28 00:00:29 peter Exp $ - * $DragonFly: src/lib/libcr/quad/Attic/quad.h,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/quad/Attic/quad.h,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -97,11 +97,11 @@ union uu { #define LHALF(x) ((x) & ((1 << HALF_BITS) - 1)) #define LHUP(x) ((x) << HALF_BITS) -quad_t __divdi3 __P((quad_t a, quad_t b)); -quad_t __moddi3 __P((quad_t a, quad_t b)); -u_quad_t __qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem)); -u_quad_t __udivdi3 __P((u_quad_t a, u_quad_t b)); -u_quad_t __umoddi3 __P((u_quad_t a, u_quad_t b)); +quad_t __divdi3 (quad_t a, quad_t b); +quad_t __moddi3 (quad_t a, quad_t b); +u_quad_t __qdivrem (u_quad_t u, u_quad_t v, u_quad_t *rem); +u_quad_t __udivdi3 (u_quad_t a, u_quad_t b); +u_quad_t __umoddi3 (u_quad_t a, u_quad_t b); /* * XXX diff --git a/lib/libcr/regex/engine.c b/lib/libcr/regex/engine.c index ea137e59dc..325bd47dfa 100644 --- a/lib/libcr/regex/engine.c +++ b/lib/libcr/regex/engine.c @@ -37,7 +37,7 @@ * @(#)engine.c 8.5 (Berkeley) 3/20/94 * * $FreeBSD: src/lib/libc/regex/engine.c,v 1.5.8.1 2000/07/31 06:30:37 dcs Exp $ - * $DragonFly: src/lib/libcr/regex/Attic/engine.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/regex/Attic/engine.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -93,12 +93,12 @@ extern "C" { #endif /* === engine.c === */ -static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags)); -static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev)); -static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft)); +static int matcher (struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags); +static char *dissect (struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static char *backref (struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev); +static char *fast (struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static char *slow (struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static states step (struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft); #define BOL (OUT+1) #define EOL (BOL+1) #define BOLEOL (BOL+2) @@ -109,13 +109,13 @@ static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, #define NONCHAR(c) ((c) > CHAR_MAX) #define NNONCHAR (CODEMAX-CHAR_MAX) #ifdef REDEBUG -static void print __P((struct match *m, char *caption, states st, int ch, FILE *d)); +static void print (struct match *m, char *caption, states st, int ch, FILE *d); #endif #ifdef REDEBUG -static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst)); +static void at (struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst); #endif #ifdef REDEBUG -static char *pchar __P((int ch)); +static char *pchar (int ch); #endif #ifdef __cplusplus diff --git a/lib/libcr/regex/regcomp.c b/lib/libcr/regex/regcomp.c index 6aa70379dd..6d0629c6c7 100644 --- a/lib/libcr/regex/regcomp.c +++ b/lib/libcr/regex/regcomp.c @@ -37,7 +37,7 @@ * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 * * $FreeBSD: src/lib/libc/regex/regcomp.c,v 1.13.2.2 2002/03/20 13:13:15 dcs Exp $ - * $DragonFly: src/lib/libcr/regex/Attic/regcomp.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/regex/Attic/regcomp.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ * * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 */ @@ -82,51 +82,51 @@ extern "C" { #endif /* === regcomp.c === */ -static void p_ere __P((struct parse *p, int stop)); -static void p_ere_exp __P((struct parse *p)); -static void p_str __P((struct parse *p)); -static void p_bre __P((struct parse *p, int end1, int end2)); -static int p_simp_re __P((struct parse *p, int starordinary)); -static int p_count __P((struct parse *p)); -static void p_bracket __P((struct parse *p)); -static void p_b_term __P((struct parse *p, cset *cs)); -static void p_b_cclass __P((struct parse *p, cset *cs)); -static void p_b_eclass __P((struct parse *p, cset *cs)); -static char p_b_symbol __P((struct parse *p)); -static char p_b_coll_elem __P((struct parse *p, int endc)); -static char othercase __P((int ch)); -static void bothcases __P((struct parse *p, int ch)); -static void ordinary __P((struct parse *p, int ch)); -static void nonnewline __P((struct parse *p)); -static void repeat __P((struct parse *p, sopno start, int from, int to)); -static int seterr __P((struct parse *p, int e)); -static cset *allocset __P((struct parse *p)); -static void freeset __P((struct parse *p, cset *cs)); -static int freezeset __P((struct parse *p, cset *cs)); -static int firstch __P((struct parse *p, cset *cs)); -static int nch __P((struct parse *p, cset *cs)); -static void mcadd __P((struct parse *p, cset *cs, char *cp)); +static void p_ere (struct parse *p, int stop); +static void p_ere_exp (struct parse *p); +static void p_str (struct parse *p); +static void p_bre (struct parse *p, int end1, int end2); +static int p_simp_re (struct parse *p, int starordinary); +static int p_count (struct parse *p); +static void p_bracket (struct parse *p); +static void p_b_term (struct parse *p, cset *cs); +static void p_b_cclass (struct parse *p, cset *cs); +static void p_b_eclass (struct parse *p, cset *cs); +static char p_b_symbol (struct parse *p); +static char p_b_coll_elem (struct parse *p, int endc); +static char othercase (int ch); +static void bothcases (struct parse *p, int ch); +static void ordinary (struct parse *p, int ch); +static void nonnewline (struct parse *p); +static void repeat (struct parse *p, sopno start, int from, int to); +static int seterr (struct parse *p, int e); +static cset *allocset (struct parse *p); +static void freeset (struct parse *p, cset *cs); +static int freezeset (struct parse *p, cset *cs); +static int firstch (struct parse *p, cset *cs); +static int nch (struct parse *p, cset *cs); +static void mcadd (struct parse *p, cset *cs, char *cp); #if used -static void mcsub __P((cset *cs, char *cp)); -static int mcin __P((cset *cs, char *cp)); -static char *mcfind __P((cset *cs, char *cp)); +static void mcsub (cset *cs, char *cp); +static int mcin (cset *cs, char *cp); +static char *mcfind (cset *cs, char *cp); #endif -static void mcinvert __P((struct parse *p, cset *cs)); -static void mccase __P((struct parse *p, cset *cs)); -static int isinsets __P((struct re_guts *g, int c)); -static int samesets __P((struct re_guts *g, int c1, int c2)); -static void categorize __P((struct parse *p, struct re_guts *g)); -static sopno dupl __P((struct parse *p, sopno start, sopno finish)); -static void doemit __P((struct parse *p, sop op, size_t opnd)); -static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos)); -static void dofwd __P((struct parse *p, sopno pos, sop value)); -static void enlarge __P((struct parse *p, sopno size)); -static void stripsnug __P((struct parse *p, struct re_guts *g)); -static void findmust __P((struct parse *p, struct re_guts *g)); -static int altoffset __P((sop *scan, int offset, int mccs)); -static void computejumps __P((struct parse *p, struct re_guts *g)); -static void computematchjumps __P((struct parse *p, struct re_guts *g)); -static sopno pluscount __P((struct parse *p, struct re_guts *g)); +static void mcinvert (struct parse *p, cset *cs); +static void mccase (struct parse *p, cset *cs); +static int isinsets (struct re_guts *g, int c); +static int samesets (struct re_guts *g, int c1, int c2); +static void categorize (struct parse *p, struct re_guts *g); +static sopno dupl (struct parse *p, sopno start, sopno finish); +static void doemit (struct parse *p, sop op, size_t opnd); +static void doinsert (struct parse *p, sop op, size_t opnd, sopno pos); +static void dofwd (struct parse *p, sopno pos, sop value); +static void enlarge (struct parse *p, sopno size); +static void stripsnug (struct parse *p, struct re_guts *g); +static void findmust (struct parse *p, struct re_guts *g); +static int altoffset (sop *scan, int offset, int mccs); +static void computejumps (struct parse *p, struct re_guts *g); +static void computematchjumps (struct parse *p, struct re_guts *g); +static sopno pluscount (struct parse *p, struct re_guts *g); #ifdef __cplusplus } diff --git a/lib/libcr/regex/regerror.c b/lib/libcr/regex/regerror.c index be9b402340..2f23c9c09f 100644 --- a/lib/libcr/regex/regerror.c +++ b/lib/libcr/regex/regerror.c @@ -37,7 +37,7 @@ * @(#)regerror.c 8.4 (Berkeley) 3/20/94 * * @(#)regerror.c 8.4 (Berkeley) 3/20/94 - * $DragonFly: src/lib/libcr/regex/Attic/regerror.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libcr/regex/Attic/regerror.c,v 1.4 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -55,7 +55,7 @@ extern "C" { #endif /* === regerror.c === */ -static char *regatoi __P((const regex_t *preg, char *localbuf)); +static char *regatoi (const regex_t *preg, char *localbuf); #ifdef __cplusplus } diff --git a/lib/libcr/rpc/auth_des.c b/lib/libcr/rpc/auth_des.c index e046c818f8..f4da61c983 100644 --- a/lib/libcr/rpc/auth_des.c +++ b/lib/libcr/rpc/auth_des.c @@ -28,7 +28,7 @@ * * @(#)auth_des.c 2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.3 1999/08/28 00:00:32 peter Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/auth_des.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/auth_des.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* * Copyright (c) 1988 by Sun Microsystems, Inc. @@ -50,11 +50,11 @@ #undef NIS #include -extern bool_t __rpc_get_time_offset __P(( struct timeval *, nis_server *, - char *, char **, struct sockaddr_in * )); -extern int rtime __P(( struct sockaddr_in *, struct timeval *, struct timeval *)); -extern bool_t xdr_authdes_cred __P(( XDR *, struct authdes_cred * )); -extern bool_t xdr_authdes_verf __P(( XDR *, struct authdes_verf * )); +extern bool_t __rpc_get_time_offset ( struct timeval *, nis_server *, + char *, char **, struct sockaddr_in * ); +extern int rtime ( struct sockaddr_in *, struct timeval *, struct timeval *); +extern bool_t xdr_authdes_cred ( XDR *, struct authdes_cred * ); +extern bool_t xdr_authdes_verf ( XDR *, struct authdes_verf * ); #define MILLION 1000000L #define RTIME_TIMEOUT 5 /* seconds to wait for sync */ @@ -82,7 +82,7 @@ static struct auth_ops authdes_ops = { authdes_destroy }; #ifdef foo -static bool_t synchronize __P(( struct sockaddr *, struct timeval *)); +static bool_t synchronize ( struct sockaddr *, struct timeval *); #endif /* * This struct is pointed to by the ah_private field of an "AUTH *" diff --git a/lib/libcr/rpc/des_crypt.c b/lib/libcr/rpc/des_crypt.c index cddcf05084..44e28da487 100644 --- a/lib/libcr/rpc/des_crypt.c +++ b/lib/libcr/rpc/des_crypt.c @@ -28,7 +28,7 @@ * * @(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.3 1999/08/28 00:00:38 peter Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/des_crypt.c,v 1.2 2003/06/17 04:26:44 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/des_crypt.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* * des_crypt.c, DES encryption library routines @@ -39,9 +39,9 @@ #include #include -static int common_crypt __P(( char *, char *, register unsigned, unsigned, struct desparams * )); +static int common_crypt ( char *, char *, register unsigned, unsigned, struct desparams * ); int (*__des_crypt_LOCAL)() = 0; -extern _des_crypt_call __P(( char *, int, struct desparams * )); +extern _des_crypt_call ( char *, int, struct desparams * ); /* * Copy 8 bytes */ diff --git a/lib/libcr/rpc/key_call.c b/lib/libcr/rpc/key_call.c index fbe4b40ec7..5d5308ad15 100644 --- a/lib/libcr/rpc/key_call.c +++ b/lib/libcr/rpc/key_call.c @@ -30,7 +30,7 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. * * $FreeBSD: src/lib/libc/rpc/key_call.c,v 1.3 2000/01/27 23:06:39 jasone Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/key_call.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/key_call.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #ident "@(#)key_call.c 1.25 94/04/24 SMI" @@ -82,7 +82,7 @@ cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; des_block *(*__key_gendes_LOCAL)() = 0; -static int key_call __P(( u_long, xdrproc_t, char *, xdrproc_t, char * )); +static int key_call ( u_long, xdrproc_t, char *, xdrproc_t, char * ); int key_setsecret(secretkey) diff --git a/lib/libcr/rpc/netnamer.c b/lib/libcr/rpc/netnamer.c index 7d34666885..6e19097f55 100644 --- a/lib/libcr/rpc/netnamer.c +++ b/lib/libcr/rpc/netnamer.c @@ -28,7 +28,7 @@ * Mountain View, California 94043 * * $FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.3.6.1 2000/09/20 04:43:11 jkh Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/netnamer.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/netnamer.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ * * @(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro */ @@ -57,8 +57,8 @@ static char *OPSYS = "unix"; static char *NETID = "netid.byname"; static char *NETIDFILE = "/etc/netid"; -static int getnetid __P(( char *, char * )); -static int _getgroups __P(( char *, gid_t * )); +static int getnetid ( char *, char * ); +static int _getgroups ( char *, gid_t * ); #ifndef NGROUPS #define NGROUPS 16 diff --git a/lib/libcr/rpc/rtime.c b/lib/libcr/rpc/rtime.c index 6ffa5200ce..7a67d43b9c 100644 --- a/lib/libcr/rpc/rtime.c +++ b/lib/libcr/rpc/rtime.c @@ -28,7 +28,7 @@ * * @(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI * $FreeBSD: src/lib/libc/rpc/rtime.c,v 1.5 2000/01/27 23:06:41 jasone Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/rtime.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/rtime.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -56,12 +56,12 @@ #include #include -extern int _rpc_dtablesize __P(( void )); +extern int _rpc_dtablesize ( void ); #define NYEARS (unsigned long)(1970 - 1900) #define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4))) -static void do_close __P(( int )); +static void do_close ( int ); int rtime(addrp, timep, timeout) diff --git a/lib/libcr/rpc/svc_udp.c b/lib/libcr/rpc/svc_udp.c index bafcaabd3f..b370839819 100644 --- a/lib/libcr/rpc/svc_udp.c +++ b/lib/libcr/rpc/svc_udp.c @@ -29,7 +29,7 @@ * @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro * @(#)svc_udp.c 2.2 88/07/29 4.0 RPCSRC * $FreeBSD: src/lib/libc/rpc/svc_udp.c,v 1.13 2000/01/27 23:06:41 jasone Exp $ - * $DragonFly: src/lib/libcr/rpc/Attic/svc_udp.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/rpc/Attic/svc_udp.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -57,8 +57,8 @@ static enum xprt_stat svcudp_stat(); static bool_t svcudp_getargs(); static bool_t svcudp_freeargs(); static void svcudp_destroy(); -static void cache_set __P((SVCXPRT *, u_long)); -static int cache_get __P((SVCXPRT *, struct rpc_msg *, char **, u_long *)); +static void cache_set (SVCXPRT *, u_long); +static int cache_get (SVCXPRT *, struct rpc_msg *, char **, u_long *); static struct xp_ops svcudp_op = { svcudp_recv, diff --git a/lib/libcr/stdio/findfp.c b/lib/libcr/stdio/findfp.c index 0a71893707..ca75bfd5f3 100644 --- a/lib/libcr/stdio/findfp.c +++ b/lib/libcr/stdio/findfp.c @@ -35,7 +35,7 @@ * * @(#)findfp.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/lib/libc/stdio/findfp.c,v 1.7.2.3 2001/08/17 02:56:31 peter Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/findfp.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/findfp.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -81,7 +81,7 @@ FILE *__stdinp = &__sF[0]; FILE *__stdoutp = &__sF[1]; FILE *__stderrp = &__sF[2]; -static struct glue * moreglue __P((int)); +static struct glue * moreglue (int); static spinlock_t thread_lock = _SPINLOCK_INITIALIZER; #define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock) diff --git a/lib/libcr/stdio/fseek.c b/lib/libcr/stdio/fseek.c index aa4f657f8d..fe555b4d4a 100644 --- a/lib/libcr/stdio/fseek.c +++ b/lib/libcr/stdio/fseek.c @@ -35,7 +35,7 @@ * * @(#)fseek.c 8.3 (Berkeley) 1/2/94 * $FreeBSD: src/lib/libc/stdio/fseek.c,v 1.9.2.1 2001/03/05 10:56:58 obrien Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/fseek.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/fseek.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -68,7 +68,7 @@ fseeko(fp, offset, whence) off_t offset; int whence; { - register fpos_t (*seekfn) __P((void *, fpos_t, int)); + register fpos_t (*seekfn) (void *, fpos_t, int); fpos_t target, curoff; size_t n; struct stat st; diff --git a/lib/libcr/stdio/local.h b/lib/libcr/stdio/local.h index afeae9cf2b..5e58acce01 100644 --- a/lib/libcr/stdio/local.h +++ b/lib/libcr/stdio/local.h @@ -36,7 +36,7 @@ * @(#)local.h 8.3 (Berkeley) 7/3/94 * * $FreeBSD: src/lib/libc/stdio/local.h,v 1.1.1.2.6.1 2001/03/05 11:27:49 obrien Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/local.h,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/local.h,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -44,21 +44,21 @@ * in particular, macros and private variables. */ -extern int __sflush __P((FILE *)); -extern FILE *__sfp __P((void)); -extern int __srefill __P((FILE *)); -extern int __sread __P((void *, char *, int)); -extern int __swrite __P((void *, char const *, int)); -extern fpos_t __sseek __P((void *, fpos_t, int)); -extern int __sclose __P((void *)); -extern void __sinit __P((void)); -extern void _cleanup __P((void)); -extern void (*__cleanup) __P((void)); -extern void __smakebuf __P((FILE *)); -extern int __swhatbuf __P((FILE *, size_t *, int *)); -extern int _fwalk __P((int (*)(FILE *))); -extern int __swsetup __P((FILE *)); -extern int __sflags __P((const char *, int *)); +extern int __sflush (FILE *); +extern FILE *__sfp (void); +extern int __srefill (FILE *); +extern int __sread (void *, char *, int); +extern int __swrite (void *, char const *, int); +extern fpos_t __sseek (void *, fpos_t, int); +extern int __sclose (void *); +extern void __sinit (void); +extern void _cleanup (void); +extern void (*__cleanup) (void); +extern void __smakebuf (FILE *); +extern int __swhatbuf (FILE *, size_t *, int *); +extern int _fwalk (int (*)(FILE *)); +extern int __swsetup (FILE *); +extern int __sflags (const char *, int *); extern int __sdidinit; diff --git a/lib/libcr/stdio/mktemp.c b/lib/libcr/stdio/mktemp.c index 4df42d64be..9c8dd02a40 100644 --- a/lib/libcr/stdio/mktemp.c +++ b/lib/libcr/stdio/mktemp.c @@ -32,7 +32,7 @@ * * @(#)mktemp.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/mktemp.c,v 1.19.2.3 2002/06/18 09:53:07 robert Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/mktemp.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/mktemp.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -45,9 +45,9 @@ #include #include -char *_mktemp __P((char *)); +char *_mktemp (char *); -static int _gettemp __P((char *, int *, int, int)); +static int _gettemp (char *, int *, int, int); static const unsigned char padchar[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; diff --git a/lib/libcr/stdio/refill.c b/lib/libcr/stdio/refill.c index 59fd076e26..80fb574186 100644 --- a/lib/libcr/stdio/refill.c +++ b/lib/libcr/stdio/refill.c @@ -35,7 +35,7 @@ * * @(#)refill.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/refill.c,v 1.8.2.1 2001/03/05 11:27:49 obrien Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/refill.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/refill.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include #include "local.h" -static int lflush __P((FILE *)); +static int lflush (FILE *); static int lflush(FILE *fp) diff --git a/lib/libcr/stdio/sscanf.c b/lib/libcr/stdio/sscanf.c index da918597fa..ca667c1725 100644 --- a/lib/libcr/stdio/sscanf.c +++ b/lib/libcr/stdio/sscanf.c @@ -35,7 +35,7 @@ * * @(#)sscanf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.6 1999/08/28 00:01:17 peter Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/sscanf.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/sscanf.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -47,7 +47,7 @@ #endif #include "local.h" -static int eofread __P((void *, char *, int)); +static int eofread (void *, char *, int); /* ARGSUSED */ static int diff --git a/lib/libcr/stdio/tempnam.c b/lib/libcr/stdio/tempnam.c index 3c1b2a9974..6d4b3104d7 100644 --- a/lib/libcr/stdio/tempnam.c +++ b/lib/libcr/stdio/tempnam.c @@ -32,7 +32,7 @@ * * @(#)tempnam.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/tempnam.c,v 1.8 1999/10/24 11:57:24 ache Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/tempnam.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/tempnam.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -46,7 +46,7 @@ __warn_references(tempnam, "warning: tempnam() possibly used unsafely; consider using mkstemp()"); -extern char *_mktemp __P((char *)); +extern char *_mktemp (char *); char * tempnam(dir, pfx) diff --git a/lib/libcr/stdio/tmpnam.c b/lib/libcr/stdio/tmpnam.c index ee106f7c48..2ba1dfacff 100644 --- a/lib/libcr/stdio/tmpnam.c +++ b/lib/libcr/stdio/tmpnam.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.3 1999/10/24 11:57:24 ache Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/tmpnam.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/tmpnam.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ * * @(#)tmpnam.c 8.3 (Berkeley) 3/28/94 */ @@ -47,7 +47,7 @@ __warn_references(tmpnam, "warning: tmpnam() possibly used unsafely; consider using mkstemp()"); -extern char *_mktemp __P((char *)); +extern char *_mktemp (char *); char * tmpnam(s) diff --git a/lib/libcr/stdio/ungetc.c b/lib/libcr/stdio/ungetc.c index 46ea89aac4..61ae308c04 100644 --- a/lib/libcr/stdio/ungetc.c +++ b/lib/libcr/stdio/ungetc.c @@ -35,7 +35,7 @@ * * @(#)ungetc.c 8.2 (Berkeley) 11/3/93 * $FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.7.2.1 2001/03/05 11:27:49 obrien Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/ungetc.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/ungetc.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -44,7 +44,7 @@ #include "local.h" #include "libc_private.h" -static int __submore __P((FILE *)); +static int __submore (FILE *); /* * Expand the ungetc buffer `in place'. That is, adjust fp->_p when diff --git a/lib/libcr/stdio/vfprintf.c b/lib/libcr/stdio/vfprintf.c index ddec85f3b6..62ca8f7ab8 100644 --- a/lib/libcr/stdio/vfprintf.c +++ b/lib/libcr/stdio/vfprintf.c @@ -35,7 +35,7 @@ * * @(#)vfprintf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.22.2.5 2002/10/12 10:46:37 schweikh Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/vfprintf.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/vfprintf.c,v 1.3 2003/11/12 20:21:28 eirikn Exp $ */ /* @@ -64,12 +64,12 @@ /* Define FLOATING_POINT to get floating point. */ #define FLOATING_POINT -static int __sprint __P((FILE *, struct __suio *)); -static int __sbprintf __P((FILE *, const char *, va_list)); -static char * __ultoa __P((u_long, char *, int, int, char *)); -static char * __uqtoa __P((u_quad_t, char *, int, int, char *)); -static void __find_arguments __P((const char *, va_list, void ***)); -static void __grow_type_table __P((int, unsigned char **, int *)); +static int __sprint (FILE *, struct __suio *); +static int __sbprintf (FILE *, const char *, va_list); +static char * __ultoa (u_long, char *, int, int, char *); +static char * __uqtoa (u_quad_t, char *, int, int, char *); +static void __find_arguments (const char *, va_list, void ***); +static void __grow_type_table (int, unsigned char **, int *); /* * Flush out all the vectors defined by the given uio, @@ -248,8 +248,8 @@ __uqtoa(u_quad_t val, char *endp, int base, int octzero, char *xdigs) #define BUF (MAXEXP+MAXFRACT+1) /* + decimal point */ #define DEFPREC 6 -static char *cvt __P((double, int, int, char *, int *, int, int *, char **)); -static int exponent __P((char *, int, int)); +static char *cvt (double, int, int, char *, int *, int, int *, char **); +static int exponent (char *, int, int); #else /* no FLOATING_POINT */ @@ -1190,7 +1190,7 @@ __grow_type_table (int nextarg, unsigned char **typetable, int *tablesize) #ifdef FLOATING_POINT -extern char *__dtoa __P((double, int, int, int *, int *, char **, char **)); +extern char *__dtoa (double, int, int, int *, int *, char **, char **); static char * cvt(double value, int ndigits, int flags, char *sign, int *decpt, diff --git a/lib/libcr/stdio/vsscanf.c b/lib/libcr/stdio/vsscanf.c index 939fc1d3cc..6ef2443242 100644 --- a/lib/libcr/stdio/vsscanf.c +++ b/lib/libcr/stdio/vsscanf.c @@ -35,7 +35,7 @@ * * @(#)vsscanf.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.7 1999/08/28 00:01:22 peter Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/vsscanf.c,v 1.3 2003/11/09 02:34:02 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/vsscanf.c,v 1.4 2003/11/12 20:21:28 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include static int -eofread __P((void *, char *, int)); +eofread (void *, char *, int); /* ARGSUSED */ static int diff --git a/lib/libcr/stdlib/bsearch.c b/lib/libcr/stdlib/bsearch.c index 12d3bfd241..e685bb62c2 100644 --- a/lib/libcr/stdlib/bsearch.c +++ b/lib/libcr/stdlib/bsearch.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)bsearch.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libcr/stdlib/Attic/bsearch.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/bsearch.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include @@ -59,7 +59,7 @@ bsearch(key, base0, nmemb, size, compar) const void *base0; size_t nmemb; register size_t size; - register int (*compar) __P((const void *, const void *)); + register int (*compar) (const void *, const void *); { register const char *base = base0; register size_t lim; diff --git a/lib/libcr/stdlib/getenv.c b/lib/libcr/stdlib/getenv.c index 77bc371d76..7856fc2465 100644 --- a/lib/libcr/stdlib/getenv.c +++ b/lib/libcr/stdlib/getenv.c @@ -31,14 +31,14 @@ * SUCH DAMAGE. * * @(#)getenv.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libcr/stdlib/Attic/getenv.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/getenv.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include #include #include -inline char *__findenv __P((const char *, int *)); +inline char *__findenv (const char *, int *); /* * __findenv -- diff --git a/lib/libcr/stdlib/heapsort.c b/lib/libcr/stdlib/heapsort.c index b86969c8e2..07c8e5ddf6 100644 --- a/lib/libcr/stdlib/heapsort.c +++ b/lib/libcr/stdlib/heapsort.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)heapsort.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libcr/stdlib/Attic/heapsort.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/heapsort.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ #include @@ -140,7 +140,7 @@ int heapsort(vbase, nmemb, size, compar) void *vbase; size_t nmemb, size; - int (*compar) __P((const void *, const void *)); + int (*compar) (const void *, const void *); { register int cnt, i, j, l; register char tmp, *tmp1, *tmp2; diff --git a/lib/libcr/stdlib/malloc.c b/lib/libcr/stdlib/malloc.c index ea134a823a..71b72f4975 100644 --- a/lib/libcr/stdlib/malloc.c +++ b/lib/libcr/stdlib/malloc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.49.2.4 2001/12/29 08:10:14 knu Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/malloc.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/malloc.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ * */ @@ -237,7 +237,7 @@ static int malloc_utrace; struct ut { void *p; size_t s; void *r; }; -void utrace __P((struct ut *, int)); +void utrace (struct ut *, int); #define UTRACE(a, b, c) \ if (malloc_utrace) \ diff --git a/lib/libcr/stdlib/merge.c b/lib/libcr/stdlib/merge.c index f5f4c91d24..3aeba47213 100644 --- a/lib/libcr/stdlib/merge.c +++ b/lib/libcr/stdlib/merge.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)merge.c 8.2 (Berkeley) 2/14/94 - * $DragonFly: src/lib/libcr/stdlib/Attic/merge.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/merge.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -57,8 +57,8 @@ #include #include -static void setup __P((u_char *, u_char *, size_t, size_t, int (*)())); -static void insertionsort __P((u_char *, size_t, size_t, int (*)())); +static void setup (u_char *, u_char *, size_t, size_t, int (*)()); +static void insertionsort (u_char *, size_t, size_t, int (*)()); #define ISIZE sizeof(int) #define PSIZE sizeof(u_char *) @@ -98,7 +98,7 @@ mergesort(base, nmemb, size, cmp) void *base; size_t nmemb; register size_t size; - int (*cmp) __P((const void *, const void *)); + int (*cmp) (const void *, const void *); { register int i, sense; int big, iflag; @@ -259,7 +259,7 @@ COPY: b = t; void setup(list1, list2, n, size, cmp) size_t n, size; - int (*cmp) __P((const void *, const void *)); + int (*cmp) (const void *, const void *); u_char *list1, *list2; { int i, length, size2, tmp, sense; @@ -334,7 +334,7 @@ static void insertionsort(a, n, size, cmp) u_char *a; size_t n, size; - int (*cmp) __P((const void *, const void *)); + int (*cmp) (const void *, const void *); { u_char *ai, *s, *t, *u, tmp; int i; diff --git a/lib/libcr/stdlib/netbsd_strtod.c b/lib/libcr/stdlib/netbsd_strtod.c index 3e288b300b..b1ceefd3e3 100644 --- a/lib/libcr/stdlib/netbsd_strtod.c +++ b/lib/libcr/stdlib/netbsd_strtod.c @@ -19,7 +19,7 @@ /* * $NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp $ * $FreeBSD: src/lib/libc/stdlib/netbsd_strtod.c,v 1.2.2.2 2001/03/02 17:14:15 tegge Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/netbsd_strtod.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/netbsd_strtod.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ @@ -142,7 +142,7 @@ #include "memory.h" #endif #endif -char *__dtoa __P((double, int, int, int *, int *, char **, char **)); +char *__dtoa (double, int, int, int *, int *, char **, char **); #ifdef MALLOC #ifdef KR_headers diff --git a/lib/libcr/stdlib/qsort.c b/lib/libcr/stdlib/qsort.c index a3c9641f17..ae77b51f4d 100644 --- a/lib/libcr/stdlib/qsort.c +++ b/lib/libcr/stdlib/qsort.c @@ -32,14 +32,14 @@ * * @(#)qsort.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdlib/qsort.c,v 1.8 1999/08/28 00:01:35 peter Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/qsort.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/qsort.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include -typedef int cmp_t __P((const void *, const void *)); -static inline char *med3 __P((char *, char *, char *, cmp_t *)); -static inline void swapfunc __P((char *, char *, int, int)); +typedef int cmp_t (const void *, const void *); +static inline char *med3 (char *, char *, char *, cmp_t *); +static inline void swapfunc (char *, char *, int, int); #define min(a, b) (a) < (b) ? a : b diff --git a/lib/libcr/stdlib/radixsort.c b/lib/libcr/stdlib/radixsort.c index 5e15ba9760..fc7d6d8618 100644 --- a/lib/libcr/stdlib/radixsort.c +++ b/lib/libcr/stdlib/radixsort.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)radixsort.c 8.2 (Berkeley) 4/28/95 - * $DragonFly: src/lib/libcr/stdlib/Attic/radixsort.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/radixsort.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -61,10 +61,10 @@ typedef struct { } stack; static inline void simplesort - __P((const u_char **, int, int, const u_char *, u_int)); -static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int)); -static void r_sort_b __P((const u_char **, - const u_char **, int, int, const u_char *, u_int)); + (const u_char **, int, int, const u_char *, u_int); +static void r_sort_a (const u_char **, int, int, const u_char *, u_int); +static void r_sort_b (const u_char **, + const u_char **, int, int, const u_char *, u_int); #define THRESHOLD 20 /* Divert to simplesort(). */ #define SIZE 512 /* Default stack size. */ diff --git a/lib/libcr/stdlib/random.c b/lib/libcr/stdlib/random.c index 698ecdfdc7..6570f09337 100644 --- a/lib/libcr/stdlib/random.c +++ b/lib/libcr/stdlib/random.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/stdlib/random.c,v 1.13 2000/01/27 23:06:49 jasone Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/random.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/random.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ * * @(#)random.c 8.2 (Berkeley) 5/19/95 */ @@ -210,7 +210,7 @@ static long rand_deg = DEG_3; static long rand_sep = SEP_3; static long *end_ptr = &randtbl[DEG_3 + 1]; -static inline long good_rand __P((long)); +static inline long good_rand (long); static inline long good_rand (x) register long x; diff --git a/lib/libcr/stdlib/setenv.c b/lib/libcr/stdlib/setenv.c index ff5be753cb..61445b482e 100644 --- a/lib/libcr/stdlib/setenv.c +++ b/lib/libcr/stdlib/setenv.c @@ -32,14 +32,14 @@ * * @(#)setenv.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/stdlib/setenv.c,v 1.5.2.1 2000/09/20 19:46:03 brian Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/setenv.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/setenv.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include #include #include -char *__findenv __P((const char *, int *)); +char *__findenv (const char *, int *); /* * setenv -- diff --git a/lib/libcr/stdlib/tdelete.c b/lib/libcr/stdlib/tdelete.c index 77bc11cafb..64bddd7e18 100644 --- a/lib/libcr/stdlib/tdelete.c +++ b/lib/libcr/stdlib/tdelete.c @@ -10,7 +10,7 @@ * * $NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ * $FreeBSD: src/lib/libc/stdlib/tdelete.c,v 1.1.2.1 2000/08/17 07:38:39 jhb Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/tdelete.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/tdelete.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include @@ -26,7 +26,7 @@ void * tdelete(vkey, vrootp, compar) const void *vkey; /* key to be deleted */ void **vrootp; /* address of the root of tree */ - int (*compar) __P((const void *, const void *)); + int (*compar) (const void *, const void *); { node_t **rootp = (node_t **)vrootp; node_t *p, *q, *r; diff --git a/lib/libcr/stdlib/tfind.c b/lib/libcr/stdlib/tfind.c index fb33144e83..c9964b2fe4 100644 --- a/lib/libcr/stdlib/tfind.c +++ b/lib/libcr/stdlib/tfind.c @@ -10,7 +10,7 @@ * * $NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ * $FreeBSD: src/lib/libc/stdlib/tfind.c,v 1.1.2.1 2000/08/17 07:38:39 jhb Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/tfind.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/tfind.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include @@ -25,7 +25,7 @@ void * tfind(vkey, vrootp, compar) const void *vkey; /* key to be found */ void **vrootp; /* address of the tree root */ - int (*compar) __P((const void *, const void *)); + int (*compar) (const void *, const void *); { node_t **rootp = (node_t **)vrootp; diff --git a/lib/libcr/stdlib/tsearch.c b/lib/libcr/stdlib/tsearch.c index 7e9439ebb8..1d9288a5db 100644 --- a/lib/libcr/stdlib/tsearch.c +++ b/lib/libcr/stdlib/tsearch.c @@ -10,7 +10,7 @@ * * $NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $ * $FreeBSD: src/lib/libc/stdlib/tsearch.c,v 1.1.2.1 2000/08/17 07:38:39 jhb Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/tsearch.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/tsearch.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include @@ -25,7 +25,7 @@ void * tsearch(vkey, vrootp, compar) const void *vkey; /* key to be located */ void **vrootp; /* address of tree root */ - int (*compar) __P((const void *, const void *)); + int (*compar) (const void *, const void *); { node_t *q; node_t **rootp = (node_t **)vrootp; diff --git a/lib/libcr/stdlib/twalk.c b/lib/libcr/stdlib/twalk.c index 9c2dd1a15d..5e6b373bcd 100644 --- a/lib/libcr/stdlib/twalk.c +++ b/lib/libcr/stdlib/twalk.c @@ -10,7 +10,7 @@ * * $NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $ * $FreeBSD: src/lib/libc/stdlib/twalk.c,v 1.1.2.1 2000/08/17 07:38:39 jhb Exp $ - * $DragonFly: src/lib/libcr/stdlib/Attic/twalk.c,v 1.2 2003/06/17 04:26:46 dillon Exp $ + * $DragonFly: src/lib/libcr/stdlib/Attic/twalk.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ #include @@ -20,14 +20,14 @@ #include #include -static void trecurse __P((const node_t *, - void (*action)(const void *, VISIT, int), int level)); +static void trecurse (const node_t *, + void (*action)(const void *, VISIT, int), int level); /* Walk the nodes of a tree */ static void trecurse(root, action, level) const node_t *root; /* Root of the tree to be walked */ - void (*action) __P((const void *, VISIT, int)); + void (*action) (const void *, VISIT, int); int level; { @@ -48,7 +48,7 @@ trecurse(root, action, level) void twalk(vroot, action) const void *vroot; /* Root of the tree to be walked */ - void (*action) __P((const void *, VISIT, int)); + void (*action) (const void *, VISIT, int); { if (vroot != NULL && action != NULL) trecurse(vroot, action, 0); diff --git a/lib/libcr/xdr/xdr_rec.c b/lib/libcr/xdr/xdr_rec.c index c54687b355..c9733de942 100644 --- a/lib/libcr/xdr/xdr_rec.c +++ b/lib/libcr/xdr/xdr_rec.c @@ -29,7 +29,7 @@ * @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro * @(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC * $FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.12 2000/01/19 06:12:32 wpaul Exp $ - * $DragonFly: src/lib/libcr/xdr/Attic/xdr_rec.c,v 1.2 2003/06/17 04:26:47 dillon Exp $ + * $DragonFly: src/lib/libcr/xdr/Attic/xdr_rec.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -103,7 +103,7 @@ typedef struct rec_strm { /* * out-goung bits */ - int (*writeit) __P((caddr_t, caddr_t, int)); + int (*writeit) (caddr_t, caddr_t, int); caddr_t out_base; /* output buffer (points to frag header) */ caddr_t out_finger; /* next output position */ caddr_t out_boundry; /* data cannot up to this address */ @@ -112,7 +112,7 @@ typedef struct rec_strm { /* * in-coming bits */ - int (*readit) __P((caddr_t, caddr_t, int)); + int (*readit) (caddr_t, caddr_t, int); u_long in_size; /* fixed size of the input buffer */ caddr_t in_base; caddr_t in_finger; /* location of next byte to be had */ diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c index 99782313a8..7ade7c4c55 100644 --- a/lib/libedit/chared.c +++ b/lib/libedit/chared.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)chared.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/chared.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/chared.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -184,7 +184,7 @@ protected char * c__prev_word(p, low, n, wtest) register char *p, *low; register int n; - int (*wtest) __P((int)); + int (*wtest) (int); { p--; @@ -211,7 +211,7 @@ protected char * c__next_word(p, high, n, wtest) register char *p, *high; register int n; - int (*wtest) __P((int)); + int (*wtest) (int); { while (n--) { while ((p < high) && !(*wtest)((unsigned char) *p)) @@ -233,7 +233,7 @@ cv_next_word(el, p, high, n, wtest) EditLine *el; register char *p, *high; register int n; - int (*wtest) __P((int)); + int (*wtest) (int); { int test; @@ -266,7 +266,7 @@ cv_prev_word(el, p, low, n, wtest) EditLine *el; register char *p, *low; register int n; - int (*wtest) __P((int)); + int (*wtest) (int); { int test; diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h index e731a3f290..6829582890 100644 --- a/lib/libedit/chared.h +++ b/lib/libedit/chared.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)chared.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/chared.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/chared.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -135,26 +135,26 @@ typedef struct el_chared_t { #include "fcns.h" -protected int cv__isword __P((int)); -protected void cv_delfini __P((EditLine *)); -protected char *cv__endword __P((char *, char *, int)); -protected int ce__isword __P((int)); -protected int c___isword __P((int)); -protected void cv_undo __P((EditLine *, int, int, char *)); -protected char *cv_next_word __P((EditLine*, char *, char *, int, - int (*)(int))); -protected char *cv_prev_word __P((EditLine*, char *, char *, int, - int (*)(int))); -protected char *c__next_word __P((char *, char *, int, int (*)(int))); -protected char *c__prev_word __P((char *, char *, int, int (*)(int))); -protected void c_insert __P((EditLine *, int)); -protected void c_delbefore __P((EditLine *, int)); -protected void c_delafter __P((EditLine *, int)); -protected int c_gets __P((EditLine *, char *)); -protected int c_hpos __P((EditLine *)); - -protected int ch_init __P((EditLine *)); -protected void ch_reset __P((EditLine *)); -protected void ch_end __P((EditLine *)); +protected int cv__isword (int); +protected void cv_delfini (EditLine *); +protected char *cv__endword (char *, char *, int); +protected int ce__isword (int); +protected int c___isword (int); +protected void cv_undo (EditLine *, int, int, char *); +protected char *cv_next_word (EditLine*, char *, char *, int, + int (*)(int)); +protected char *cv_prev_word (EditLine*, char *, char *, int, + int (*)(int)); +protected char *c__next_word (char *, char *, int, int (*)(int)); +protected char *c__prev_word (char *, char *, int, int (*)(int)); +protected void c_insert (EditLine *, int); +protected void c_delbefore (EditLine *, int); +protected void c_delafter (EditLine *, int); +protected int c_gets (EditLine *, char *); +protected int c_hpos (EditLine *); + +protected int ch_init (EditLine *); +protected void ch_reset (EditLine *); +protected void ch_end (EditLine *); #endif /* _h_el_chared */ diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h index 287bcd43e3..d6d8fdaa09 100644 --- a/lib/libedit/hist.h +++ b/lib/libedit/hist.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)hist.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/hist.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/hist.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -45,7 +45,7 @@ #include "histedit.h" -typedef const HistEvent * (*hist_fun_t) __P((ptr_t, int, ...)); +typedef const HistEvent * (*hist_fun_t) (ptr_t, int, ...); typedef struct el_history_t { char *buf; /* The history buffer */ @@ -69,10 +69,10 @@ typedef struct el_history_t { #define HIST_LOAD(el, fname) HIST_FUN(el, H_LOAD fname) #define HIST_SAVE(el, fname) HIST_FUN(el, H_SAVE fname) -protected int hist_init __P((EditLine *)); -protected void hist_end __P((EditLine *)); -protected el_action_t hist_get __P((EditLine *)); -protected int hist_set __P((EditLine *, hist_fun_t, ptr_t)); -protected int hist_list __P((EditLine *, int, char **)); +protected int hist_init (EditLine *); +protected void hist_end (EditLine *); +protected el_action_t hist_get (EditLine *); +protected int hist_set (EditLine *, hist_fun_t, ptr_t); +protected int hist_list (EditLine *, int, char **); #endif /* _h_el_hist */ diff --git a/lib/libedit/history.c b/lib/libedit/history.c index 3c13701880..3e0ac8ca48 100644 --- a/lib/libedit/history.c +++ b/lib/libedit/history.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)history.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/history.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/history.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -54,9 +54,9 @@ static const char hist_cookie[] = "_HiStOrY_V1_\n"; #include "histedit.h" -typedef const HistEvent * (*history_gfun_t) __P((ptr_t)); -typedef const HistEvent * (*history_efun_t) __P((ptr_t, const char *)); -typedef void (*history_vfun_t) __P((ptr_t)); +typedef const HistEvent * (*history_gfun_t) (ptr_t); +typedef const HistEvent * (*history_efun_t) (ptr_t, const char *); +typedef void (*history_vfun_t) (ptr_t); struct history { ptr_t h_ref; /* Argument for history fcns */ @@ -83,14 +83,14 @@ struct history { #define h_free(a) free(a) -private int history_set_num __P((History *, int)); -private int history_set_fun __P((History *, History *)); -private int history_load __P((History *, const char *)); -private int history_save __P((History *, const char *)); -private const HistEvent *history_prev_event __P((History *, int)); -private const HistEvent *history_next_event __P((History *, int)); -private const HistEvent *history_next_string __P((History *, const char *)); -private const HistEvent *history_prev_string __P((History *, const char *)); +private int history_set_num (History *, int); +private int history_set_fun (History *, History *); +private int history_load (History *, const char *); +private int history_save (History *, const char *); +private const HistEvent *history_prev_event (History *, int); +private const HistEvent *history_next_event (History *, int); +private const HistEvent *history_next_string (History *, const char *); +private const HistEvent *history_prev_string (History *, const char *); /***********************************************************************/ @@ -112,17 +112,17 @@ typedef struct history_t { int eventno; /* Current event number */ } history_t; -private const HistEvent *history_def_first __P((ptr_t)); -private const HistEvent *history_def_last __P((ptr_t)); -private const HistEvent *history_def_next __P((ptr_t)); -private const HistEvent *history_def_prev __P((ptr_t)); -private const HistEvent *history_def_curr __P((ptr_t)); -private const HistEvent *history_def_enter __P((ptr_t, const char *)); -private const HistEvent *history_def_add __P((ptr_t, const char *)); -private void history_def_init __P((ptr_t *, int)); -private void history_def_clear __P((ptr_t)); -private const HistEvent *history_def_insert __P((history_t *, const char *)); -private void history_def_delete __P((history_t *, hentry_t *)); +private const HistEvent *history_def_first (ptr_t); +private const HistEvent *history_def_last (ptr_t); +private const HistEvent *history_def_next (ptr_t); +private const HistEvent *history_def_prev (ptr_t); +private const HistEvent *history_def_curr (ptr_t); +private const HistEvent *history_def_enter (ptr_t, const char *); +private const HistEvent *history_def_add (ptr_t, const char *); +private void history_def_init (ptr_t *, int); +private void history_def_clear (ptr_t); +private const HistEvent *history_def_insert (history_t *, const char *); +private void history_def_delete (history_t *, hentry_t *); #define history_def_set(p, num) (void) (((history_t *) p)->max = (num)) diff --git a/lib/libedit/key.c b/lib/libedit/key.c index 2d8032bd22..39affefd19 100644 --- a/lib/libedit/key.c +++ b/lib/libedit/key.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)key.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/key.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/key.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -77,17 +77,17 @@ struct key_node_t { struct key_node_t *sibling; /* ptr to another key with same prefix */ }; -private int node_trav __P((EditLine *, key_node_t *, char *, - key_value_t *)); -private int node__try __P((key_node_t *, char *, - key_value_t *, int)); -private key_node_t *node__get __P((int)); -private void node__put __P((key_node_t *)); -private int node__delete __P((key_node_t **, char *)); -private int node_lookup __P((EditLine *, char *, key_node_t *, - int)); -private int node_enum __P((EditLine *, key_node_t *, int)); -private int key__decode_char __P((char *, int, int)); +private int node_trav (EditLine *, key_node_t *, char *, + key_value_t *); +private int node__try (key_node_t *, char *, + key_value_t *, int); +private key_node_t *node__get (int); +private void node__put (key_node_t *); +private int node__delete (key_node_t **, char *); +private int node_lookup (EditLine *, char *, key_node_t *, + int); +private int node_enum (EditLine *, key_node_t *, int); +private int key__decode_char (char *, int, int); #define KEY_BUFSIZ EL_BUFSIZ diff --git a/lib/libedit/key.h b/lib/libedit/key.h index 55a1800bbc..431ad6bf2a 100644 --- a/lib/libedit/key.h +++ b/lib/libedit/key.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)key.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/key.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/key.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -61,21 +61,21 @@ typedef struct el_key_t { #define XK_NOD 2 #define XK_EXE 3 -protected int key_init __P((EditLine *)); -protected void key_end __P((EditLine *)); -protected key_value_t * key_map_cmd __P((EditLine *, int)); -protected key_value_t * key_map_str __P((EditLine *, char *)); -protected void key_reset __P((EditLine *)); -protected int key_get __P((EditLine *, char *, - key_value_t *)); -protected void key_add __P((EditLine *, char *, key_value_t *, - int)); -protected void key_clear __P((EditLine *, el_action_t *, - char *)); -protected int key_delete __P((EditLine *, char *)); -protected void key_print __P((EditLine *, char *)); -protected void key_kprint __P((EditLine *, char *, - key_value_t *, int)); -protected char *key__decode_str __P((char *, char *, char *)); +protected int key_init (EditLine *); +protected void key_end (EditLine *); +protected key_value_t * key_map_cmd (EditLine *, int); +protected key_value_t * key_map_str (EditLine *, char *); +protected void key_reset (EditLine *); +protected int key_get (EditLine *, char *, + key_value_t *); +protected void key_add (EditLine *, char *, key_value_t *, + int); +protected void key_clear (EditLine *, el_action_t *, + char *); +protected int key_delete (EditLine *, char *); +protected void key_print (EditLine *, char *); +protected void key_kprint (EditLine *, char *, + key_value_t *, int); +protected char *key__decode_str (char *, char *, char *); #endif /* _h_el_key */ diff --git a/lib/libedit/makelist b/lib/libedit/makelist index a01506bc92..ee0e2d93d4 100644 --- a/lib/libedit/makelist +++ b/lib/libedit/makelist @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)makelist 5.3 (Berkeley) 6/4/93 -# $DragonFly: src/lib/libedit/makelist,v 1.2 2003/11/12 18:07:02 eirikn Exp $ +# $DragonFly: src/lib/libedit/makelist,v 1.3 2003/11/12 20:21:29 eirikn Exp $ # makelist.sh: Automatically generate header files... @@ -70,7 +70,7 @@ case $FLAG in pr = substr($2, 1, 2); if (pr == "vi" || pr == "em" || pr == "ed") { name = substr($2, 1, length($2) - 3); - printf("protected el_action_t\t%-25.25s __P((EditLine *, int));\n", name); + printf("protected el_action_t\t%-25.25s (EditLine *, int);\n", name); } } END { @@ -125,7 +125,7 @@ case $FLAG in BEGIN { printf("/* Automatically generated file, do not edit */\n"); printf("#ifndef _h_help_c\n#define _h_help_c\n"); - printf("protected el_bindings_t *help__get\t__P((void));\n"); + printf("protected el_bindings_t *help__get\t(void);\n"); printf("#endif /* _h_help_c */\n"); }' /dev/null;; -fh) @@ -142,8 +142,8 @@ case $FLAG in END { printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count); - printf("typedef el_action_t (*el_func_t) __P((EditLine *, int));"); - printf("\nprotected el_func_t* func__get __P((void));\n"); + printf("typedef el_action_t (*el_func_t) (EditLine *, int);"); + printf("\nprotected el_func_t* func__get (void);\n"); printf("#endif /* _h_fcns_c */\n"); }';; -fc) diff --git a/lib/libedit/map.c b/lib/libedit/map.c index fae78b4072..cf9fe49340 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)map.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/map.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/map.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -46,11 +46,11 @@ #define N_KEYS 256 -private void map_print_key __P((EditLine *, el_action_t *, char *)); -private void map_print_some_keys __P((EditLine *, el_action_t *, int, int)); -private void map_print_all_keys __P((EditLine *)); -private void map_init_nls __P((EditLine *)); -private void map_init_meta __P((EditLine *)); +private void map_print_key (EditLine *, el_action_t *, char *); +private void map_print_some_keys (EditLine *, el_action_t *, int, int); +private void map_print_all_keys (EditLine *); +private void map_init_nls (EditLine *); +private void map_init_meta (EditLine *); /* keymap tables ; should be N_KEYS*sizeof(KEYCMD) bytes long */ diff --git a/lib/libedit/map.h b/lib/libedit/map.h index be6f001f02..aac72ed04b 100644 --- a/lib/libedit/map.h +++ b/lib/libedit/map.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)map.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/map.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/map.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -66,13 +66,13 @@ typedef struct el_map_t { #define MAP_EMACS 0 #define MAP_VI 1 -protected int map_bind __P((EditLine *, int, char **)); -protected int map_init __P((EditLine *)); -protected void map_end __P((EditLine *)); -protected void map_init_vi __P((EditLine *)); -protected void map_init_emacs __P((EditLine *)); -protected int map_set_editor __P((EditLine *, char *)); -protected int map_addfunc __P((EditLine *, const char *, - const char *, el_func_t)); +protected int map_bind (EditLine *, int, char **); +protected int map_init (EditLine *); +protected void map_end (EditLine *); +protected void map_init_vi (EditLine *); +protected void map_init_emacs (EditLine *); +protected int map_set_editor (EditLine *, char *); +protected int map_addfunc (EditLine *, const char *, + const char *, el_func_t); #endif /* _h_el_map */ diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c index e5a5577aa4..06890d77d2 100644 --- a/lib/libedit/parse.c +++ b/lib/libedit/parse.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)parse.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/parse.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/parse.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -56,7 +56,7 @@ private struct { char *name; - int (*func) __P((EditLine *, int, char **)); + int (*func) (EditLine *, int, char **); } cmds[] = { { "bind", map_bind }, { "echotc", term_echotc }, diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h index 50df53efcc..92fbf842cb 100644 --- a/lib/libedit/parse.h +++ b/lib/libedit/parse.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)parse.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/parse.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/parse.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -43,9 +43,9 @@ #ifndef _h_el_parse #define _h_el_parse -protected int parse_line __P((EditLine *, const char *)); -protected int parse__escape __P((const char ** const)); -protected char * parse__string __P((char *, const char *)); -protected int parse_cmd __P((EditLine *, const char *)); +protected int parse_line (EditLine *, const char *); +protected int parse__escape (const char ** const); +protected char * parse__string (char *, const char *); +protected int parse_cmd (EditLine *, const char *); #endif /* _h_el_parse */ diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c index 0d884bc296..7cb661c2cb 100644 --- a/lib/libedit/prompt.c +++ b/lib/libedit/prompt.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)prompt.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/prompt.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/prompt.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -44,7 +44,7 @@ #include #include "el.h" -private char *prompt_default __P((EditLine *)); +private char *prompt_default (EditLine *); /* prompt_default(): * Just a default prompt, in case the user did not provide one diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h index f3e9a5a4c2..003484c266 100644 --- a/lib/libedit/prompt.h +++ b/lib/libedit/prompt.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)prompt.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/prompt.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/prompt.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -45,16 +45,16 @@ #include "histedit.h" -typedef char * (*el_pfunc_t) __P((EditLine*)); +typedef char * (*el_pfunc_t) (EditLine*); typedef struct el_prompt_t { el_pfunc_t p_func; /* Function to return the prompt */ coord_t p_pos; /* position in the line after prompt */ } el_prompt_t; -protected void prompt_print __P((EditLine *)); -protected int prompt_set __P((EditLine *, el_pfunc_t)); -protected int prompt_init __P((EditLine *)); -protected void prompt_end __P((EditLine *)); +protected void prompt_print (EditLine *); +protected int prompt_set (EditLine *, el_pfunc_t); +protected int prompt_init (EditLine *); +protected void prompt_end (EditLine *); #endif /* _h_el_prompt */ diff --git a/lib/libedit/read.c b/lib/libedit/read.c index 1be31c4c9f..206e66169d 100644 --- a/lib/libedit/read.c +++ b/lib/libedit/read.c @@ -35,7 +35,7 @@ * * @(#)read.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libedit/read.c,v 1.4.6.3 2000/10/31 23:51:10 brian Exp $ - * $DragonFly: src/lib/libedit/read.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libedit/read.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -51,9 +51,9 @@ #define OKCMD -1 -private int read__fixio __P((int, int)); -private int read_preread __P((EditLine *)); -private int read_getcmd __P((EditLine *, el_action_t *, char *)); +private int read__fixio (int, int); +private int read_preread (EditLine *); +private int read_getcmd (EditLine *, el_action_t *, char *); #ifdef DEBUG_EDIT private void diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c index 6e27ee1ea2..7067a5a440 100644 --- a/lib/libedit/refresh.c +++ b/lib/libedit/refresh.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)refresh.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/refresh.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/refresh.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -47,20 +47,20 @@ #include "el.h" -private void re_addc __P((EditLine *, int)); -private void re_update_line __P((EditLine *, char *, char *, int)); -private void re_insert __P((EditLine *, char *, int, int, - char *, int)); -private void re_delete __P((EditLine *, char *, int, int, - int)); -private void re_fastputc __P((EditLine *, int)); +private void re_addc (EditLine *, int); +private void re_update_line (EditLine *, char *, char *, int); +private void re_insert (EditLine *, char *, int, int, + char *, int); +private void re_delete (EditLine *, char *, int, int, + int); +private void re_fastputc (EditLine *, int); -private void re__strncopy __P((char *, char *, size_t)); -private void re__copy_and_pad __P((char *, char *, size_t)); +private void re__strncopy (char *, char *, size_t); +private void re__copy_and_pad (char *, char *, size_t); #ifdef DEBUG_REFRESH -private void re_printstr __P((EditLine *, char *, char *, - char *)); +private void re_printstr (EditLine *, char *, char *, + char *); # define __F el->el_errfile # define RE_DEBUG(a, b, c) do \ if (a) { \ diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h index 35f5d2df99..01dd8ac6be 100644 --- a/lib/libedit/refresh.h +++ b/lib/libedit/refresh.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)refresh.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/refresh.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/refresh.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -50,12 +50,12 @@ typedef struct { int r_oldcv, r_newcv; /* Vertical locations */ } el_refresh_t; -protected void re_putc __P((EditLine *, int)); -protected void re_clear_lines __P((EditLine *)); -protected void re_clear_display __P((EditLine *)); -protected void re_refresh __P((EditLine *)); -protected void re_refresh_cursor __P((EditLine *)); -protected void re_fastaddc __P((EditLine *)); -protected void re_goto_bottom __P((EditLine *)); +protected void re_putc (EditLine *, int); +protected void re_clear_lines (EditLine *); +protected void re_clear_display (EditLine *); +protected void re_refresh (EditLine *); +protected void re_refresh_cursor (EditLine *); +protected void re_fastaddc (EditLine *); +protected void re_goto_bottom (EditLine *); #endif /* _h_el_refresh */ diff --git a/lib/libedit/search.c b/lib/libedit/search.c index 6013a24597..89fc8aa3b2 100644 --- a/lib/libedit/search.c +++ b/lib/libedit/search.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)search.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/search.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/search.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -110,8 +110,8 @@ el_match(str, pat) regexp *rp; int rv; #else - extern char *re_comp __P((const char *)); - extern int re_exec __P((const char *)); + extern char *re_comp (const char *); + extern int re_exec (const char *); #endif if (strstr(str, pat) != NULL) diff --git a/lib/libedit/search.h b/lib/libedit/search.h index 7195cee03c..14d1751def 100644 --- a/lib/libedit/search.h +++ b/lib/libedit/search.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)search.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/search.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/search.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -54,16 +54,16 @@ typedef struct el_search_t { } el_search_t; -protected int el_match __P((const char *, const char *)); -protected int search_init __P((EditLine *)); -protected void search_end __P((EditLine *)); -protected int c_hmatch __P((EditLine *, const char *)); -protected void c_setpat __P((EditLine *)); -protected el_action_t ce_inc_search __P((EditLine *, int)); -protected el_action_t cv_search __P((EditLine *, int)); -protected el_action_t ce_search_line __P((EditLine *, char *, int)); -protected el_action_t cv_repeat_srch __P((EditLine *, int)); -protected el_action_t cv_csearch_back __P((EditLine *, int, int, int)); -protected el_action_t cv_csearch_fwd __P((EditLine *, int, int, int)); +protected int el_match (const char *, const char *); +protected int search_init (EditLine *); +protected void search_end (EditLine *); +protected int c_hmatch (EditLine *, const char *); +protected void c_setpat (EditLine *); +protected el_action_t ce_inc_search (EditLine *, int); +protected el_action_t cv_search (EditLine *, int); +protected el_action_t ce_search_line (EditLine *, char *, int); +protected el_action_t cv_repeat_srch (EditLine *, int); +protected el_action_t cv_csearch_back (EditLine *, int, int, int); +protected el_action_t cv_csearch_fwd (EditLine *, int, int, int); #endif /* _h_el_search */ diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c index 238e0c2756..327adfbcce 100644 --- a/lib/libedit/sig.c +++ b/lib/libedit/sig.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libedit/sig.c,v 1.3.6.1 2000/08/16 14:43:40 ache Exp $ - * $DragonFly: src/lib/libedit/sig.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libedit/sig.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ * * @(#)sig.c 8.1 (Berkeley) 6/4/93 */ @@ -57,7 +57,7 @@ private int sighdl[] = { -1 }; -private void sig_handler __P((int)); +private void sig_handler (int); /* sig_handler(): * This is the handler called for all signals diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h index 7d551eef03..c12e3648e6 100644 --- a/lib/libedit/sig.h +++ b/lib/libedit/sig.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)sig.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/sig.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/sig.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -63,9 +63,9 @@ typedef sig_t *el_signal_t; -protected void sig_end __P((EditLine*)); -protected int sig_init __P((EditLine*)); -protected void sig_set __P((EditLine*)); -protected void sig_clr __P((EditLine*)); +protected void sig_end (EditLine*); +protected int sig_init (EditLine*); +protected void sig_set (EditLine*); +protected void sig_clr (EditLine*); #endif /* _h_el_sig */ diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h index 7ab603338f..39988c3316 100644 --- a/lib/libedit/sys.h +++ b/lib/libedit/sys.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)sys.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/sys.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/sys.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -84,33 +84,33 @@ typedef char* ioctl_t; # undef REGEX # undef REGEXP # include -typedef void (*sig_t)__P((int)); +typedef void (*sig_t)(int); # ifdef __GNUC__ /* * Broken hdrs. */ -extern char *getenv __P((const char *)); -extern int fprintf __P((FILE *, const char *, ...)); -extern int sigsetmask __P((int)); -extern int sigblock __P((int)); -extern int ioctl __P((int, int, void *)); -extern int fputc __P((int, FILE *)); -extern int fgetc __P((FILE *)); -extern int fflush __P((FILE *)); -extern int tolower __P((int)); -extern int toupper __P((int)); +extern char *getenv (const char *); +extern int fprintf (FILE *, const char *, ...); +extern int sigsetmask (int); +extern int sigblock (int); +extern int ioctl (int, int, void *); +extern int fputc (int, FILE *); +extern int fgetc (FILE *); +extern int fflush (FILE *); +extern int tolower (int); +extern int toupper (int); extern int errno, sys_nerr; extern char *sys_errlist[]; -extern void perror __P((const char *)); -extern int read __P((int, const char*, int)); +extern void perror (const char *); +extern int read (int, const char*, int); # include # define strerror(e) sys_errlist[e] # endif # ifdef SABER -extern ptr_t memcpy __P((ptr_t, const ptr_t, size_t)); -extern ptr_t memset __P((ptr_t, int, size_t)); +extern ptr_t memcpy (ptr_t, const ptr_t, size_t); +extern ptr_t memset (ptr_t, int, size_t); # endif -extern char *fgetline __P((FILE *, int *)); +extern char *fgetline (FILE *, int *); #endif #endif /* _h_sys */ diff --git a/lib/libedit/term.c b/lib/libedit/term.c index 0ecdf0f0bd..2f876a7e03 100644 --- a/lib/libedit/term.c +++ b/lib/libedit/term.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libedit/term.c,v 1.11.6.1 2000/08/16 14:43:40 ache Exp $ - * $DragonFly: src/lib/libedit/term.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libedit/term.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ * * @(#)term.c 8.2 (Berkeley) 4/30/95 */ @@ -177,13 +177,13 @@ private struct termcapval { /* do two or more of the attributes use me */ -private void term_rebuffer_display __P((EditLine *)); -private void term_free_display __P((EditLine *)); -private void term_alloc_display __P((EditLine *)); -private void term_alloc __P((EditLine *, - struct termcapstr *, char *)); -private void term_init_arrow __P((EditLine *)); -private void term_reset_arrow __P((EditLine *)); +private void term_rebuffer_display (EditLine *); +private void term_free_display (EditLine *); +private void term_alloc_display (EditLine *); +private void term_alloc (EditLine *, + struct termcapstr *, char *); +private void term_init_arrow (EditLine *); +private void term_reset_arrow (EditLine *); private FILE *term_outfile = NULL; /* XXX: How do we fix that? */ diff --git a/lib/libedit/term.h b/lib/libedit/term.h index 8fbdc8bc48..2e113390f6 100644 --- a/lib/libedit/term.h +++ b/lib/libedit/term.h @@ -36,7 +36,7 @@ * @(#)term.h 8.1 (Berkeley) 6/4/93 * * $FreeBSD: src/lib/libedit/term.h,v 1.3.8.1 2000/08/16 14:43:40 ache Exp $ - * $DragonFly: src/lib/libedit/term.h,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libedit/term.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -83,30 +83,30 @@ typedef struct { #define A_K_EN 5 #define A_K_NKEYS 6 -protected void term_move_to_line __P((EditLine *, int)); -protected void term_move_to_char __P((EditLine *, int)); -protected void term_clear_EOL __P((EditLine *, int)); -protected void term_overwrite __P((EditLine *, char *, int)); -protected void term_insertwrite __P((EditLine *, char *, int)); -protected void term_deletechars __P((EditLine *, int)); -protected void term_clear_screen __P((EditLine *)); -protected void term_beep __P((EditLine *)); -protected void term_change_size __P((EditLine *, int, int)); -protected int term_get_size __P((EditLine *, int *, int *)); -protected int term_init __P((EditLine *)); -protected void term_bind_arrow __P((EditLine *)); -protected void term_print_arrow __P((EditLine *, char *)); -protected int term_clear_arrow __P((EditLine *, char *)); -protected int term_set_arrow __P((EditLine *, char *, - key_value_t *, int)); -protected void term_end __P((EditLine *)); -protected int term_set __P((EditLine *, char *)); -protected int term_settc __P((EditLine *, int, char **)); -protected int term_telltc __P((EditLine *, int, char **)); -protected int term_echotc __P((EditLine *, int, char **)); +protected void term_move_to_line (EditLine *, int); +protected void term_move_to_char (EditLine *, int); +protected void term_clear_EOL (EditLine *, int); +protected void term_overwrite (EditLine *, char *, int); +protected void term_insertwrite (EditLine *, char *, int); +protected void term_deletechars (EditLine *, int); +protected void term_clear_screen (EditLine *); +protected void term_beep (EditLine *); +protected void term_change_size (EditLine *, int, int); +protected int term_get_size (EditLine *, int *, int *); +protected int term_init (EditLine *); +protected void term_bind_arrow (EditLine *); +protected void term_print_arrow (EditLine *, char *); +protected int term_clear_arrow (EditLine *, char *); +protected int term_set_arrow (EditLine *, char *, + key_value_t *, int); +protected void term_end (EditLine *); +protected int term_set (EditLine *, char *); +protected int term_settc (EditLine *, int, char **); +protected int term_telltc (EditLine *, int, char **); +protected int term_echotc (EditLine *, int, char **); -protected int term__putc __P((int)); -protected void term__flush __P((void)); +protected int term__putc (int); +protected void term__flush (void); /* * Easy access macros diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c index fadab8fdf4..eff5cb24a3 100644 --- a/lib/libedit/tokenizer.c +++ b/lib/libedit/tokenizer.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)tokenizer.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/tokenizer.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/tokenizer.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -73,7 +73,7 @@ struct tokenizer { }; -private void tok_finish __P((Tokenizer *)); +private void tok_finish (Tokenizer *); /* tok_finish(): diff --git a/lib/libedit/tokenizer.h b/lib/libedit/tokenizer.h index e2a1370e1c..470bb921fa 100644 --- a/lib/libedit/tokenizer.h +++ b/lib/libedit/tokenizer.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)tokenizer.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/Attic/tokenizer.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/Attic/tokenizer.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -45,10 +45,10 @@ typedef struct tokenizer Tokenizer; -Tokenizer *tok_init __P((const char *)); -void tok_reset __P((Tokenizer *)); -void tok_end __P((Tokenizer *)); -int tok_line __P((Tokenizer *, const char *, - int *, char ***)); +Tokenizer *tok_init (const char *); +void tok_reset (Tokenizer *); +void tok_end (Tokenizer *); +int tok_line (Tokenizer *, const char *, + int *, char ***); #endif /* _h_tokenizer */ diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c index 9f0a06cb8f..875b8dd923 100644 --- a/lib/libedit/tty.c +++ b/lib/libedit/tty.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libedit/tty.c,v 1.4.6.1 2000/08/16 14:43:40 ache Exp $ - * $DragonFly: src/lib/libedit/tty.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libedit/tty.c,v 1.3 2003/11/12 20:21:29 eirikn Exp $ * * @(#)tty.c 8.1 (Berkeley) 6/4/93 */ @@ -447,10 +447,10 @@ private ttymodes_t ttymodes[] = { #define tty__geteightbit(td) (((td)->c_cflag & CSIZE) == CS8) #define tty__cooked_mode(td) ((td)->c_lflag & ICANON) -private void tty__getchar __P((struct termios *, unsigned char *)); -private void tty__setchar __P((struct termios *, unsigned char *)); -private speed_t tty__getspeed __P((struct termios *)); -private int tty_setup __P((EditLine *)); +private void tty__getchar (struct termios *, unsigned char *); +private void tty__setchar (struct termios *, unsigned char *); +private speed_t tty__getspeed (struct termios *); +private int tty_setup (EditLine *); #define t_qu t_ts diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h index 748bf00225..c8e54b1f2d 100644 --- a/lib/libedit/tty.h +++ b/lib/libedit/tty.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)tty.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/tty.h,v 1.2 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/tty.h,v 1.3 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -458,14 +458,14 @@ typedef struct { typedef unsigned char ttychar_t[NN_IO][C_NCC]; -protected int tty_init __P((EditLine *)); -protected void tty_end __P((EditLine *)); -protected int tty_stty __P((EditLine *, int, char**)); -protected int tty_rawmode __P((EditLine *)); -protected int tty_cookedmode __P((EditLine *)); -protected int tty_quotemode __P((EditLine *)); -protected int tty_noquotemode __P((EditLine *)); -protected void tty_bind_char __P((EditLine *, int)); +protected int tty_init (EditLine *); +protected void tty_end (EditLine *); +protected int tty_stty (EditLine *, int, char**); +protected int tty_rawmode (EditLine *); +protected int tty_cookedmode (EditLine *); +protected int tty_quotemode (EditLine *); +protected int tty_noquotemode (EditLine *); +protected void tty_bind_char (EditLine *, int); typedef struct { ttyperm_t t_t; diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c index bacb8c7421..fa3266cd1f 100644 --- a/lib/libedit/vi.c +++ b/lib/libedit/vi.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)vi.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libedit/vi.c,v 1.3 2003/11/12 18:07:02 eirikn Exp $ + * $DragonFly: src/lib/libedit/vi.c,v 1.4 2003/11/12 20:21:29 eirikn Exp $ */ /* @@ -43,7 +43,7 @@ #include "sys.h" #include "el.h" -private el_action_t cv_action __P((EditLine *, int)); +private el_action_t cv_action (EditLine *, int); /* cv_action(): * Handle vi actions. diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c index 1389cfd910..02ea08b780 100644 --- a/lib/libipsec/ipsec_dump_policy.c +++ b/lib/libipsec/ipsec_dump_policy.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/ipsec_dump_policy.c,v 1.1.2.1 2000/07/15 07:24:04 kris Exp $ */ -/* $DragonFly: src/lib/libipsec/ipsec_dump_policy.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/ipsec_dump_policy.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: ipsec_dump_policy.c,v 1.11 2000/05/07 05:29:47 itojun Exp $ */ /* @@ -56,11 +56,11 @@ static const char *ipsp_policy_strs[] = { "discard", "none", "ipsec", "entrust", "bypass", }; -static char *ipsec_dump_ipsecrequest __P((char *, size_t, - struct sadb_x_ipsecrequest *, size_t)); -static int set_addresses __P((char *, size_t, struct sockaddr *, - struct sockaddr *)); -static char *set_address __P((char *, size_t, struct sockaddr *)); +static char *ipsec_dump_ipsecrequest (char *, size_t, + struct sadb_x_ipsecrequest *, size_t); +static int set_addresses (char *, size_t, struct sockaddr *, + struct sockaddr *); +static char *set_address (char *, size_t, struct sockaddr *); /* * policy is sadb_x_policy buffer. diff --git a/lib/libipsec/ipsec_strerror.h b/lib/libipsec/ipsec_strerror.h index f4cebb39e3..e062d47f24 100644 --- a/lib/libipsec/ipsec_strerror.h +++ b/lib/libipsec/ipsec_strerror.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/ipsec_strerror.h,v 1.1.2.2 2001/07/03 11:01:14 ume Exp $ */ -/* $DragonFly: src/lib/libipsec/ipsec_strerror.h,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/ipsec_strerror.h,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: ipsec_strerror.h,v 1.8 2000/07/30 00:45:12 itojun Exp $ */ /* @@ -32,7 +32,7 @@ */ extern int __ipsec_errcode; -extern void __ipsec_set_strerror __P((const char *)); +extern void __ipsec_set_strerror (const char *); #define EIPSEC_NO_ERROR 0 /*success*/ #define EIPSEC_NOT_SUPPORTED 1 /*not supported*/ diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h index eb4ed5af4f..7a8efae006 100644 --- a/lib/libipsec/libpfkey.h +++ b/lib/libipsec/libpfkey.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/libpfkey.h,v 1.1.2.2 2001/07/03 11:01:14 ume Exp $ */ -/* $DragonFly: src/lib/libipsec/libpfkey.h,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/libpfkey.h,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: libpfkey.h,v 1.6 2001/03/05 18:22:17 thorpej Exp $ */ /* @@ -32,60 +32,60 @@ */ struct sadb_msg; -extern void pfkey_sadump __P((struct sadb_msg *)); -extern void pfkey_spdump __P((struct sadb_msg *)); +extern void pfkey_sadump (struct sadb_msg *); +extern void pfkey_spdump (struct sadb_msg *); struct sockaddr; struct sadb_alg; -int ipsec_check_keylen __P((u_int, u_int, u_int)); -int ipsec_check_keylen2 __P((u_int, u_int, u_int)); -int ipsec_get_keylen __P((u_int, u_int, struct sadb_alg *)); -u_int pfkey_set_softrate __P((u_int, u_int)); -u_int pfkey_get_softrate __P((u_int)); -int pfkey_send_getspi __P((int, u_int, u_int, struct sockaddr *, +int ipsec_check_keylen (u_int, u_int, u_int); +int ipsec_check_keylen2 (u_int, u_int, u_int); +int ipsec_get_keylen (u_int, u_int, struct sadb_alg *); +u_int pfkey_set_softrate (u_int, u_int); +u_int pfkey_get_softrate (u_int); +int pfkey_send_getspi (int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t)); -int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *, +int pfkey_send_update (int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t, u_int64_t, u_int64_t, u_int32_t)); -int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *, +int pfkey_send_add (int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int64_t, u_int64_t, u_int64_t, u_int32_t)); -int pfkey_send_delete __P((int, u_int, u_int, +int pfkey_send_delete (int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t)); -int pfkey_send_delete_all __P((int, u_int, u_int, +int pfkey_send_delete_all (int, u_int, u_int, struct sockaddr *, struct sockaddr *)); -int pfkey_send_get __P((int, u_int, u_int, +int pfkey_send_get (int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t)); -int pfkey_send_register __P((int, u_int)); -int pfkey_recv_register __P((int)); -int pfkey_set_supported __P((struct sadb_msg *, int)); -int pfkey_send_flush __P((int, u_int)); -int pfkey_send_dump __P((int, u_int)); -int pfkey_send_promisc_toggle __P((int, int)); -int pfkey_send_spdadd __P((int, struct sockaddr *, u_int, +int pfkey_send_register (int, u_int); +int pfkey_recv_register (int); +int pfkey_set_supported (struct sadb_msg *, int); +int pfkey_send_flush (int, u_int); +int pfkey_send_dump (int, u_int); +int pfkey_send_promisc_toggle (int, int); +int pfkey_send_spdadd (int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spdadd2 __P((int, struct sockaddr *, u_int, +int pfkey_send_spdadd2 (int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, caddr_t, int, u_int32_t)); -int pfkey_send_spdupdate __P((int, struct sockaddr *, u_int, +int pfkey_send_spdupdate (int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int, +int pfkey_send_spdupdate2 (int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, caddr_t, int, u_int32_t)); -int pfkey_send_spddelete __P((int, struct sockaddr *, u_int, +int pfkey_send_spddelete (int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spddelete2 __P((int, u_int32_t)); -int pfkey_send_spdget __P((int, u_int32_t)); -int pfkey_send_spdsetidx __P((int, struct sockaddr *, u_int, +int pfkey_send_spddelete2 (int, u_int32_t); +int pfkey_send_spdget (int, u_int32_t); +int pfkey_send_spdsetidx (int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spdflush __P((int)); -int pfkey_send_spddump __P((int)); +int pfkey_send_spdflush (int); +int pfkey_send_spddump (int); -int pfkey_open __P((void)); -void pfkey_close __P((int)); -struct sadb_msg *pfkey_recv __P((int)); -int pfkey_send __P((int, struct sadb_msg *, int)); -int pfkey_align __P((struct sadb_msg *, caddr_t *)); -int pfkey_check __P((caddr_t *)); +int pfkey_open (void); +void pfkey_close (int); +struct sadb_msg *pfkey_recv (int); +int pfkey_send (int, struct sadb_msg *, int); +int pfkey_align (struct sadb_msg *, caddr_t *); +int pfkey_check (caddr_t *); diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c index 870df07396..0b4ffd0023 100644 --- a/lib/libipsec/pfkey.c +++ b/lib/libipsec/pfkey.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/pfkey.c,v 1.1.2.2 2001/07/03 11:01:14 ume Exp $ */ -/* $DragonFly: src/lib/libipsec/pfkey.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/pfkey.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: pfkey.c,v 1.39 2001/03/05 18:22:17 thorpej Exp $ */ /* @@ -50,31 +50,31 @@ #define CALLOC(size, cast) (cast)calloc(1, (size)) -static int findsupportedmap __P((int)); -static int setsupportedmap __P((struct sadb_supported *)); -static struct sadb_alg *findsupportedalg __P((u_int, u_int)); -static int pfkey_send_x1 __P((int, u_int, u_int, u_int, struct sockaddr *, +static int findsupportedmap (int); +static int setsupportedmap (struct sadb_supported *); +static struct sadb_alg *findsupportedalg (u_int, u_int); +static int pfkey_send_x1 (int, u_int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t)); -static int pfkey_send_x2 __P((int, u_int, u_int, u_int, +static int pfkey_send_x2 (int, u_int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t)); -static int pfkey_send_x3 __P((int, u_int, u_int)); -static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int, +static int pfkey_send_x3 (int, u_int, u_int); +static int pfkey_send_x4 (int, u_int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, char *, int, u_int32_t)); -static int pfkey_send_x5 __P((int, u_int, u_int32_t)); +static int pfkey_send_x5 (int, u_int, u_int32_t); -static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int, +static caddr_t pfkey_setsadbmsg (caddr_t, caddr_t, u_int, u_int, u_int, u_int32_t, pid_t)); -static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int, +static caddr_t pfkey_setsadbsa (caddr_t, caddr_t, u_int32_t, u_int, u_int, u_int, u_int32_t)); -static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int, +static caddr_t pfkey_setsadbaddr (caddr_t, caddr_t, u_int, struct sockaddr *, u_int, u_int)); -static caddr_t pfkey_setsadbkey __P((caddr_t, caddr_t, u_int, caddr_t, u_int)); -static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t, +static caddr_t pfkey_setsadbkey (caddr_t, caddr_t, u_int, caddr_t, u_int); +static caddr_t pfkey_setsadblifetime (caddr_t, caddr_t, u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t)); -static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t)); +static caddr_t pfkey_setsadbxsa2 (caddr_t, caddr_t, u_int32_t, u_int32_t); /* * make and search supported algorithm structure. diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c index fe2bdfb444..ba4d2bba5a 100644 --- a/lib/libipsec/pfkey_dump.c +++ b/lib/libipsec/pfkey_dump.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.1.2.4 2003/04/27 00:03:36 sumikawa Exp $ */ -/* $DragonFly: src/lib/libipsec/pfkey_dump.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/pfkey_dump.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: pfkey_dump.c,v 1.28 2001/06/27 10:46:51 sakane Exp $ */ /* @@ -100,10 +100,10 @@ do { \ printf("%d ", (num)); \ } while (0) -static char *str_ipaddr __P((struct sockaddr *)); -static char *str_prefport __P((u_int, u_int, u_int)); -static char *str_time __P((time_t)); -static void str_lifetime_byte __P((struct sadb_lifetime *, char *)); +static char *str_ipaddr (struct sockaddr *); +static char *str_prefport (u_int, u_int, u_int); +static char *str_time (time_t); +static void str_lifetime_byte (struct sadb_lifetime *, char *); struct val2str { int val; diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y index a231f5874d..8de2b77685 100644 --- a/lib/libipsec/policy_parse.y +++ b/lib/libipsec/policy_parse.y @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/policy_parse.y,v 1.1.2.1 2000/07/15 07:24:04 kris Exp $ */ -/* $DragonFly: src/lib/libipsec/policy_parse.y,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/policy_parse.y,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: policy_parse.y,v 1.10 2000/05/07 05:25:03 itojun Exp $ */ /* @@ -76,18 +76,18 @@ static struct sockaddr *p_src = NULL; static struct sockaddr *p_dst = NULL; struct _val; -extern void yyerror __P((char *msg)); -static struct sockaddr *parse_sockaddr __P((struct _val *buf)); -static int rule_check __P((void)); -static int init_x_policy __P((void)); -static int set_x_request __P((struct sockaddr *src, struct sockaddr *dst)); -static int set_sockaddr __P((struct sockaddr *addr)); -static void policy_parse_request_init __P((void)); -static caddr_t policy_parse __P((char *msg, int msglen)); - -extern void __policy__strbuffer__init__ __P((char *msg)); -extern int yyparse __P((void)); -extern int yylex __P((void)); +extern void yyerror (char *msg); +static struct sockaddr *parse_sockaddr (struct _val *buf); +static int rule_check (void); +static int init_x_policy (void); +static int set_x_request (struct sockaddr *src, struct sockaddr *dst); +static int set_sockaddr (struct sockaddr *addr); +static void policy_parse_request_init (void); +static caddr_t policy_parse (char *msg, int msglen); + +extern void __policy__strbuffer__init__ (char *msg); +extern int yyparse (void); +extern int yylex (void); %} diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l index 2ea09289f2..706172d89b 100644 --- a/lib/libipsec/policy_token.l +++ b/lib/libipsec/policy_token.l @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/policy_token.l,v 1.2.2.2 2001/07/03 11:01:15 ume Exp $ */ -/* $DragonFly: src/lib/libipsec/policy_token.l,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/policy_token.l,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: policy_token.l,v 1.11 2000/12/01 10:08:29 sakane Exp $ */ /* @@ -54,7 +54,7 @@ #endif #define yylval __libipsecyylval /* XXX */ -int yylex __P((void)); +int yylex (void); %} %option noyywrap @@ -133,7 +133,7 @@ unique { yylval.num = IPSEC_LEVEL_UNIQUE; return(LEVEL); } %% -void __policy__strbuffer__init__ __P((char *)); +void __policy__strbuffer__init__ (char *); void __policy__strbuffer__init__(msg) diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c index 0c939a1662..db0dcb4be4 100644 --- a/lib/libipsec/test-policy.c +++ b/lib/libipsec/test-policy.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libipsec/test-policy.c,v 1.2.2.2 2001/07/03 11:01:15 ume Exp $ */ -/* $DragonFly: src/lib/libipsec/test-policy.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ */ +/* $DragonFly: src/lib/libipsec/test-policy.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ /* $KAME: test-policy.c,v 1.14 2000/12/27 11:38:11 sakane Exp $ */ /* @@ -85,11 +85,11 @@ struct req_t { { 0, "out ipsec esp/transport/fec0::10-fec0::11/use" }, }; -int test1 __P((void)); -int test1sub1 __P((struct req_t *)); -int test1sub2 __P((char *, int)); -int test2 __P((void)); -int test2sub __P((int)); +int test1 (void); +int test1sub1 (struct req_t *); +int test1sub2 (char *, int); +int test2 (void); +int test2sub (int); int main(ac, av) diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 1087214fc4..15189e335d 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -36,7 +36,7 @@ * * @(#)kvm.c 8.2 (Berkeley) 2/13/94 * $FreeBSD: src/lib/libkvm/kvm.c,v 1.12.2.3 2002/09/13 14:53:43 nectar Exp $ - * $DragonFly: src/lib/libkvm/kvm.c,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm.c,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ #include @@ -67,7 +67,7 @@ #include "kvm_private.h" /* from src/lib/libc/gen/nlist.c */ -int __fdnlist __P((int, struct nlist *)); +int __fdnlist (int, struct nlist *); char * kvm_geterr(kd) diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h index c52f82dda6..55fea82be9 100644 --- a/lib/libkvm/kvm.h +++ b/lib/libkvm/kvm.h @@ -32,7 +32,7 @@ * * @(#)kvm.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/lib/libkvm/kvm.h,v 1.11 1999/08/27 23:44:50 peter Exp $ - * $DragonFly: src/lib/libkvm/kvm.h,v 1.3 2003/11/09 02:34:02 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm.h,v 1.4 2003/11/12 20:21:30 eirikn Exp $ */ #ifndef _KVM_H_ @@ -64,24 +64,24 @@ struct kvm_swap { #define SWIF_DEV_PREFIX 0x0002 __BEGIN_DECLS -int kvm_close __P((kvm_t *)); -char **kvm_getargv __P((kvm_t *, const struct kinfo_proc *, int)); -char **kvm_getenvv __P((kvm_t *, const struct kinfo_proc *, int)); -char *kvm_geterr __P((kvm_t *)); -char *kvm_getfiles __P((kvm_t *, int, int, int *)); -int kvm_getloadavg __P((kvm_t *, double [], int)); +int kvm_close (kvm_t *); +char **kvm_getargv (kvm_t *, const struct kinfo_proc *, int); +char **kvm_getenvv (kvm_t *, const struct kinfo_proc *, int); +char *kvm_geterr (kvm_t *); +char *kvm_getfiles (kvm_t *, int, int, int *); +int kvm_getloadavg (kvm_t *, double [], int); struct kinfo_proc * - kvm_getprocs __P((kvm_t *, int, int, int *)); -int kvm_getswapinfo __P((kvm_t *, struct kvm_swap *, int, int)); -int kvm_nlist __P((kvm_t *, struct nlist *)); + kvm_getprocs (kvm_t *, int, int, int *); +int kvm_getswapinfo (kvm_t *, struct kvm_swap *, int, int); +int kvm_nlist (kvm_t *, struct nlist *); kvm_t *kvm_open - __P((const char *, const char *, const char *, int, const char *)); + (const char *, const char *, const char *, int, const char *); kvm_t *kvm_openfiles - __P((const char *, const char *, const char *, int, char *)); -__ssize_t kvm_read __P((kvm_t *, unsigned long, void *, __size_t)); + (const char *, const char *, const char *, int, char *); +__ssize_t kvm_read (kvm_t *, unsigned long, void *, __size_t); __ssize_t kvm_uread - __P((kvm_t *, const struct proc *, unsigned long, char *, __size_t)); -__ssize_t kvm_write __P((kvm_t *, unsigned long, const void *, __size_t)); + (kvm_t *, const struct proc *, unsigned long, char *, __size_t); +__ssize_t kvm_write (kvm_t *, unsigned long, const void *, __size_t); __END_DECLS #endif /* !_KVM_H_ */ diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h index 048a1e660b..81e8b89467 100644 --- a/lib/libkvm/kvm_private.h +++ b/lib/libkvm/kvm_private.h @@ -36,7 +36,7 @@ * * @(#)kvm_private.h 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libkvm/kvm_private.h,v 1.5 1999/12/27 07:14:58 peter Exp $ - * $DragonFly: src/lib/libkvm/kvm_private.h,v 1.2 2003/06/17 04:26:49 dillon Exp $ + * $DragonFly: src/lib/libkvm/kvm_private.h,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ struct __kvm { @@ -71,13 +71,13 @@ struct __kvm { /* * Functions used internally by kvm, but across kvm modules. */ -void _kvm_err __P((kvm_t *kd, const char *program, const char *fmt, ...)); -void _kvm_freeprocs __P((kvm_t *kd)); -void _kvm_freevtop __P((kvm_t *)); -int _kvm_initvtop __P((kvm_t *)); -int _kvm_kvatop __P((kvm_t *, u_long, u_long *)); -void *_kvm_malloc __P((kvm_t *kd, size_t)); -void *_kvm_realloc __P((kvm_t *kd, void *, size_t)); +void _kvm_err (kvm_t *kd, const char *program, const char *fmt, ...); +void _kvm_freeprocs (kvm_t *kd); +void _kvm_freevtop (kvm_t *); +int _kvm_initvtop (kvm_t *); +int _kvm_kvatop (kvm_t *, u_long, u_long *); +void *_kvm_malloc (kvm_t *kd, size_t); +void *_kvm_realloc (kvm_t *kd, void *, size_t); void _kvm_syserr - __P((kvm_t *kd, const char *program, const char *fmt, ...)); -int _kvm_uvatop __P((kvm_t *, const struct proc *, u_long, u_long *)); + (kvm_t *kd, const char *program, const char *fmt, ...); +int _kvm_uvatop (kvm_t *, const struct proc *, u_long, u_long *); diff --git a/lib/libm/common_source/gamma.c b/lib/libm/common_source/gamma.c index 51c32e41dd..a274d7e1c9 100644 --- a/lib/libm/common_source/gamma.c +++ b/lib/libm/common_source/gamma.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)gamma.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libm/common_source/Attic/gamma.c,v 1.3 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/libm/common_source/Attic/gamma.c,v 1.4 2003/11/12 20:21:30 eirikn Exp $ */ /* @@ -75,11 +75,11 @@ * Maximum observed error < 4ulp in 1,000,000 trials. */ -static double neg_gam __P((double)); -static double small_gam __P((double)); -static double smaller_gam __P((double)); -static struct Double large_gam __P((double)); -static struct Double ratfun_gam __P((double, double)); +static double neg_gam (double); +static double small_gam (double); +static double smaller_gam (double); +static struct Double large_gam (double); +static struct Double ratfun_gam (double, double); /* * Rational approximation, A0 + x*x*P(x)/Q(x), on the interval diff --git a/lib/libm/common_source/j0.c b/lib/libm/common_source/j0.c index 6d20097be1..27c715ea29 100644 --- a/lib/libm/common_source/j0.c +++ b/lib/libm/common_source/j0.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)j0.c 8.2 (Berkeley) 11/30/93 - * $DragonFly: src/lib/libm/common_source/Attic/j0.c,v 1.3 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/libm/common_source/Attic/j0.c,v 1.4 2003/11/12 20:21:30 eirikn Exp $ */ /* @@ -118,7 +118,7 @@ #define infnan(x) (0.0) #endif -static double pzero __P((double)), qzero __P((double)); +static double pzero (double), qzero (double); static double huge = 1e300, diff --git a/lib/libm/common_source/mathimpl.h b/lib/libm/common_source/mathimpl.h index 917e8b32ef..441240b07f 100644 --- a/lib/libm/common_source/mathimpl.h +++ b/lib/libm/common_source/mathimpl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mathimpl.h 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libm/common_source/Attic/mathimpl.h,v 1.2 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/libm/common_source/Attic/mathimpl.h,v 1.3 2003/11/12 20:21:30 eirikn Exp $ */ #include @@ -95,5 +95,5 @@ extern double __exp__E(); extern double __log__L(); struct Double {double a, b;}; -double __exp__D __P((double, double)); -struct Double __log__D __P((double)); +double __exp__D (double, double); +struct Double __log__D (double); diff --git a/lib/libm/common_source/pow.c b/lib/libm/common_source/pow.c index c182629433..b756f28039 100644 --- a/lib/libm/common_source/pow.c +++ b/lib/libm/common_source/pow.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)pow.c 8.1 (Berkeley) 6/4/93 - * $DragonFly: src/lib/libm/common_source/Attic/pow.c,v 1.3 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/libm/common_source/Attic/pow.c,v 1.4 2003/11/12 20:21:31 eirikn Exp $ */ /* POW(X,Y) @@ -120,7 +120,7 @@ const static double zero=0.0, one=1.0, two=2.0, negone= -1.0; -static double pow_P __P((double, double)); +static double pow_P (double, double); double pow(x,y) double x,y; diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c index 38e264e330..136b18ffaa 100644 --- a/lib/libmd/md5c.c +++ b/lib/libmd/md5c.c @@ -23,7 +23,7 @@ * documentation and/or software. * * $FreeBSD: src/lib/libmd/md5c.c,v 1.11 1999/12/29 05:04:20 peter Exp $ - * $DragonFly: src/lib/libmd/md5c.c,v 1.2 2003/06/17 04:26:50 dillon Exp $ + * $DragonFly: src/lib/libmd/md5c.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ * * This code is the same as the code published by RSA Inc. It has been * edited for clarity and style only. @@ -39,7 +39,7 @@ #include -static void MD5Transform __P((u_int32_t [4], const unsigned char [64])); +static void MD5Transform (u_int32_t [4], const unsigned char [64]); #ifdef _KERNEL #define memset(x,y,z) bzero(x,z); diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c index b3b654568c..bde039ab7d 100644 --- a/lib/libncp/ipx.c +++ b/lib/libncp/ipx.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libncp/ipx.c,v 1.1 1999/10/12 11:56:37 bp Exp $ - * $DragonFly: src/lib/libncp/ipx.c,v 1.2 2003/06/17 04:26:50 dillon Exp $ + * $DragonFly: src/lib/libncp/ipx.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #include #include @@ -185,9 +185,9 @@ void ipx_assign_node(IPXNode *dest, IPXNode *src) { } -static void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); -static int if_ipxscan __P((int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, - struct ifa_msghdr *ifam,struct ipx_addr *addr)); +static void rt_xaddrs (caddr_t, caddr_t, struct rt_addrinfo *); +static int if_ipxscan (int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, + struct ifa_msghdr *ifam,struct ipx_addr *addr); /* * Find an IPX interface. diff --git a/lib/libncp/ncp_mod.h b/lib/libncp/ncp_mod.h index f1dce90eae..ff3c574c66 100644 --- a/lib/libncp/ncp_mod.h +++ b/lib/libncp/ncp_mod.h @@ -2,7 +2,7 @@ * Describes all ncp_lib kernel functions * * $FreeBSD: src/lib/libncp/ncp_mod.h,v 1.1 1999/10/12 11:56:38 bp Exp $ - * $DragonFly: src/lib/libncp/ncp_mod.h,v 1.2 2003/06/17 04:26:50 dillon Exp $ + * $DragonFly: src/lib/libncp/ncp_mod.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #ifndef _NCP_MOD_H_ #define _NCP_MOD_H_ @@ -14,4 +14,4 @@ #define NCP_INTFN NCP_SE(2) #define SNCP_REQUEST NCP_SE(3) -#endif /* !_NCP_MOD_H_ */ \ No newline at end of file +#endif /* !_NCP_MOD_H_ */ diff --git a/lib/librpcsvc/secretkey.c b/lib/librpcsvc/secretkey.c index 678a45ad83..a25751fba3 100644 --- a/lib/librpcsvc/secretkey.c +++ b/lib/librpcsvc/secretkey.c @@ -28,7 +28,7 @@ * Mountain View, California 94043 * * @(#)secretkey.c 1.8 91/03/11 Copyr 1986 Sun Micro - * $DragonFly: src/lib/librpcsvc/secretkey.c,v 1.3 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/librpcsvc/secretkey.c,v 1.4 2003/11/12 20:21:31 eirikn Exp $ */ /* @@ -47,7 +47,7 @@ #include #include -extern int xdecrypt __P(( char *, char * )); +extern int xdecrypt ( char *, char * ); /* * Get somebody's encrypted secret key from the database, using the given diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c index 66f8c2154f..c156b4e5e4 100644 --- a/lib/librpcsvc/xcrypt.c +++ b/lib/librpcsvc/xcrypt.c @@ -28,7 +28,7 @@ * * @(#)xcrypt.c 2.2 88/08/10 4.0 RPCSRC * $FreeBSD: src/lib/librpcsvc/xcrypt.c,v 1.2 1999/08/28 00:05:24 peter Exp $ - * $DragonFly: src/lib/librpcsvc/xcrypt.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ + * $DragonFly: src/lib/librpcsvc/xcrypt.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ /* * Hex encryption/decryption and utility routines @@ -43,10 +43,10 @@ #include static char hex[]; /* forward */ -static char hexval __P(( char )); -static void bin2hex __P(( int, unsigned char *, char * )); -static void hex2bin __P(( int, char *, char * )); -void passwd2des __P(( char *, char * )); +static char hexval ( char ); +static void bin2hex ( int, unsigned char *, char * ); +static void hex2bin ( int, char *, char * ); +void passwd2des ( char *, char * ); /* * Encrypt a secret key given passwd diff --git a/lib/libskey/put.c b/lib/libskey/put.c index 34418a8aaa..db0f6fe608 100644 --- a/lib/libskey/put.c +++ b/lib/libskey/put.c @@ -1,5 +1,5 @@ /* - * $DragonFly: src/lib/libskey/put.c,v 1.2 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/libskey/put.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #include @@ -8,10 +8,10 @@ #include #include "skey.h" -static unsigned long extract __P((char *s,int start,int length)); -static void standard __P((char *word)); -static void insert __P((char *s, int x, int start, int length)); -static int wsrch __P((char *w,int low,int high)); +static unsigned long extract (char *s,int start,int length); +static void standard (char *word); +static void insert (char *s, int x, int start, int length); +static int wsrch (char *w,int low,int high); /* Dictionary for integer-word translations */ static char Wp[2048][4] = { diff --git a/lib/libskey/skey.h b/lib/libskey/skey.h index 3081f5e04f..e67d6f281a 100644 --- a/lib/libskey/skey.h +++ b/lib/libskey/skey.h @@ -1,5 +1,5 @@ /* - * $DragonFly: src/lib/libskey/skey.h,v 1.2 2003/11/12 18:07:03 eirikn Exp $ + * $DragonFly: src/lib/libskey/skey.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #ifndef _SKEY_H_ @@ -38,27 +38,27 @@ struct mc { #define rip _sk_rip #define sevenbit _sk_sevenbit -void f __P((char *x)); -int keycrunch __P((char *result,const char *seed,const char *passwd)); -char *btoe __P((char *engout,char *c)); -char *put8 __P((char *out,char *s)); -int atob8 __P((char *out, char *in)); -int btoa8 __P((char *out, char *in)); -int htoi __P((char c)); -int etob __P((char *out,char *e)); -void sevenbit __P((char *s)); -char *readpass __P((char *buf, int n)); -void rip __P((char *buf)); +void f (char *x); +int keycrunch (char *result,const char *seed,const char *passwd); +char *btoe (char *engout,char *c); +char *put8 (char *out,char *s); +int atob8 (char *out, char *in); +int btoa8 (char *out, char *in); +int htoi (char c); +int etob (char *out,char *e); +void sevenbit (char *s); +char *readpass (char *buf, int n); +void rip (char *buf); #endif /* _SKEY_INTERNAL */ /* Simplified application programming interface. */ #include -int skeylookup __P((struct skey *mp, const char *name)); -int skeyverify __P((struct skey *mp, char *response)); -int skeychallenge __P((struct skey *mp, const char *name, char *challenge)); -int skeyinfo __P((struct skey *mp, const char* name, char *ss)); -int skeyaccess __P((char *user, const char *port, const char *host, const char *addr)); -char *skey_getpass __P((const char *prompt, struct passwd * pwd, int pwok)); -const char *skey_crypt __P((char *pp, char *salt, struct passwd *pwd, int pwok)); +int skeylookup (struct skey *mp, const char *name); +int skeyverify (struct skey *mp, char *response); +int skeychallenge (struct skey *mp, const char *name, char *challenge); +int skeyinfo (struct skey *mp, const char* name, char *ss); +int skeyaccess (char *user, const char *port, const char *host, const char *addr); +char *skey_getpass (const char *prompt, struct passwd * pwd, int pwok); +const char *skey_crypt (char *pp, char *salt, struct passwd *pwd, int pwok); #endif /* _SKEY_H_ */ diff --git a/lib/libskey/skeyaccess.c b/lib/libskey/skeyaccess.c index eb7450b3bd..f3055d7f0a 100644 --- a/lib/libskey/skeyaccess.c +++ b/lib/libskey/skeyaccess.c @@ -24,7 +24,7 @@ * Author: Wietse Venema, Eindhoven University of Technology. * * $FreeBSD: src/lib/libskey/skeyaccess.c,v 1.9.6.2 2002/08/12 19:42:24 iedowse Exp $ - * $DragonFly: src/lib/libskey/skeyaccess.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ + * $DragonFly: src/lib/libskey/skeyaccess.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #include @@ -49,12 +49,12 @@ */ static char *prev_token = 0; /* push-back buffer */ static char *line_pointer = NULL; -static char *first_token __P((char *, int, FILE *)); +static char *first_token (char *, int, FILE *); static int line_number; -static void unget_token __P((char *)); -static char *get_token __P((void)); -static char *need_token __P((void)); -static char *need_internet_addr __P((void)); +static void unget_token (char *); +static char *get_token (void); +static char *need_token (void); +static char *need_internet_addr (void); /* * Various forms of token matching. @@ -63,12 +63,12 @@ static char *need_internet_addr __P((void)); #define match_port(l) match_token((l)->port) #define match_user(l) match_token((l)->user) struct login_info; -static int match_internet_addr __P((struct login_info *)); -static int match_group __P((struct login_info *)); -static int match_token __P((char *)); -static int is_internet_addr __P((char *)); -static struct addrinfo *convert_internet_addr __P((char *)); -static struct addrinfo *lookup_internet_addr __P((char *)); +static int match_internet_addr (struct login_info *); +static int match_group (struct login_info *); +static int match_token (char *); +static int is_internet_addr (char *); +static struct addrinfo *convert_internet_addr (char *); +static struct addrinfo *lookup_internet_addr (char *); #define MAX_ADDR 32 #define PERMIT 1 @@ -88,8 +88,8 @@ struct login_info { char *port; /* login port */ }; -static int _skeyaccess __P((FILE *, struct login_info *)); -int skeyaccess __P((char *, char *, char *, char *)); +static int _skeyaccess (FILE *, struct login_info *); +int skeyaccess (char *, char *, char *, char *); /* skeyaccess - find out if UNIX passwords are permitted */ diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c index 49f30be467..f5f30ffb63 100644 --- a/lib/libskey/skeylogin.c +++ b/lib/libskey/skeylogin.c @@ -5,7 +5,7 @@ * Many references for mink may still be found in this program. * * $FreeBSD: src/lib/libskey/skeylogin.c,v 1.14.6.1 2000/07/18 11:38:24 sheldonh Exp $ - * $DragonFly: src/lib/libskey/skeylogin.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ + * $DragonFly: src/lib/libskey/skeylogin.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #include @@ -23,7 +23,7 @@ #include "skey.h" #include "pathnames.h" -static char *skipspace __P((char *)); +static char *skipspace (char *); #define setpriority(x,y,z) /* nothing */ diff --git a/lib/libskey/skeysubr.c b/lib/libskey/skeysubr.c index f72a5243cc..a571a5633f 100644 --- a/lib/libskey/skeysubr.c +++ b/lib/libskey/skeysubr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/lib/libskey/skeysubr.c,v 1.9.6.1 2000/07/20 20:13:42 obrien Exp $ */ -/* $DragonFly: src/lib/libskey/skeysubr.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ */ +/* $DragonFly: src/lib/libskey/skeysubr.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #include #include @@ -76,7 +76,7 @@ char *buf; static struct termios saved_ttymode; -static void interrupt __P((int)); +static void interrupt (int); static void interrupt(sig) int sig; @@ -91,7 +91,7 @@ char *buf; int n; { struct termios noecho_ttymode; - void (*oldsig) __P((int)); + void (*oldsig) (int); /* Save normal line editing modes */ tcgetattr(0, &saved_ttymode); diff --git a/lib/libstand/quad.h b/lib/libstand/quad.h index 6271c0a6f3..eb5c2f1b5d 100644 --- a/lib/libstand/quad.h +++ b/lib/libstand/quad.h @@ -36,7 +36,7 @@ * * @(#)quad.h 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libstand/quad.h,v 1.2 1999/08/28 00:05:33 peter Exp $ - * $DragonFly: src/lib/libstand/quad.h,v 1.2 2003/06/17 04:26:51 dillon Exp $ + * $DragonFly: src/lib/libstand/quad.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ /* @@ -98,11 +98,11 @@ union uu { #define LHALF(x) ((x) & ((1 << HALF_BITS) - 1)) #define LHUP(x) ((x) << HALF_BITS) -quad_t __divdi3 __P((quad_t a, quad_t b)); -quad_t __moddi3 __P((quad_t a, quad_t b)); -u_quad_t __qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem)); -u_quad_t __udivdi3 __P((u_quad_t a, u_quad_t b)); -u_quad_t __umoddi3 __P((u_quad_t a, u_quad_t b)); +quad_t __divdi3 (quad_t a, quad_t b); +quad_t __moddi3 (quad_t a, quad_t b); +u_quad_t __qdivrem (u_quad_t u, u_quad_t v, u_quad_t *rem); +u_quad_t __udivdi3 (u_quad_t a, u_quad_t b); +u_quad_t __umoddi3 (u_quad_t a, u_quad_t b); /* * XXX diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index e159ce0fdf..4039c1f1e5 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,6 +1,6 @@ /* $NetBSD: fparseln.c,v 1.9 1999/09/20 04:48:06 lukem Exp $ */ /* $FreeBSD: src/lib/libutil/fparseln.c,v 1.2 1999/12/29 17:50:33 peter Exp $ */ -/* $DragonFly: src/lib/libutil/fparseln.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ */ +/* $DragonFly: src/lib/libutil/fparseln.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -43,7 +43,7 @@ #include #include -static int isescaped __P((const char *, const char *, int)); +static int isescaped (const char *, const char *, int); /* isescaped(): * Return true if the character in *p that belongs to a string @@ -202,7 +202,7 @@ fparseln(fp, size, lineno, str, flags) #ifdef TEST -int main __P((int, char **)); +int main (int, char **); int main(argc, argv) diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h index f1cf5f314b..298f7a0e7d 100644 --- a/lib/libutil/libutil.h +++ b/lib/libutil/libutil.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libutil/libutil.h,v 1.26.2.3 2000/11/22 03:49:49 murray Exp $ - * $DragonFly: src/lib/libutil/libutil.h,v 1.2 2003/06/17 04:26:51 dillon Exp $ + * $DragonFly: src/lib/libutil/libutil.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #ifndef _LIBUTIL_H_ @@ -49,30 +49,30 @@ struct utmp; struct in_addr; __BEGIN_DECLS -void login __P((struct utmp *_ut)); -int login_tty __P((int _fd)); -int logout __P((const char *_line)); -void logwtmp __P((const char *_line, const char *_name, const char *_host)); -void trimdomain __P((char *_fullhost, int _hostsize)); -int openpty __P((int *_amaster, int *_aslave, char *_name, - struct termios *_termp, struct winsize *_winp)); -int forkpty __P((int *_amaster, char *_name, - struct termios *_termp, struct winsize *_winp)); -const char *uu_lockerr __P((int _uu_lockresult)); -int uu_lock __P((const char *_ttyname)); -int uu_unlock __P((const char *_ttyname)); -int uu_lock_txfr __P((const char *_ttyname, pid_t _pid)); -int _secure_path __P((const char *_path, uid_t _uid, gid_t _gid)); -properties properties_read __P((int fd)); -void properties_free __P((properties list)); -char *property_find __P((properties list, const char *name)); -char *auth_getval __P((const char *name)); -int realhostname __P((char *host, size_t hsize, const struct in_addr *ip)); +void login (struct utmp *_ut); +int login_tty (int _fd); +int logout (const char *_line); +void logwtmp (const char *_line, const char *_name, const char *_host); +void trimdomain (char *_fullhost, int _hostsize); +int openpty (int *_amaster, int *_aslave, char *_name, + struct termios *_termp, struct winsize *_winp); +int forkpty (int *_amaster, char *_name, + struct termios *_termp, struct winsize *_winp); +const char *uu_lockerr (int _uu_lockresult); +int uu_lock (const char *_ttyname); +int uu_unlock (const char *_ttyname); +int uu_lock_txfr (const char *_ttyname, pid_t _pid); +int _secure_path (const char *_path, uid_t _uid, gid_t _gid); +properties properties_read (int fd); +void properties_free (properties list); +char *property_find (properties list, const char *name); +char *auth_getval (const char *name); +int realhostname (char *host, size_t hsize, const struct in_addr *ip); struct sockaddr; -int realhostname_sa __P((char *host, size_t hsize, struct sockaddr *addr, - int addrlen)); +int realhostname_sa (char *host, size_t hsize, struct sockaddr *addr, + int addrlen); #ifdef _STDIO_H_ /* avoid adding new includes */ -char *fparseln __P((FILE *, size_t *, size_t *, const char[3], int)); +char *fparseln (FILE *, size_t *, size_t *, const char[3], int); #endif __END_DECLS diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h index 91a8091866..9933dbbb8d 100644 --- a/lib/libutil/login_cap.h +++ b/lib/libutil/login_cap.h @@ -23,7 +23,7 @@ * * Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp * $FreeBSD: src/lib/libutil/login_cap.h,v 1.3.2.1 2000/09/20 11:19:54 green Exp $ - * $DragonFly: src/lib/libutil/login_cap.h,v 1.2 2003/06/17 04:26:52 dillon Exp $ + * $DragonFly: src/lib/libutil/login_cap.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #ifndef _LOGIN_CAP_H_ @@ -97,61 +97,61 @@ typedef struct login_time { __BEGIN_DECLS struct passwd; -void login_close __P((login_cap_t *)); -login_cap_t *login_getclassbyname __P((const char *, const struct passwd *)); -login_cap_t *login_getclass __P((const char *)); -login_cap_t *login_getpwclass __P((const struct passwd *)); -login_cap_t *login_getuserclass __P((const struct passwd *)); - -char *login_getcapstr __P((login_cap_t*, const char *, char *, char *)); -char **login_getcaplist __P((login_cap_t *, const char *, const char *)); -char *login_getstyle __P((login_cap_t *, char *, const char *)); -rlim_t login_getcaptime __P((login_cap_t *, const char *, rlim_t, rlim_t)); -rlim_t login_getcapnum __P((login_cap_t *, const char *, rlim_t, rlim_t)); -rlim_t login_getcapsize __P((login_cap_t *, const char *, rlim_t, rlim_t)); -char *login_getpath __P((login_cap_t *, const char *, char *)); -int login_getcapbool __P((login_cap_t *, const char *, int)); -const char *login_setcryptfmt __P((login_cap_t *, const char *, const char *)); - -int setclasscontext __P((const char*, unsigned int)); -int setusercontext __P((login_cap_t*, const struct passwd*, uid_t, unsigned int)); -void setclassresources __P((login_cap_t *)); -void setclassenvironment __P((login_cap_t *, const struct passwd *, int)); +void login_close (login_cap_t *); +login_cap_t *login_getclassbyname (const char *, const struct passwd *); +login_cap_t *login_getclass (const char *); +login_cap_t *login_getpwclass (const struct passwd *); +login_cap_t *login_getuserclass (const struct passwd *); + +char *login_getcapstr (login_cap_t*, const char *, char *, char *); +char **login_getcaplist (login_cap_t *, const char *, const char *); +char *login_getstyle (login_cap_t *, char *, const char *); +rlim_t login_getcaptime (login_cap_t *, const char *, rlim_t, rlim_t); +rlim_t login_getcapnum (login_cap_t *, const char *, rlim_t, rlim_t); +rlim_t login_getcapsize (login_cap_t *, const char *, rlim_t, rlim_t); +char *login_getpath (login_cap_t *, const char *, char *); +int login_getcapbool (login_cap_t *, const char *, int); +const char *login_setcryptfmt (login_cap_t *, const char *, const char *); + +int setclasscontext (const char*, unsigned int); +int setusercontext (login_cap_t*, const struct passwd*, uid_t, unsigned int); +void setclassresources (login_cap_t *); +void setclassenvironment (login_cap_t *, const struct passwd *, int); /* Most of these functions are deprecated */ -int auth_approve __P((login_cap_t*, const char*, const char*)); -int auth_check __P((const char *, const char *, const char *, const char *, int *)); -void auth_env __P((void)); -char *auth_mkvalue __P((const char *n)); -int auth_response __P((const char *, const char *, const char *, const char *, int *, const char *, const char *)); -void auth_rmfiles __P((void)); -int auth_scan __P((int)); -int auth_script __P((const char*, ...)); -int auth_script_data __P((const char *, int, const char *, ...)); -char *auth_valud __P((const char *)); -int auth_setopt __P((const char *, const char *)); -void auth_clropts __P((void)); - -void auth_checknologin __P((login_cap_t*)); -int auth_cat __P((const char*)); - -int auth_ttyok __P((login_cap_t*, const char *)); -int auth_hostok __P((login_cap_t*, const char *, char const *)); -int auth_timeok __P((login_cap_t*, time_t)); +int auth_approve (login_cap_t*, const char*, const char*); +int auth_check (const char *, const char *, const char *, const char *, int *); +void auth_env (void); +char *auth_mkvalue (const char *n); +int auth_response (const char *, const char *, const char *, const char *, int *, const char *, const char *); +void auth_rmfiles (void); +int auth_scan (int); +int auth_script (const char*, ...); +int auth_script_data (const char *, int, const char *, ...); +char *auth_valud (const char *); +int auth_setopt (const char *, const char *); +void auth_clropts (void); + +void auth_checknologin (login_cap_t*); +int auth_cat (const char*); + +int auth_ttyok (login_cap_t*, const char *); +int auth_hostok (login_cap_t*, const char *, char const *); +int auth_timeok (login_cap_t*, time_t); struct tm; -login_time_t parse_lt __P((const char *)); -int in_ltm __P((const login_time_t *, struct tm *, time_t *)); -int in_ltms __P((const login_time_t *, struct tm *, time_t *)); +login_time_t parse_lt (const char *); +int in_ltm (const login_time_t *, struct tm *, time_t *); +int in_ltms (const login_time_t *, struct tm *, time_t *); /* helper functions */ -int login_strinlist __P((char **, char const *, int)); -int login_str2inlist __P((char **, const char *, const char *, int)); -login_time_t * login_timelist __P((login_cap_t *, char const *, int *, login_time_t **)); -int login_ttyok __P((login_cap_t *, const char *, const char *, const char *)); -int login_hostok __P((login_cap_t *, const char *, const char *, const char *, const char *)); +int login_strinlist (char **, char const *, int); +int login_str2inlist (char **, const char *, const char *, int); +login_time_t * login_timelist (login_cap_t *, char const *, int *, login_time_t **); +int login_ttyok (login_cap_t *, const char *, const char *, const char *); +int login_hostok (login_cap_t *, const char *, const char *, const char *, const char *); __END_DECLS diff --git a/lib/msun/src/get_hw_float.c b/lib/msun/src/get_hw_float.c index bec0ceedd6..1f77e975c9 100644 --- a/lib/msun/src/get_hw_float.c +++ b/lib/msun/src/get_hw_float.c @@ -24,13 +24,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/msun/src/get_hw_float.c,v 1.3 1999/08/28 00:06:40 peter Exp $ - * $DragonFly: src/lib/msun/src/Attic/get_hw_float.c,v 1.2 2003/06/17 04:26:53 dillon Exp $ + * $DragonFly: src/lib/msun/src/Attic/get_hw_float.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #include #include -int __get_hw_float __P((void)); +int __get_hw_float (void); static int hw_float = -1; diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 8d3c23fb1d..18ea3c1f10 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -12,7 +12,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 * $FreeBSD: src/lib/msun/src/math.h,v 1.8.2.2 2001/11/23 16:16:18 dd Exp $ - * $DragonFly: src/lib/msun/src/Attic/math.h,v 1.2 2003/06/17 04:26:53 dillon Exp $ + * $DragonFly: src/lib/msun/src/Attic/math.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #ifndef _MATH_H_ @@ -102,164 +102,164 @@ __BEGIN_DECLS /* * ANSI/POSIX */ -extern double acos __P((double)); -extern double asin __P((double)); -extern double atan __P((double)); -extern double atan2 __P((double, double)); -extern double cos __P((double)); -extern double sin __P((double)); -extern double tan __P((double)); - -extern double cosh __P((double)); -extern double sinh __P((double)); -extern double tanh __P((double)); - -extern double exp __P((double)); -extern double frexp __P((double, int *)); -extern double ldexp __P((double, int)); -extern double log __P((double)); -extern double log10 __P((double)); -extern double modf __P((double, double *)); - -extern double pow __P((double, double)); -extern double sqrt __P((double)); - -extern double ceil __P((double)); -extern double fabs __P((double)); -extern double floor __P((double)); -extern double fmod __P((double, double)); +extern double acos (double); +extern double asin (double); +extern double atan (double); +extern double atan2 (double, double); +extern double cos (double); +extern double sin (double); +extern double tan (double); + +extern double cosh (double); +extern double sinh (double); +extern double tanh (double); + +extern double exp (double); +extern double frexp (double, int *); +extern double ldexp (double, int); +extern double log (double); +extern double log10 (double); +extern double modf (double, double *); + +extern double pow (double, double); +extern double sqrt (double); + +extern double ceil (double); +extern double fabs (double); +extern double floor (double); +extern double fmod (double, double); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -extern double erf __P((double)); -extern double erfc __P((double)); -extern double gamma __P((double)); -extern double hypot __P((double, double)); -extern int isinf __P((double)); -extern int isnan __P((double)); -extern int finite __P((double)); -extern double j0 __P((double)); -extern double j1 __P((double)); -extern double jn __P((int, double)); -extern double lgamma __P((double)); -extern double y0 __P((double)); -extern double y1 __P((double)); -extern double yn __P((int, double)); +extern double erf (double); +extern double erfc (double); +extern double gamma (double); +extern double hypot (double, double); +extern int isinf (double); +extern int isnan (double); +extern int finite (double); +extern double j0 (double); +extern double j1 (double); +extern double jn (int, double); +extern double lgamma (double); +extern double y0 (double); +extern double y1 (double); +extern double yn (int, double); #if !defined(_XOPEN_SOURCE) -extern double acosh __P((double)); -extern double asinh __P((double)); -extern double atanh __P((double)); -extern double cbrt __P((double)); -extern double logb __P((double)); -extern double nextafter __P((double, double)); -extern double remainder __P((double, double)); -extern double scalb __P((double, double)); +extern double acosh (double); +extern double asinh (double); +extern double atanh (double); +extern double cbrt (double); +extern double logb (double); +extern double nextafter (double, double); +extern double remainder (double, double); +extern double scalb (double, double); #ifndef __cplusplus -extern int matherr __P((struct exception *)); +extern int matherr (struct exception *); #endif /* * IEEE Test Vector */ -extern double significand __P((double)); +extern double significand (double); /* * Functions callable from C, intended to support IEEE arithmetic. */ -extern double copysign __P((double, double)); -extern int ilogb __P((double)); -extern double rint __P((double)); -extern double scalbn __P((double, int)); +extern double copysign (double, double); +extern int ilogb (double); +extern double rint (double); +extern double scalbn (double, int); /* * BSD math library entry points */ -extern double drem __P((double, double)); -extern double expm1 __P((double)); -extern double log1p __P((double)); +extern double drem (double, double); +extern double expm1 (double); +extern double log1p (double); /* * Reentrant version of gamma & lgamma; passes signgam back by reference * as the second argument; user must allocate space for signgam. */ #ifdef _REENTRANT -extern double gamma_r __P((double, int *)); -extern double lgamma_r __P((double, int *)); +extern double gamma_r (double, int *); +extern double lgamma_r (double, int *); #endif /* _REENTRANT */ /* float versions of ANSI/POSIX functions */ -extern float acosf __P((float)); -extern float asinf __P((float)); -extern float atanf __P((float)); -extern float atan2f __P((float, float)); -extern float cosf __P((float)); -extern float sinf __P((float)); -extern float tanf __P((float)); - -extern float coshf __P((float)); -extern float sinhf __P((float)); -extern float tanhf __P((float)); - -extern float expf __P((float)); -extern float frexpf __P((float, int *)); -extern float ldexpf __P((float, int)); -extern float logf __P((float)); -extern float log10f __P((float)); -extern float modff __P((float, float *)); - -extern float powf __P((float, float)); -extern float sqrtf __P((float)); - -extern float ceilf __P((float)); -extern float fabsf __P((float)); -extern float floorf __P((float)); -extern float fmodf __P((float, float)); - -extern float erff __P((float)); -extern float erfcf __P((float)); -extern float gammaf __P((float)); -extern float hypotf __P((float, float)); -extern int isnanf __P((float)); -extern int finitef __P((float)); -extern float j0f __P((float)); -extern float j1f __P((float)); -extern float jnf __P((int, float)); -extern float lgammaf __P((float)); -extern float y0f __P((float)); -extern float y1f __P((float)); -extern float ynf __P((int, float)); - -extern float acoshf __P((float)); -extern float asinhf __P((float)); -extern float atanhf __P((float)); -extern float cbrtf __P((float)); -extern float logbf __P((float)); -extern float nextafterf __P((float, float)); -extern float remainderf __P((float, float)); -extern float scalbf __P((float, float)); +extern float acosf (float); +extern float asinf (float); +extern float atanf (float); +extern float atan2f (float, float); +extern float cosf (float); +extern float sinf (float); +extern float tanf (float); + +extern float coshf (float); +extern float sinhf (float); +extern float tanhf (float); + +extern float expf (float); +extern float frexpf (float, int *); +extern float ldexpf (float, int); +extern float logf (float); +extern float log10f (float); +extern float modff (float, float *); + +extern float powf (float, float); +extern float sqrtf (float); + +extern float ceilf (float); +extern float fabsf (float); +extern float floorf (float); +extern float fmodf (float, float); + +extern float erff (float); +extern float erfcf (float); +extern float gammaf (float); +extern float hypotf (float, float); +extern int isnanf (float); +extern int finitef (float); +extern float j0f (float); +extern float j1f (float); +extern float jnf (int, float); +extern float lgammaf (float); +extern float y0f (float); +extern float y1f (float); +extern float ynf (int, float); + +extern float acoshf (float); +extern float asinhf (float); +extern float atanhf (float); +extern float cbrtf (float); +extern float logbf (float); +extern float nextafterf (float, float); +extern float remainderf (float, float); +extern float scalbf (float, float); /* * float version of IEEE Test Vector */ -extern float significandf __P((float)); +extern float significandf (float); /* * Float versions of functions callable from C, intended to support * IEEE arithmetic. */ -extern float copysignf __P((float, float)); -extern int ilogbf __P((float)); -extern float rintf __P((float)); -extern float scalbnf __P((float, int)); +extern float copysignf (float, float); +extern int ilogbf (float); +extern float rintf (float); +extern float scalbnf (float, int); /* * float versions of BSD math library entry points */ -extern float dremf __P((float, float)); -extern float expm1f __P((float)); -extern float log1pf __P((float)); +extern float dremf (float, float); +extern float expm1f (float); +extern float log1pf (float); /* * Float versions of reentrant version of gamma & lgamma; passes @@ -267,8 +267,8 @@ extern float log1pf __P((float)); * allocate space for signgam. */ #ifdef _REENTRANT -extern float gammaf_r __P((float, int *)); -extern float lgammaf_r __P((float, int *)); +extern float gammaf_r (float, int *); +extern float lgammaf_r (float, int *); #endif /* _REENTRANT */ #endif /* !_XOPEN_SOURCE */ diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 747c942a47..6bb8467abd 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -12,7 +12,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 * $FreeBSD: src/lib/msun/src/math_private.h,v 1.6 1999/08/28 00:06:43 peter Exp $ - * $DragonFly: src/lib/msun/src/Attic/math_private.h,v 1.2 2003/06/17 04:26:53 dillon Exp $ + * $DragonFly: src/lib/msun/src/Attic/math_private.h,v 1.3 2003/11/12 20:21:31 eirikn Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -150,76 +150,76 @@ do { \ } while (0) /* ieee style elementary functions */ -extern double __ieee754_sqrt __P((double)); -extern double __ieee754_acos __P((double)); -extern double __ieee754_acosh __P((double)); -extern double __ieee754_log __P((double)); -extern double __ieee754_atanh __P((double)); -extern double __ieee754_asin __P((double)); -extern double __ieee754_atan2 __P((double,double)); -extern double __ieee754_exp __P((double)); -extern double __ieee754_cosh __P((double)); -extern double __ieee754_fmod __P((double,double)); -extern double __ieee754_pow __P((double,double)); -extern double __ieee754_lgamma_r __P((double,int *)); -extern double __ieee754_gamma_r __P((double,int *)); -extern double __ieee754_lgamma __P((double)); -extern double __ieee754_gamma __P((double)); -extern double __ieee754_log10 __P((double)); -extern double __ieee754_sinh __P((double)); -extern double __ieee754_hypot __P((double,double)); -extern double __ieee754_j0 __P((double)); -extern double __ieee754_j1 __P((double)); -extern double __ieee754_y0 __P((double)); -extern double __ieee754_y1 __P((double)); -extern double __ieee754_jn __P((int,double)); -extern double __ieee754_yn __P((int,double)); -extern double __ieee754_remainder __P((double,double)); -extern int __ieee754_rem_pio2 __P((double,double*)); -extern double __ieee754_scalb __P((double,double)); +extern double __ieee754_sqrt (double); +extern double __ieee754_acos (double); +extern double __ieee754_acosh (double); +extern double __ieee754_log (double); +extern double __ieee754_atanh (double); +extern double __ieee754_asin (double); +extern double __ieee754_atan2 (double,double); +extern double __ieee754_exp (double); +extern double __ieee754_cosh (double); +extern double __ieee754_fmod (double,double); +extern double __ieee754_pow (double,double); +extern double __ieee754_lgamma_r (double,int *); +extern double __ieee754_gamma_r (double,int *); +extern double __ieee754_lgamma (double); +extern double __ieee754_gamma (double); +extern double __ieee754_log10 (double); +extern double __ieee754_sinh (double); +extern double __ieee754_hypot (double,double); +extern double __ieee754_j0 (double); +extern double __ieee754_j1 (double); +extern double __ieee754_y0 (double); +extern double __ieee754_y1 (double); +extern double __ieee754_jn (int,double); +extern double __ieee754_yn (int,double); +extern double __ieee754_remainder (double,double); +extern int __ieee754_rem_pio2 (double,double*); +extern double __ieee754_scalb (double,double); /* fdlibm kernel function */ -extern double __kernel_standard __P((double,double,int)); -extern double __kernel_sin __P((double,double,int)); -extern double __kernel_cos __P((double,double)); -extern double __kernel_tan __P((double,double,int)); -extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*)); +extern double __kernel_standard (double,double,int); +extern double __kernel_sin (double,double,int); +extern double __kernel_cos (double,double); +extern double __kernel_tan (double,double,int); +extern int __kernel_rem_pio2 (double*,double*,int,int,int,const int*); /* ieee style elementary float functions */ -extern float __ieee754_sqrtf __P((float)); -extern float __ieee754_acosf __P((float)); -extern float __ieee754_acoshf __P((float)); -extern float __ieee754_logf __P((float)); -extern float __ieee754_atanhf __P((float)); -extern float __ieee754_asinf __P((float)); -extern float __ieee754_atan2f __P((float,float)); -extern float __ieee754_expf __P((float)); -extern float __ieee754_coshf __P((float)); -extern float __ieee754_fmodf __P((float,float)); -extern float __ieee754_powf __P((float,float)); -extern float __ieee754_lgammaf_r __P((float,int *)); -extern float __ieee754_gammaf_r __P((float,int *)); -extern float __ieee754_lgammaf __P((float)); -extern float __ieee754_gammaf __P((float)); -extern float __ieee754_log10f __P((float)); -extern float __ieee754_sinhf __P((float)); -extern float __ieee754_hypotf __P((float,float)); -extern float __ieee754_j0f __P((float)); -extern float __ieee754_j1f __P((float)); -extern float __ieee754_y0f __P((float)); -extern float __ieee754_y1f __P((float)); -extern float __ieee754_jnf __P((int,float)); -extern float __ieee754_ynf __P((int,float)); -extern float __ieee754_remainderf __P((float,float)); -extern int __ieee754_rem_pio2f __P((float,float*)); -extern float __ieee754_scalbf __P((float,float)); +extern float __ieee754_sqrtf (float); +extern float __ieee754_acosf (float); +extern float __ieee754_acoshf (float); +extern float __ieee754_logf (float); +extern float __ieee754_atanhf (float); +extern float __ieee754_asinf (float); +extern float __ieee754_atan2f (float,float); +extern float __ieee754_expf (float); +extern float __ieee754_coshf (float); +extern float __ieee754_fmodf (float,float); +extern float __ieee754_powf (float,float); +extern float __ieee754_lgammaf_r (float,int *); +extern float __ieee754_gammaf_r (float,int *); +extern float __ieee754_lgammaf (float); +extern float __ieee754_gammaf (float); +extern float __ieee754_log10f (float); +extern float __ieee754_sinhf (float); +extern float __ieee754_hypotf (float,float); +extern float __ieee754_j0f (float); +extern float __ieee754_j1f (float); +extern float __ieee754_y0f (float); +extern float __ieee754_y1f (float); +extern float __ieee754_jnf (int,float); +extern float __ieee754_ynf (int,float); +extern float __ieee754_remainderf (float,float); +extern int __ieee754_rem_pio2f (float,float*); +extern float __ieee754_scalbf (float,float); /* float versions of fdlibm kernel functions */ -extern float __kernel_sinf __P((float,float,int)); -extern float __kernel_cosf __P((float,float)); -extern float __kernel_tanf __P((float,float,int)); -extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*)); +extern float __kernel_sinf (float,float,int); +extern float __kernel_cosf (float,float); +extern float __kernel_tanf (float,float,int); +extern int __kernel_rem_pio2f (float*,float*,int,int,int,const int*); #ifdef __alpha__ #define __generic___ieee754_acos __ieee754_acos