From 2d8a3be70850f8655e3b289a16da332c46c17b92 Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Mon, 3 Nov 2003 19:31:44 +0000 Subject: [PATCH] Remove __P macros from src/usr.bin and src/usr.sbin. Reviewed by: David Rhodus and Matthew Dillon --- usr.bin/ar/ar.c | 8 +- usr.bin/ar/archive.h | 14 +- usr.bin/ar/extern.h | 28 +- usr.bin/banner/banner.c | 4 +- usr.bin/cap_mkdb/cap_mkdb.c | 10 +- usr.bin/chat/chat.c | 68 +++-- usr.bin/checknr/checknr.c | 26 +- usr.bin/chpass/chpass.c | 6 +- usr.bin/chpass/chpass.h | 36 +-- usr.bin/chpass/pw_copy.h | 4 +- usr.bin/cksum/cksum.c | 6 +- usr.bin/cksum/extern.h | 16 +- usr.bin/cmp/extern.h | 10 +- usr.bin/cmp/regular.c | 4 +- usr.bin/col/col.c | 18 +- usr.bin/colcrt/colcrt.c | 12 +- usr.bin/colrm/colrm.c | 8 +- usr.bin/column/column.c | 14 +- usr.bin/ctags/ctags.c | 8 +- usr.bin/find/extern.h | 24 +- usr.bin/find/find.h | 4 +- usr.bin/find/option.c | 4 +- usr.bin/fstat/fstat.h | 8 +- usr.bin/ftp/extern.h | 248 ++++++++-------- usr.bin/ftp/ftp.c | 6 +- usr.bin/ftp/ftp_var.h | 4 +- usr.bin/gcore/extern.h | 8 +- usr.bin/gcore/gcore.c | 4 +- usr.bin/id/id.c | 4 +- usr.bin/last/last.c | 26 +- usr.bin/locate/code/locate.code.c | 6 +- usr.bin/locate/locate/locate.c | 36 +-- usr.bin/locate/locate/util.c | 16 +- usr.bin/login/login.c | 40 +-- usr.bin/make/arch.c | 12 +- usr.bin/make/buf.h | 26 +- usr.bin/make/compat.c | 8 +- usr.bin/make/cond.c | 32 +-- usr.bin/make/dir.c | 14 +- usr.bin/make/dir.h | 30 +- usr.bin/make/for.c | 6 +- usr.bin/make/hash.c | 4 +- usr.bin/make/hash.h | 16 +- usr.bin/make/job.c | 40 +-- usr.bin/make/job.h | 28 +- usr.bin/make/lst.h | 58 ++-- usr.bin/make/lst.lib/lstDestroy.c | 4 +- usr.bin/make/lst.lib/lstDupl.c | 4 +- usr.bin/make/lst.lib/lstFind.c | 4 +- usr.bin/make/lst.lib/lstFindFrom.c | 4 +- usr.bin/make/lst.lib/lstForEach.c | 4 +- usr.bin/make/lst.lib/lstForEachFrom.c | 4 +- usr.bin/make/main.c | 12 +- usr.bin/make/make.c | 14 +- usr.bin/make/make.h | 14 +- usr.bin/make/nonints.h | 172 +++++------ usr.bin/make/parse.c | 44 +-- usr.bin/make/suff.c | 50 ++-- usr.bin/make/targ.c | 10 +- usr.bin/make/var.c | 44 +-- usr.bin/passwd/extern.h | 6 +- usr.bin/pr/extern.h | 38 +-- usr.bin/ranlib/build.c | 14 +- usr.bin/ranlib/misc.c | 4 +- usr.bin/ranlib/ranlib.c | 8 +- usr.bin/ranlib/touch.c | 8 +- usr.bin/rdist/defs.h | 46 +-- usr.bin/rdist/docmd.c | 24 +- usr.bin/rdist/expand.c | 22 +- usr.bin/rdist/main.c | 6 +- usr.bin/rdist/server.c | 32 +-- usr.bin/rev/rev.c | 4 +- usr.bin/rlogin/rlogin.c | 40 +-- usr.bin/rpcgen/rpc_clntout.c | 10 +- usr.bin/rpcgen/rpc_cout.c | 22 +- usr.bin/rpcgen/rpc_hout.c | 28 +- usr.bin/rpcgen/rpc_main.c | 34 +-- usr.bin/rpcgen/rpc_parse.c | 26 +- usr.bin/rpcgen/rpc_sample.c | 10 +- usr.bin/rpcgen/rpc_scan.c | 20 +- usr.bin/rpcgen/rpc_svcout.c | 32 +-- usr.bin/rpcgen/rpc_tblout.c | 8 +- usr.bin/rpcgen/rpc_util.c | 4 +- usr.bin/rsh/rsh.c | 12 +- usr.bin/ruptime/ruptime.c | 18 +- usr.bin/rwall/rwall.c | 8 +- usr.bin/rwho/rwho.c | 6 +- usr.bin/strip/strip.c | 4 +- usr.bin/systat/extern.h | 158 +++++------ usr.bin/tail/extern.h | 18 +- usr.bin/talk/talk.h | 56 ++-- usr.bin/tftp/extern.h | 6 +- usr.bin/tftp/tftpsubs.h | 16 +- usr.bin/tip/tip/remote.c | 4 +- usr.bin/tip/tip/tip.c | 24 +- usr.bin/tip/tip/tip.h | 42 +-- usr.bin/tip/tip/value.c | 8 +- usr.bin/tset/extern.h | 22 +- usr.bin/tset/map.c | 4 +- usr.bin/vgrind/extern.h | 8 +- usr.bin/w/extern.h | 8 +- usr.bin/xlint/lint1/cgram.y | 8 +- usr.bin/xlint/lint1/decl.c | 40 +-- usr.bin/xlint/lint1/emit.c | 4 +- usr.bin/xlint/lint1/emit1.c | 6 +- usr.bin/xlint/lint1/err.c | 8 +- usr.bin/xlint/lint1/externs.h | 30 +- usr.bin/xlint/lint1/externs1.h | 300 ++++++++++---------- usr.bin/xlint/lint1/init.c | 14 +- usr.bin/xlint/lint1/main1.c | 4 +- usr.bin/xlint/lint1/mem1.c | 10 +- usr.bin/xlint/lint1/scan.l | 42 +-- usr.bin/xlint/lint1/tree.c | 70 ++--- usr.bin/xlint/lint2/chk.c | 34 +-- usr.bin/xlint/lint2/emit2.c | 8 +- usr.bin/xlint/lint2/externs2.h | 28 +- usr.bin/xlint/lint2/hash.c | 6 +- usr.bin/xlint/lint2/main2.c | 4 +- usr.bin/xlint/lint2/msg.c | 4 +- usr.bin/xlint/lint2/read.c | 30 +- usr.bin/xlint/xlint/xlint.c | 34 +-- usr.bin/yacc/defs.h | 102 +++---- usr.sbin/ac/ac.c | 26 +- usr.sbin/accton/accton.c | 4 +- usr.sbin/ancontrol/ancontrol.c | 58 ++-- usr.sbin/apmd/apmd.h | 10 +- usr.sbin/atm/atmarpd/atmarp_var.h | 60 ++-- usr.sbin/atm/scspd/scsp_cafsm.c | 42 +-- usr.sbin/atm/scspd/scsp_config.c | 4 +- usr.sbin/atm/scspd/scsp_config_parse.y | 4 +- usr.sbin/atm/scspd/scsp_hfsm.c | 16 +- usr.sbin/atm/scspd/scsp_if.c | 24 +- usr.sbin/atm/scspd/scsp_input.c | 4 +- usr.sbin/atm/scspd/scsp_var.h | 190 ++++++------- usr.sbin/bootparamd/bootparamd/bootparamd.c | 6 +- usr.sbin/bootparamd/bootparamd/main.c | 4 +- usr.sbin/bootparamd/callbootd/callbootd.c | 8 +- usr.sbin/cdcontrol/cdcontrol.c | 54 ++-- usr.sbin/chown/chown.c | 12 +- usr.sbin/config/config.h | 26 +- usr.sbin/config/config.y | 6 +- usr.sbin/config/lang.l | 8 +- usr.sbin/config/main.c | 8 +- usr.sbin/config/mkheaders.c | 10 +- usr.sbin/config/mkmakefile.c | 22 +- usr.sbin/config/mkoptions.c | 10 +- usr.sbin/cron/cron/cron.c | 20 +- usr.sbin/cron/cron/cron.h | 90 +++--- usr.sbin/cron/cron/database.c | 6 +- usr.sbin/cron/cron/do_command.c | 6 +- usr.sbin/cron/cron/externs.h | 20 +- usr.sbin/cron/crontab/crontab.c | 18 +- usr.sbin/cron/lib/entry.c | 10 +- usr.sbin/crunch/crunchide/crunchide.c | 4 +- usr.sbin/dev_mkdb/dev_mkdb.c | 4 +- usr.sbin/diskpart/diskpart.c | 4 +- usr.sbin/faithd/faithd.c | 34 +-- usr.sbin/faithd/faithd.h | 18 +- usr.sbin/faithd/ftp.c | 12 +- usr.sbin/faithd/prefix.c | 10 +- usr.sbin/faithd/prefix.h | 10 +- usr.sbin/faithd/tcp.c | 14 +- usr.sbin/gifconfig/gifconfig.c | 46 +-- usr.sbin/ifmcstat/ifmcstat.c | 16 +- usr.sbin/inetd/builtins.c | 32 +-- usr.sbin/inetd/inetd.c | 66 ++--- usr.sbin/inetd/inetd.h | 20 +- usr.sbin/kbdcontrol/kbdcontrol.c | 8 +- usr.sbin/kbdcontrol/lex.h | 4 +- usr.sbin/keyadmin/keyadmin.c | 10 +- usr.sbin/keyserv/crypt_server.c | 4 +- usr.sbin/keyserv/keyserv.c | 16 +- usr.sbin/keyserv/keyserv.h | 26 +- usr.sbin/keyserv/setkey.c | 16 +- usr.sbin/kgmon/kgmon.c | 18 +- usr.sbin/lastlogin/lastlogin.c | 8 +- usr.sbin/lpr/lpd/lpd.c | 6 +- usr.sbin/mailwrapper/mailwrapper.c | 10 +- usr.sbin/mrouted/callout.c | 4 +- usr.sbin/mrouted/cfparse.y | 18 +- usr.sbin/mrouted/defs.h | 278 +++++++++--------- usr.sbin/mrouted/icmp.c | 6 +- usr.sbin/mrouted/igmp.c | 4 +- usr.sbin/mrouted/main.c | 28 +- usr.sbin/mrouted/mapper.c | 36 +-- usr.sbin/mrouted/mrinfo.c | 18 +- usr.sbin/mrouted/mtrace.c | 104 +++---- usr.sbin/mrouted/prune.c | 28 +- usr.sbin/mrouted/route.c | 24 +- usr.sbin/mrouted/rsrr.c | 18 +- usr.sbin/mrouted/vif.c | 28 +- usr.sbin/mtree/compare.c | 4 +- usr.sbin/mtree/create.c | 12 +- usr.sbin/mtree/extern.h | 26 +- usr.sbin/mtree/misc.c | 4 +- usr.sbin/mtree/mtree.c | 4 +- usr.sbin/mtree/spec.c | 6 +- usr.sbin/mtree/verify.c | 6 +- usr.sbin/ndp/ndp.c | 52 ++-- usr.sbin/pccard/pccardc/enabler.c | 4 +- usr.sbin/pkg_install/add/main.c | 4 +- usr.sbin/pkg_install/create/main.c | 4 +- usr.sbin/pkg_install/delete/main.c | 4 +- usr.sbin/pkg_install/info/main.c | 4 +- usr.sbin/pkg_install/sign/extern.h | 44 +-- usr.sbin/pkg_install/sign/gzip.h | 18 +- usr.sbin/pkg_install/sign/pgp.h | 18 +- usr.sbin/pkg_install/sign/stand.h | 8 +- usr.sbin/portmap/pmap_check.c | 6 +- usr.sbin/portmap/pmap_check.h | 16 +- usr.sbin/portmap/pmap_dump/pmap_dump.c | 4 +- usr.sbin/portmap/pmap_set/pmap_set.c | 4 +- usr.sbin/portmap/portmap.c | 10 +- usr.sbin/pppd/auth.c | 36 +-- usr.sbin/pppd/cbcp.c | 30 +- usr.sbin/pppd/ccp.c | 50 ++-- usr.sbin/pppd/chap.c | 46 +-- usr.sbin/pppd/chap.h | 6 +- usr.sbin/pppd/chap_ms.c | 18 +- usr.sbin/pppd/chap_ms.h | 4 +- usr.sbin/pppd/demand.c | 4 +- usr.sbin/pppd/fsm.c | 20 +- usr.sbin/pppd/fsm.h | 46 +-- usr.sbin/pppd/ipcp.c | 52 ++-- usr.sbin/pppd/ipcp.h | 4 +- usr.sbin/pppd/ipxcp.c | 42 +-- usr.sbin/pppd/lcp.c | 54 ++-- usr.sbin/pppd/lcp.h | 12 +- usr.sbin/pppd/magic.c | 6 +- usr.sbin/pppd/magic.h | 6 +- usr.sbin/pppd/main.c | 54 ++-- usr.sbin/pppd/options.c | 230 +++++++-------- usr.sbin/pppd/pppd.h | 220 +++++++------- usr.sbin/pppd/sys-bsd.c | 6 +- usr.sbin/pppd/upap.c | 32 +-- usr.sbin/pppd/upap.h | 6 +- usr.sbin/pppstats/pppstats.c | 14 +- usr.sbin/pstat/pstat.c | 42 +-- usr.sbin/pw/bitmap.h | 16 +- usr.sbin/pw/psdate.h | 6 +- usr.sbin/pw/pwupd.h | 86 +++--- usr.sbin/pwd_mkdb/pw_scan.h | 4 +- usr.sbin/pwd_mkdb/pwd_mkdb.c | 14 +- usr.sbin/quotaon/quotaon.c | 12 +- usr.sbin/repquota/repquota.c | 12 +- usr.sbin/rip6query/rip6query.c | 10 +- usr.sbin/rmt/rmt.c | 8 +- usr.sbin/route6d/route6d.c | 116 ++++---- usr.sbin/rpc.lockd/lockd.c | 10 +- usr.sbin/rpc.statd/statd.c | 4 +- usr.sbin/rpc.yppasswdd/yppasswdd_extern.h | 8 +- usr.sbin/rrenumd/lexer.l | 10 +- usr.sbin/rrenumd/parser.y | 10 +- usr.sbin/rrenumd/rrenumd.c | 32 +-- usr.sbin/rtadvd/advcap.c | 20 +- usr.sbin/rtadvd/advcap.h | 10 +- usr.sbin/rtadvd/config.c | 10 +- usr.sbin/rtadvd/config.h | 14 +- usr.sbin/rtadvd/dump.c | 6 +- usr.sbin/rtadvd/dump.h | 4 +- usr.sbin/rtadvd/if.c | 8 +- usr.sbin/rtadvd/if.h | 40 +-- usr.sbin/rtadvd/rrenum.h | 6 +- usr.sbin/rtadvd/rtadvd.c | 38 +-- usr.sbin/rtadvd/rtadvd.h | 12 +- usr.sbin/rtadvd/timer.c | 6 +- usr.sbin/rtadvd/timer.h | 28 +- usr.sbin/rtsold/dump.c | 6 +- usr.sbin/rtsold/if.c | 10 +- usr.sbin/rtsold/probe.c | 4 +- usr.sbin/rtsold/rtsock.c | 6 +- usr.sbin/rtsold/rtsold.c | 28 +- usr.sbin/rtsold/rtsold.h | 40 +-- usr.sbin/rwhod/rwhod.c | 24 +- usr.sbin/sa/extern.h | 26 +- usr.sbin/sa/main.c | 24 +- usr.sbin/sa/pdb.c | 8 +- usr.sbin/sa/usrdb.c | 4 +- usr.sbin/setkey/parse.y | 20 +- usr.sbin/setkey/setkey.c | 28 +- usr.sbin/setkey/test-pfkey.c | 26 +- usr.sbin/setkey/token.l | 14 +- usr.sbin/slstat/slstat.c | 8 +- usr.sbin/timed/timed/correct.c | 4 +- usr.sbin/timed/timed/extern.h | 94 +++--- usr.sbin/timed/timed/master.c | 8 +- usr.sbin/timed/timed/networkdelta.c | 4 +- usr.sbin/timed/timed/slave.c | 12 +- usr.sbin/timed/timed/timed.c | 10 +- usr.sbin/timed/timedc/extern.h | 24 +- usr.sbin/timed/timedc/timedc.c | 4 +- usr.sbin/traceroute6/traceroute6.c | 28 +- usr.sbin/trpt/trpt.c | 14 +- usr.sbin/usbd/usbd.c | 16 +- usr.sbin/vipw/pw_util.h | 16 +- usr.sbin/vipw/vipw.c | 6 +- usr.sbin/vnconfig/vnconfig.c | 14 +- usr.sbin/watch/watch.c | 28 +- usr.sbin/xten/xten.c | 6 +- 299 files changed, 3635 insertions(+), 3637 deletions(-) diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index 3e936593bb..fb66f933b9 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/ar/ar.c,v 1.8.2.1 2001/08/02 00:51:00 obrien Exp $ - * $DragonFly: src/usr.bin/ar/Attic/ar.c,v 1.3 2003/10/02 17:42:25 hmp Exp $ + * $DragonFly: src/usr.bin/ar/Attic/ar.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ * * @(#) Copyright (c) 1990, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)ar.c 8.3 (Berkeley) 4/2/94 @@ -59,8 +59,8 @@ CHDR chdr; u_int options; char *archive, *envtmp, *posarg, *posname; -static void badoptions __P((char *)); -static void usage __P((void)); +static void badoptions(char *); +static void usage(void); /* * main -- @@ -73,7 +73,7 @@ main(int argc, char **argv) { int c; char *p; - int (*fcall) __P((char **)) = NULL; + int (*fcall)(char **) = NULL; (void) setlocale(LC_TIME, "");; diff --git a/usr.bin/ar/archive.h b/usr.bin/ar/archive.h index c69fc13efe..d153c3bdaa 100644 --- a/usr.bin/ar/archive.h +++ b/usr.bin/ar/archive.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)archive.h 8.3 (Berkeley) 4/2/94 - * $DragonFly: src/usr.bin/ar/Attic/archive.h,v 1.2 2003/11/03 19:14:34 eirikn Exp $ + * $DragonFly: src/usr.bin/ar/Attic/archive.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ */ /* Ar(1) options. */ @@ -98,9 +98,9 @@ typedef struct { struct stat; -void close_archive __P((int)); -void copy_ar __P((CF *, off_t)); -int get_arobj __P((int)); -int open_archive __P((int)); -void put_arobj __P((CF *, struct stat *)); -void skip_arobj __P((int)); +void close_archive(int); +void copy_ar(CF *, off_t); +int get_arobj(int); +int open_archive(int); +void put_arobj(CF *, struct stat *); +void skip_arobj(int); diff --git a/usr.bin/ar/extern.h b/usr.bin/ar/extern.h index 3928434031..cfa716cb1c 100644 --- a/usr.bin/ar/extern.h +++ b/usr.bin/ar/extern.h @@ -32,22 +32,22 @@ * * @(#)extern.h 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/usr.bin/ar/extern.h,v 1.1.1.1.14.1 2001/08/02 00:51:00 obrien Exp $ - * $DragonFly: src/usr.bin/ar/Attic/extern.h,v 1.2 2003/06/17 04:29:25 dillon Exp $ + * $DragonFly: src/usr.bin/ar/Attic/extern.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ */ -int append __P((char **)); -void badfmt __P((void)); -int compare __P((char *)); -int contents __P((char **)); -int delete __P((char **)); -void error __P((char *)); -int extract __P((char **)); -char *files __P((char **argv)); -int move __P((char **)); -void orphans __P((char **argv)); -int print __P((char **)); -int replace __P((char **)); -int tmp __P((void)); +int append(char **); +void badfmt(void); +int compare(char *); +int contents(char **); +int delete(char **); +void error(char *); +int extract(char **); +char *files(char **argv); +int move(char **); +void orphans(char **argv); +int print(char **); +int replace(char **); +int tmp(void); extern char *archive; extern char *posarg, *posname; /* positioning file name */ diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c index 59676415f3..f6299e4c2d 100644 --- a/usr.bin/banner/banner.c +++ b/usr.bin/banner/banner.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)banner.c 8.4 (Berkeley) 4/29/95 * $FreeBSD: src/usr.bin/banner/banner.c,v 1.7.2.4 2001/10/02 11:41:25 ru Exp $ - * $DragonFly: src/usr.bin/banner/banner.c,v 1.3 2003/10/02 17:42:25 hmp Exp $ + * $DragonFly: src/usr.bin/banner/banner.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ /* @@ -1018,7 +1018,7 @@ char print[DWIDTH]; int debug, i, j, linen, max, nchars, pc, term, trace, x, y; int width = DWIDTH; /* -w option: scrunch letters to 80 columns */ -static void usage __P((void)); +static void usage(void); int main(int argc, char *argv[]) diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index 7788df7962..004c2426c5 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)cap_mkdb.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.c,v 1.6.2.2 2001/08/02 01:15:51 obrien Exp $ - * $DragonFly: src/usr.bin/cap_mkdb/cap_mkdb.c,v 1.3 2003/10/02 17:42:26 hmp Exp $ + * $DragonFly: src/usr.bin/cap_mkdb/cap_mkdb.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ #include @@ -47,10 +47,10 @@ #include #include -int main __P((int, char *[])); -void db_build __P((char **)); -void dounlink __P((void)); -void usage __P((void)); +int main(int, char *[]); +void db_build(char **); +void dounlink(void); +void usage(void); DB *capdbp; int verbose; diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c index a21ba6e484..2a644f08eb 100644 --- a/usr.bin/chat/chat.c +++ b/usr.bin/chat/chat.c @@ -76,7 +76,7 @@ * * * $FreeBSD: src/usr.bin/chat/chat.c,v 1.15 1999/11/25 07:28:54 kris Exp $ - * $DragonFly: src/usr.bin/chat/chat.c,v 1.3 2003/10/02 17:42:26 hmp Exp $ + * $DragonFly: src/usr.bin/chat/chat.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ #include @@ -116,11 +116,9 @@ #ifdef __STDC__ #include #define __V(x) x -#define __P(x) x #else #include #define __V(x) (va_alist) va_dcl -#define __P(x) () #define const #endif @@ -195,38 +193,38 @@ int clear_report_next = 0; int say_next = 0, hup_next = 0; -void *dup_mem __P((void *b, size_t c)); -void *copy_of __P((char *s)); -static void usage __P((void)); -void logf __P((const char *fmt, ...)); -void fatal __P((int code, const char *fmt, ...)); -SIGTYPE sigalrm __P((int signo)); -SIGTYPE sigint __P((int signo)); -SIGTYPE sigterm __P((int signo)); -SIGTYPE sighup __P((int signo)); -void unalarm __P((void)); -void init __P((void)); -void set_tty_parameters __P((void)); -void echo_stderr __P((int)); -void break_sequence __P((void)); -void terminate __P((int status)); -void do_file __P((char *chat_file)); -int get_string __P((register char *string)); -int put_string __P((register char *s)); -int write_char __P((int c)); -int put_char __P((int c)); -int get_char __P((void)); -void chat_send __P((register char *s)); -char *character __P((int c)); -void chat_expect __P((register char *s)); -char *clean __P((register char *s, int sending)); -void break_sequence __P((void)); -void terminate __P((int status)); -void pack_array __P((char **array, int end)); -char *expect_strtok __P((char *, char *)); -int vfmtmsg __P((char *, int, const char *, va_list)); /* vsprintf++ */ - -int main __P((int, char *[])); +void *dup_mem(void *b, size_t c); +void *copy_of(char *s); +static void usage(void); +void logf(const char *fmt, ...); +void fatal(int code, const char *fmt, ...); +SIGTYPE sigalrm(int signo); +SIGTYPE sigint(int signo); +SIGTYPE sigterm(int signo); +SIGTYPE sighup(int signo); +void unalarm(void); +void init(void); +void set_tty_parameters(void); +void echo_stderr(int); +void break_sequence(void); +void terminate(int status); +void do_file(char *chat_file); +int get_string(register char *string); +int put_string(register char *s); +int write_char(int c); +int put_char(int c); +int get_char(void); +void chat_send(register char *s); +char *character(int c); +void chat_expect(register char *s); +char *clean(register char *s, int sending); +void break_sequence(void); +void terminate(int status); +void pack_array(char **array, int end); +char *expect_strtok(char *, char *); +int vfmtmsg(char *, int, const char *, va_list); /* vsprintf++ */ + +int main(int, char *[]); void *dup_mem(b, c) void *b; diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c index 71e63c46cd..605496b5fc 100644 --- a/usr.bin/checknr/checknr.c +++ b/usr.bin/checknr/checknr.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)checknr.c 8.1 (Berkeley) 6/6/93 * - * $DragonFly: src/usr.bin/checknr/checknr.c,v 1.3 2003/10/02 17:42:26 hmp Exp $ + * $DragonFly: src/usr.bin/checknr/checknr.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ /* @@ -52,18 +52,18 @@ #define MAXBR 100 /* Max number of bracket pairs known */ #define MAXCMDS 500 /* Max number of commands known */ -void addcmd __P((char *)); -void addmac __P((char *)); -int binsrch __P((char *)); -void checkknown __P((char *)); -void chkcmd __P((char *, char *)); -void complain __P((int)); -int eq __P((char *, char *)); -void nomatch __P((char *)); -void pe __P((int)); -void process __P((FILE *)); -void prop __P((int)); -static void usage __P((void)); +void addcmd(char *); +void addmac(char *); +int binsrch(char *); +void checkknown(char *); +void chkcmd(char *, char *); +void complain(int); +int eq(char *, char *); +void nomatch(char *); +void pe(int); +void process(FILE *); +void prop(int); +static void usage(void); /* * The stack on which we remember what we've seen so far. diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index 690698f031..e865771f0d 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)chpass.c 8.4 (Berkeley) 4/2/94 * $FreeBSD: src/usr.bin/chpass/chpass.c,v 1.16.2.4 2002/08/11 14:16:42 dwmalone Exp $ - * $DragonFly: src/usr.bin/chpass/chpass.c,v 1.3 2003/10/02 17:42:26 hmp Exp $ + * $DragonFly: src/usr.bin/chpass/chpass.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ #include @@ -67,8 +67,8 @@ int yp_errno = YP_TRUE; char *tempname; uid_t uid; -void baduser __P((void)); -void usage __P((void)); +void baduser(void); +void usage(void); int main(int argc, char **argv) diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h index f6295376f0..0a9f4dfbcd 100644 --- a/usr.bin/chpass/chpass.h +++ b/usr.bin/chpass/chpass.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)chpass.h 8.4 (Berkeley) 4/2/94 - * $DragonFly: src/usr.bin/chpass/chpass.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/chpass/chpass.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ */ struct passwd; @@ -53,20 +53,20 @@ typedef struct _entry { extern ENTRY list[]; extern uid_t uid; -int atot __P((char *, time_t *)); -void display __P((int, struct passwd *)); -void edit __P((struct passwd *)); -char *ok_shell __P((char *)); -int p_change __P((char *, struct passwd *, ENTRY *)); -int p_class __P((char *, struct passwd *, ENTRY *)); -int p_expire __P((char *, struct passwd *, ENTRY *)); -int p_gecos __P((char *, struct passwd *, ENTRY *)); -int p_gid __P((char *, struct passwd *, ENTRY *)); -int p_hdir __P((char *, struct passwd *, ENTRY *)); -int p_login __P((char *, struct passwd *, ENTRY *)); -int p_login __P((char *, struct passwd *, ENTRY *)); -int p_passwd __P((char *, struct passwd *, ENTRY *)); -int p_shell __P((char *, struct passwd *, ENTRY *)); -int p_uid __P((char *, struct passwd *, ENTRY *)); -char *ttoa __P((time_t)); -int verify __P((struct passwd *)); +int atot(char *, time_t *); +void display(int, struct passwd *); +void edit(struct passwd *); +char *ok_shell(char *); +int p_change(char *, struct passwd *, ENTRY *); +int p_class(char *, struct passwd *, ENTRY *); +int p_expire(char *, struct passwd *, ENTRY *); +int p_gecos(char *, struct passwd *, ENTRY *); +int p_gid(char *, struct passwd *, ENTRY *); +int p_hdir(char *, struct passwd *, ENTRY *); +int p_login(char *, struct passwd *, ENTRY *); +int p_login(char *, struct passwd *, ENTRY *); +int p_passwd(char *, struct passwd *, ENTRY *); +int p_shell(char *, struct passwd *, ENTRY *); +int p_uid(char *, struct passwd *, ENTRY *); +char *ttoa(time_t); +int verify(struct passwd *); diff --git a/usr.bin/chpass/pw_copy.h b/usr.bin/chpass/pw_copy.h index d0bf858b7c..c43859e4e7 100644 --- a/usr.bin/chpass/pw_copy.h +++ b/usr.bin/chpass/pw_copy.h @@ -32,7 +32,7 @@ * * @(#)pw_copy.h 8.1 (Berkeley) 4/2/94 * $FreeBSD: src/usr.bin/chpass/pw_copy.h,v 1.1.1.1.14.1 2002/03/24 09:00:03 cjc Exp $ - * $DragonFly: src/usr.bin/chpass/pw_copy.h,v 1.2 2003/06/17 04:29:25 dillon Exp $ + * $DragonFly: src/usr.bin/chpass/pw_copy.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ */ -void pw_copy __P((int, int, struct passwd *, struct passwd *)); +void pw_copy(int, int, struct passwd *, struct passwd *); diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c index 416550fd71..c2e7261286 100644 --- a/usr.bin/cksum/cksum.c +++ b/usr.bin/cksum/cksum.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)cksum.c 8.2 (Berkeley) 4/28/95 * $FreeBSD: src/usr.bin/cksum/cksum.c,v 1.11.2.1 2001/07/30 10:16:29 dd Exp $ - * $DragonFly: src/usr.bin/cksum/cksum.c,v 1.3 2003/10/02 17:42:26 hmp Exp $ + * $DragonFly: src/usr.bin/cksum/cksum.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ #include @@ -58,8 +58,8 @@ main(int argc, char **argv) register int ch, fd, rval; u_int32_t len, val; char *fn, *p; - int (*cfncn) __P((int, u_int32_t *, u_int32_t *)); - void (*pfncn) __P((char *, u_int32_t, u_int32_t)); + int (*cfncn)(int, u_int32_t *, u_int32_t *); + void (*pfncn)(char *, u_int32_t, u_int32_t); if ((p = rindex(argv[0], '/')) == NULL) p = argv[0]; diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h index 1e34d363f5..260857921e 100644 --- a/usr.bin/cksum/extern.h +++ b/usr.bin/cksum/extern.h @@ -31,17 +31,17 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/cksum/extern.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/cksum/extern.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ */ #include __BEGIN_DECLS -int crc __P((int, u_int32_t *, u_int32_t *)); -void pcrc __P((char *, u_int32_t, u_int32_t)); -void psum1 __P((char *, u_int32_t, u_int32_t)); -void psum2 __P((char *, u_int32_t, u_int32_t)); -int csum1 __P((int, u_int32_t *, u_int32_t *)); -int csum2 __P((int, u_int32_t *, u_int32_t *)); -int crc32 __P((int, u_int32_t *, u_int32_t *)); +int crc(int, u_int32_t *, u_int32_t *); +void pcrc(char *, u_int32_t, u_int32_t); +void psum1(char *, u_int32_t, u_int32_t); +void psum2(char *, u_int32_t, u_int32_t); +int csum1(int, u_int32_t *, u_int32_t *); +int csum2(int, u_int32_t *, u_int32_t *); +int crc32(int, u_int32_t *, u_int32_t *); __END_DECLS diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h index 091e948264..39d2c27e63 100644 --- a/usr.bin/cmp/extern.h +++ b/usr.bin/cmp/extern.h @@ -33,7 +33,7 @@ * @(#)extern.h 8.3 (Berkeley) 4/2/94 * * $FreeBSD: src/usr.bin/cmp/extern.h,v 1.1.1.1.14.2 2001/11/21 10:47:54 dwmalone Exp $ - * $DragonFly: src/usr.bin/cmp/extern.h,v 1.2 2003/06/17 04:29:25 dillon Exp $ + * $DragonFly: src/usr.bin/cmp/extern.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ * */ @@ -41,9 +41,9 @@ #define DIFF_EXIT 1 #define ERR_EXIT 2 /* error exit code */ -void c_regular __P((int, const char *, off_t, off_t, int, const char *, off_t, off_t)); -void c_special __P((int, const char *, off_t, int, const char *, off_t)); -void diffmsg __P((const char *, const char *, off_t, off_t)); -void eofmsg __P((const char *)); +void c_regular(int, const char *, off_t, off_t, int, const char *, off_t, off_t); +void c_special(int, const char *, off_t, int, const char *, off_t); +void diffmsg(const char *, const char *, off_t, off_t); +void eofmsg(const char *); extern int lflag, sflag, xflag; diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index c251c8e443..afcf35cae1 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/cmp/regular.c,v 1.7.2.3 2001/11/21 10:47:54 dwmalone Exp $ - * $DragonFly: src/usr.bin/cmp/regular.c,v 1.3 2003/10/02 17:42:27 hmp Exp $ + * $DragonFly: src/usr.bin/cmp/regular.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ * * @(#)regular.c 8.3 (Berkeley) 4/2/94 */ @@ -49,7 +49,7 @@ #include "extern.h" -static u_char *remmap __P((u_char *, int, off_t)); +static u_char *remmap(u_char *, int, off_t); #define MMAP_CHUNK (8*1024*1024) #define ROUNDPAGE(i) ((i) & ~pagemask) diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index e4d667ec19..1e63fdc271 100644 --- a/usr.bin/col/col.c +++ b/usr.bin/col/col.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1990, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)col.c 8.5 (Berkeley) 5/4/95 * $FreeBSD: src/usr.bin/col/col.c,v 1.6.6.4 2001/08/02 01:27:12 obrien Exp $ - * $DragonFly: src/usr.bin/col/col.c,v 1.3 2003/10/02 17:42:27 hmp Exp $ + * $DragonFly: src/usr.bin/col/col.c,v 1.4 2003/11/03 19:31:28 eirikn Exp $ */ #include @@ -84,14 +84,14 @@ struct line_str { int l_max_col; /* max column in the line */ }; -LINE *alloc_line __P((void)); -void dowarn __P((int)); -void flush_line __P((LINE *)); -void flush_lines __P((int)); -void flush_blanks __P((void)); -void free_line __P((LINE *)); -int main __P((int, char **)); -void usage __P((void)); +LINE *alloc_line(void); +void dowarn(int); +void flush_line(LINE *); +void flush_lines(int); +void flush_blanks(void); +void free_line(LINE *); +int main(int, char **); +void usage(void); CSET last_set; /* char_set of last char printed */ LINE *lines; diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c index c5f58e0c2c..9dc77e74f3 100644 --- a/usr.bin/colcrt/colcrt.c +++ b/usr.bin/colcrt/colcrt.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)colcrt.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/colcrt/colcrt.c,v 1.5.2.4 2001/08/02 01:29:07 obrien Exp $ - * $DragonFly: src/usr.bin/colcrt/colcrt.c,v 1.3 2003/10/02 17:42:27 hmp Exp $ + * $DragonFly: src/usr.bin/colcrt/colcrt.c,v 1.4 2003/11/03 19:31:29 eirikn Exp $ */ #include @@ -65,11 +65,11 @@ char printall; FILE *f; -int main __P((int, char *[])); -static void move __P((int, int)); -static void pflush __P((int)); -static int plus __P((char, char)); -static void usage __P((void)); +int main(int, char *[]); +static void move(int, int); +static void pflush(int); +static int plus(char, char); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 7efc447d9e..d612ee6d3f 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/colrm/colrm.c,v 1.7.2.1 2001/08/02 01:33:29 obrien Exp $ - * $DragonFly: src/usr.bin/colrm/colrm.c,v 1.3 2003/10/02 17:42:27 hmp Exp $ + * $DragonFly: src/usr.bin/colrm/colrm.c,v 1.4 2003/11/03 19:31:29 eirikn Exp $ * * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)colrm.c 8.2 (Berkeley) 5/4/95 @@ -48,9 +48,9 @@ #define TAB 8 -int main __P((int, char *[])); -void check __P((FILE *)); -static void usage __P((void)); +int main(int, char *[]); +void check(FILE *); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index 7ed48de002..3aeff56a25 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/column/column.c,v 1.4.6.2 2001/08/02 01:34:19 obrien Exp $ - * $DragonFly: src/usr.bin/column/column.c,v 1.3 2003/10/02 17:42:27 hmp Exp $ + * $DragonFly: src/usr.bin/column/column.c,v 1.4 2003/11/03 19:31:29 eirikn Exp $ * * @(#) Copyright (c) 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)column.c 8.4 (Berkeley) 5/4/95 @@ -50,12 +50,12 @@ #define TAB 8 -void c_columnate __P((void)); -void input __P((FILE *)); -void maketbl __P((void)); -void print __P((void)); -void r_columnate __P((void)); -void usage __P((void)); +void c_columnate(void); +void input(FILE *); +void maketbl(void); +void print(void); +void r_columnate(void); +void usage(void); int termwidth = 80; /* default terminal width */ diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index 1a3da44aa2..f99ce07981 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1987, 1993, 1994, 1995 The Regents of the University of California. All rights reserved. * @(#)ctags.c 8.4 (Berkeley) 2/7/95 * $FreeBSD: src/usr.bin/ctags/ctags.c,v 1.7.2.1 2001/09/18 04:16:53 mikeh Exp $ - * $DragonFly: src/usr.bin/ctags/ctags.c,v 1.3 2003/10/02 17:42:27 hmp Exp $ + * $DragonFly: src/usr.bin/ctags/ctags.c,v 1.4 2003/11/03 19:31:29 eirikn Exp $ */ #include @@ -70,9 +70,9 @@ char *curfile; /* current input file name */ char searchar = '/'; /* use /.../ searches by default */ char lbuf[LINE_MAX]; -void init __P((void)); -void find_entries __P((char *)); -static void usage __P((void)); +void init(void); +void find_entries(char *); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index 62ef644bc9..4a97dc4414 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -32,23 +32,23 @@ * * @(#)extern.h 8.3 (Berkeley) 4/16/94 * $FreeBSD: src/usr.bin/find/extern.h,v 1.9.2.4 2001/05/06 09:53:22 phk Exp $ - * $DragonFly: src/usr.bin/find/extern.h,v 1.2 2003/06/17 04:29:26 dillon Exp $ + * $DragonFly: src/usr.bin/find/extern.h,v 1.3 2003/11/03 19:31:29 eirikn Exp $ */ #include -void brace_subst __P((char *, char **, char *, int)); -void *emalloc __P((unsigned int)); -PLAN *find_create __P((char ***)); -int find_execute __P((PLAN *, char **)); -PLAN *find_formplan __P((char **)); -PLAN *not_squish __P((PLAN *)); -PLAN *or_squish __P((PLAN *)); -PLAN *paren_squish __P((PLAN *)); +void brace_subst(char *, char **, char *, int); +void *emalloc(unsigned int); +PLAN *find_create(char ***); +int find_execute(PLAN *, char **); +PLAN *find_formplan(char **); +PLAN *not_squish(PLAN *); +PLAN *or_squish(PLAN *); +PLAN *paren_squish(PLAN *); struct stat; -void printlong __P((char *, char *, struct stat *)); -int queryuser __P((char **)); -OPTION *option __P((char *)); +void printlong(char *, char *, struct stat *); +int queryuser(char **); +OPTION *option(char *); creat_f c_Xmin; creat_f c_Xtime; diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h index 2f6d3e3613..2059f733da 100644 --- a/usr.bin/find/find.h +++ b/usr.bin/find/find.h @@ -35,7 +35,7 @@ * * @(#)find.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/find/find.h,v 1.6.2.7 2002/11/15 11:38:15 sheldonh Exp $ - * $DragonFly: src/usr.bin/find/find.h,v 1.2 2003/06/17 04:29:26 dillon Exp $ + * $DragonFly: src/usr.bin/find/find.h,v 1.3 2003/11/03 19:31:29 eirikn Exp $ */ #include @@ -45,7 +45,7 @@ struct _plandata; struct _option; /* execute function */ -typedef int exec_f __P((struct _plandata *, FTSENT *)); +typedef int exec_f(struct _plandata *, FTSENT *); /* create function */ typedef struct _plandata *creat_f(struct _option *, char ***); diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 317ddb06c1..7e991a012b 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -35,7 +35,7 @@ * * @(#)option.c 8.2 (Berkeley) 4/16/94 * $FreeBSD: src/usr.bin/find/option.c,v 1.9.2.6 2003/02/22 16:33:24 des Exp $ - * $DragonFly: src/usr.bin/find/option.c,v 1.3 2003/10/04 20:36:44 hmp Exp $ + * $DragonFly: src/usr.bin/find/option.c,v 1.4 2003/11/03 19:31:29 eirikn Exp $ */ #include @@ -153,7 +153,7 @@ OPTION * option(char *name) { OPTION tmp; - int typecompare __P((const void *, const void *)); + int typecompare(const void *, const void *); tmp.name = name; return ((OPTION *)bsearch(&tmp, options, diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h index d7d59a6810..7c716f9030 100644 --- a/usr.bin/fstat/fstat.h +++ b/usr.bin/fstat/fstat.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/fstat/fstat.h,v 1.1.2.1 2000/07/02 10:20:25 ps Exp $ - * $DragonFly: src/usr.bin/fstat/fstat.h,v 1.2 2003/06/17 04:29:26 dillon Exp $ + * $DragonFly: src/usr.bin/fstat/fstat.h,v 1.3 2003/11/03 19:31:29 eirikn Exp $ */ #ifndef __FSTAT_H__ @@ -65,10 +65,10 @@ extern kvm_t *kd; extern int vflg; extern int Pid; -udev_t dev2udev __P((dev_t dev)); +udev_t dev2udev(dev_t dev); /* Additional filesystem types */ -int isofs_filestat __P((struct vnode *vp, struct filestat *fsp)); -int msdosfs_filestat __P((struct vnode *vp, struct filestat *fsp)); +int isofs_filestat(struct vnode *vp, struct filestat *fsp); +int msdosfs_filestat(struct vnode *vp, struct filestat *fsp); #endif /* __FSTAT_H__ */ diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h index e2fb86fa76..ef36bb3157 100644 --- a/usr.bin/ftp/extern.h +++ b/usr.bin/ftp/extern.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.bin/ftp/extern.h,v 1.10.2.3 2002/08/27 09:55:08 yar Exp $ */ -/* $DragonFly: src/usr.bin/ftp/Attic/extern.h,v 1.2 2003/06/17 04:29:26 dillon Exp $ */ +/* $DragonFly: src/usr.bin/ftp/Attic/extern.h,v 1.3 2003/11/03 19:31:29 eirikn Exp $ */ /* $NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $ */ /*- @@ -37,133 +37,133 @@ * @(#)extern.h 8.3 (Berkeley) 10/9/94 */ -void abort_remote __P((FILE *)); -void abortpt __P((int)); -void abortrecv __P((int)); -void abortsend __P((int)); -void account __P((int, char **)); -void ai_unmapped __P((struct addrinfo *)); -void alarmtimer __P((int)); -int another __P((int *, char ***, const char *)); -int auto_fetch __P((int, char **)); -void blkfree __P((char **)); -void cd __P((int, char **)); -void cdup __P((int, char **)); -void changetype __P((int, int)); -void cmdabort __P((int)); -void cmdscanner __P((int)); -int command __P((const char *, ...)); +void abort_remote(FILE *); +void abortpt(int); +void abortrecv(int); +void abortsend(int); +void account(int, char **); +void ai_unmapped(struct addrinfo *); +void alarmtimer(int); +int another(int *, char ***, const char *); +int auto_fetch(int, char **); +void blkfree(char **); +void cd(int, char **); +void cdup(int, char **); +void changetype(int, int); +void cmdabort(int); +void cmdscanner(int); +int command(const char *, ...); #ifndef SMALL -unsigned char complete __P((EditLine *, int)); -void controlediting __P((void)); +unsigned char complete(EditLine *, int); +void controlediting(void); #endif /* !SMALL */ -int confirm __P((const char *, const char *)); -FILE *dataconn __P((const char *)); -void delete __P((int, char **)); -void disconnect __P((int, char **)); -void do_chmod __P((int, char **)); -void do_umask __P((int, char **)); -void domacro __P((int, char **)); -char *domap __P((char *)); -void doproxy __P((int, char **)); -char *dotrans __P((char *)); -int empty __P((fd_set *, int)); -void get __P((int, char **)); -struct cmd *getcmd __P((const char *)); -int getit __P((int, char **, int, const char *)); -int getreply __P((int)); -int globulize __P((char **)); -char *gunique __P((const char *)); -void help __P((int, char **)); -char *hookup __P((const char *, char *)); -void idle __P((int, char **)); -int initconn __P((void)); -void intr __P((void)); -int isipv6addr __P((const char *)); -void list_vertical __P((StringList *)); -void lcd __P((int, char **)); -int login __P((const char *, char *, char *)); -void lostpeer __P((void)); -void lpwd __P((int, char **)); -void ls __P((int, char **)); -void mabort __P((int)); -void macdef __P((int, char **)); -void makeargv __P((void)); -void makedir __P((int, char **)); -void mdelete __P((int, char **)); -void mget __P((int, char **)); -void mls __P((int, char **)); -void modtime __P((int, char **)); -void mput __P((int, char **)); -char *onoff __P((int)); -void newer __P((int, char **)); -void page __P((int, char **)); -void progressmeter __P((int)); -char *prompt __P((void)); -void proxabort __P((int)); -void proxtrans __P((const char *, const char *, const char *)); -void psabort __P((int)); -void psummary __P((int)); -void pswitch __P((int)); -void ptransfer __P((int)); -void put __P((int, char **)); -void pwd __P((int, char **)); -void quit __P((int, char **)); -void quote __P((int, char **)); -void quote1 __P((const char *, int, char **)); +int confirm(const char *, const char *); +FILE *dataconn(const char *); +void delete(int, char **); +void disconnect(int, char **); +void do_chmod(int, char **); +void do_umask(int, char **); +void domacro(int, char **); +char *domap(char *); +void doproxy(int, char **); +char *dotrans(char *); +int empty(fd_set *, int); +void get(int, char **); +struct cmd *getcmd(const char *); +int getit(int, char **, int, const char *); +int getreply(int); +int globulize(char **); +char *gunique(const char *); +void help(int, char **); +char *hookup(const char *, char *); +void idle(int, char **); +int initconn(void); +void intr(void); +int isipv6addr(const char *); +void list_vertical(StringList *); +void lcd(int, char **); +int login(const char *, char *, char *); +void lostpeer(void); +void lpwd(int, char **); +void ls(int, char **); +void mabort(int); +void macdef(int, char **); +void makeargv(void); +void makedir(int, char **); +void mdelete(int, char **); +void mget(int, char **); +void mls(int, char **); +void modtime(int, char **); +void mput(int, char **); +char *onoff(int); +void newer(int, char **); +void page(int, char **); +void progressmeter(int); +char *prompt(void); +void proxabort(int); +void proxtrans(const char *, const char *, const char *); +void psabort(int); +void psummary(int); +void pswitch(int); +void ptransfer(int); +void put(int, char **); +void pwd(int, char **); +void quit(int, char **); +void quote(int, char **); +void quote1(const char *, int, char **); void recvrequest __P((const char *, const char *, const char *, const char *, int, int)); -void reget __P((int, char **)); -char *remglob __P((char **, int, char **)); -off_t remotesize __P((const char *, int)); -time_t remotemodtime __P((const char *, int)); -void removedir __P((int, char **)); -void renamefile __P((int, char **)); -void reset __P((int, char **)); -void restart __P((int, char **)); -void rmthelp __P((int, char **)); -void rmtstatus __P((int, char **)); -int ruserpass __P((const char *, char **, char **, char **)); -void sendrequest __P((const char *, const char *, const char *, int)); -void setascii __P((int, char **)); -void setbell __P((int, char **)); -void setbinary __P((int, char **)); -void setcase __P((int, char **)); -void setcr __P((int, char **)); -void setdebug __P((int, char **)); -void setedit __P((int, char **)); -void setepsv4 __P((int, char **)); -void setform __P((int, char **)); -void setftmode __P((int, char **)); -void setgate __P((int, char **)); -void setglob __P((int, char **)); -void sethash __P((int, char **)); -void setnmap __P((int, char **)); -void setntrans __P((int, char **)); -void setpassive __P((int, char **)); -void setpeer __P((int, char **)); -void setport __P((int, char **)); -void setpreserve __P((int, char **)); -void setprogress __P((int, char **)); -void setprompt __P((int, char **)); -void setrestrict __P((int, char **)); -void setrunique __P((int, char **)); -void setstruct __P((int, char **)); -void setsunique __P((int, char **)); -void settenex __P((int, char **)); -void settrace __P((int, char **)); -void setttywidth __P((int)); -void settype __P((int, char **)); -void setverbose __P((int, char **)); -void shell __P((int, char **)); -void site __P((int, char **)); -void sizecmd __P((int, char **)); -char *slurpstring __P((void)); -void status __P((int, char **)); -void syst __P((int, char **)); -int togglevar __P((int, char **, int *, const char *)); -void usage __P((void)); -void user __P((int, char **)); +void reget(int, char **); +char *remglob(char **, int, char **); +off_t remotesize(const char *, int); +time_t remotemodtime(const char *, int); +void removedir(int, char **); +void renamefile(int, char **); +void reset(int, char **); +void restart(int, char **); +void rmthelp(int, char **); +void rmtstatus(int, char **); +int ruserpass(const char *, char **, char **, char **); +void sendrequest(const char *, const char *, const char *, int); +void setascii(int, char **); +void setbell(int, char **); +void setbinary(int, char **); +void setcase(int, char **); +void setcr(int, char **); +void setdebug(int, char **); +void setedit(int, char **); +void setepsv4(int, char **); +void setform(int, char **); +void setftmode(int, char **); +void setgate(int, char **); +void setglob(int, char **); +void sethash(int, char **); +void setnmap(int, char **); +void setntrans(int, char **); +void setpassive(int, char **); +void setpeer(int, char **); +void setport(int, char **); +void setpreserve(int, char **); +void setprogress(int, char **); +void setprompt(int, char **); +void setrestrict(int, char **); +void setrunique(int, char **); +void setstruct(int, char **); +void setsunique(int, char **); +void settenex(int, char **); +void settrace(int, char **); +void setttywidth(int); +void settype(int, char **); +void setverbose(int, char **); +void shell(int, char **); +void site(int, char **); +void sizecmd(int, char **); +char *slurpstring(void); +void status(int, char **); +void syst(int, char **); +int togglevar(int, char **, int *, const char *); +void usage(void); +void user(int, char **); extern struct cmd cmdtab[]; extern FILE *cout; diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index 4e87dee1e2..f5bf7adcf9 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.bin/ftp/ftp.c,v 1.28.2.5 2002/07/25 15:29:18 ume Exp $ */ -/* $DragonFly: src/usr.bin/ftp/Attic/ftp.c,v 1.3 2003/10/04 20:36:44 hmp Exp $ */ +/* $DragonFly: src/usr.bin/ftp/Attic/ftp.c,v 1.4 2003/11/03 19:31:29 eirikn Exp $ */ /* $NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $ */ /* @@ -459,7 +459,7 @@ sendrequest(const char *cmd, const char *local, const char *remote, struct stat st; int c, d; FILE *fin, *dout; - int (*closefunc) __P((FILE *)); + int (*closefunc)(FILE *); sig_t oldinti, oldintr, oldintp; volatile off_t hashbytes; char *lmode, buf[BUFSIZ], *bufp; @@ -747,7 +747,7 @@ recvrequest(const char *cmd, const char *local, const char *remote, const char *lmode, int printnames, int ignorespecial) { FILE *fout, *din; - int (*closefunc) __P((FILE *)); + int (*closefunc)(FILE *); sig_t oldinti, oldintr, oldintp; int c, d; volatile int is_retr, tcrflag, bare_lfs; diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h index 700201e8aa..b901b1832f 100644 --- a/usr.bin/ftp/ftp_var.h +++ b/usr.bin/ftp/ftp_var.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.bin/ftp/ftp_var.h,v 1.11.2.2 2002/08/27 09:55:08 yar Exp $ */ -/* $DragonFly: src/usr.bin/ftp/Attic/ftp_var.h,v 1.2 2003/06/17 04:29:26 dillon Exp $ */ +/* $DragonFly: src/usr.bin/ftp/Attic/ftp_var.h,v 1.3 2003/11/03 19:31:29 eirikn Exp $ */ /* $NetBSD: ftp_var.h,v 1.20.2.1 1997/11/18 01:01:37 mellon Exp $ */ /* @@ -176,7 +176,7 @@ struct cmd { #ifndef SMALL char *c_complete; /* context sensitive completion list */ #endif /* !SMALL */ - void (*c_handler) __P((int, char **)); /* function to call */ + void (*c_handler)(int, char **); /* function to call */ }; struct macel { diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h index e121ed212e..d397833fb4 100644 --- a/usr.bin/gcore/extern.h +++ b/usr.bin/gcore/extern.h @@ -31,12 +31,12 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/gcore/extern.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/gcore/extern.h,v 1.3 2003/11/03 19:31:29 eirikn Exp $ */ #include #include -void err __P((int, const char *, ...)); -void elf_coredump __P((int, pid_t)); -void md_core __P((kvm_t *, int, struct kinfo_proc *)); +void err(int, const char *, ...); +void elf_coredump(int, pid_t); +void md_core(kvm_t *, int, struct kinfo_proc *); diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c index c8cf603467..21995e4415 100644 --- a/usr.bin/gcore/gcore.c +++ b/usr.bin/gcore/gcore.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)gcore.c 8.2 (Berkeley) 9/23/93 * $FreeBSD: src/usr.bin/gcore/gcore.c,v 1.15.2.2 2001/08/17 20:56:22 mikeh Exp $ - * $DragonFly: src/usr.bin/gcore/gcore.c,v 1.4 2003/10/04 20:36:45 hmp Exp $ + * $DragonFly: src/usr.bin/gcore/gcore.c,v 1.5 2003/11/03 19:31:29 eirikn Exp $ */ /* @@ -79,7 +79,7 @@ static void userdump(int, struct proc *, u_long, int); kvm_t *kd; /* XXX undocumented routine, should be in kvm.h? */ -ssize_t kvm_uread __P((kvm_t *, const struct proc *, u_long, char *, size_t)); +ssize_t kvm_uread(kvm_t *, const struct proc *, u_long, char *, size_t); static int data_offset; static pid_t pid; diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index f10a2981c0..fea37d5fe9 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)id.c 8.2 (Berkeley) 2/16/94 * $FreeBSD: src/usr.bin/id/id.c,v 1.12.2.3 2001/12/20 12:09:03 ru Exp $ - * $DragonFly: src/usr.bin/id/id.c,v 1.3 2003/10/04 20:36:46 hmp Exp $ + * $DragonFly: src/usr.bin/id/id.c,v 1.4 2003/11/03 19:31:30 eirikn Exp $ */ #include @@ -54,7 +54,7 @@ void group(struct passwd *, int); void usage(void); void user(struct passwd *); struct passwd * - who __P((char *)); + who(char *); int isgroups, iswhoami; diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index 68ac9ca2c3..d43f964cef 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/last/last.c,v 1.10.6.11 2002/11/02 23:00:26 mux Exp $ - * $DragonFly: src/usr.bin/last/last.c,v 1.3 2003/10/04 20:36:47 hmp Exp $ + * $DragonFly: src/usr.bin/last/last.c,v 1.4 2003/11/03 19:31:30 eirikn Exp $ * * @(#) Copyright (c) 1987, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)last.c 8.2 (Berkeley) 4/2/94 @@ -92,18 +92,18 @@ static time_t snaptime; /* if != 0, we will only * at this snapshot time */ -int main __P((int, char *[])); -void addarg __P((int, char *)); -time_t dateconv __P((char *)); -void doentry __P((struct utmp *)); -void hostconv __P((char *)); -void onintr __P((int)); -void printentry __P((struct utmp *, struct ttytab *)); -char *ttyconv __P((char *)); -char *ttyconv __P((char *)); -int want __P((struct utmp *)); -void usage __P((void)); -void wtmp __P((void)); +int main(int, char *[]); +void addarg(int, char *); +time_t dateconv(char *); +void doentry(struct utmp *); +void hostconv(char *); +void onintr(int); +void printentry(struct utmp *, struct ttytab *); +char *ttyconv(char *); +char *ttyconv(char *); +int want(struct utmp *); +void usage(void); +void wtmp(void); void usage(void) diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index 6539a20930..e6e801fc79 100644 --- a/usr.bin/locate/code/locate.code.c +++ b/usr.bin/locate/code/locate.code.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/locate/code/locate.code.c,v 1.11.2.1 2001/03/04 08:46:46 kris Exp $ - * $DragonFly: src/usr.bin/locate/code/locate.code.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/locate/code/locate.code.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ * * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)locate.code.c 8.1 (Berkeley) 6/6/93 @@ -109,11 +109,11 @@ bg_t big[UCHAR_MAX + 1][UCHAR_MAX + 1]; #else #define BGINDEX(x) bgindex(x) typedef int bg_t; -int bgindex __P((char *)); +int bgindex(char *); #endif /* LOOKUP */ -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index ba6d77a60c..ee2d42939d 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -37,7 +37,7 @@ * @(#) Copyright (c) 1995-1996 Wolfram Schneider, Berlin. @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)locate.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/locate/locate/locate.c,v 1.12.2.1 2001/03/04 08:47:25 kris Exp $ - * $DragonFly: src/usr.bin/locate/locate/locate.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/locate/locate/locate.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /* @@ -112,23 +112,23 @@ int f_limit; /* limit number of output lines, 0 == infinite */ u_int counter; /* counter for matches [-c] */ -void usage __P((void)); -void statistic __P((FILE *, char *)); -void fastfind __P((FILE *, char *, char *)); -void fastfind_icase __P((FILE *, char *, char *)); -void fastfind_mmap __P((char *, caddr_t, int, char *)); -void fastfind_mmap_icase __P((char *, caddr_t, int, char *)); -void search_mmap __P((char *, char **)); -void search_fopen __P((char *, char **)); -unsigned long cputime __P((void)); - -extern char **colon __P((char **, char*, char*)); -extern void print_matches __P((u_int)); -extern int getwm __P((caddr_t)); -extern int getwf __P((FILE *)); -extern u_char *tolower_word __P((u_char *)); -extern int check_bigram_char __P((int)); -extern char *patprep __P((char *)); +void usage(void); +void statistic(FILE *, char *); +void fastfind(FILE *, char *, char *); +void fastfind_icase(FILE *, char *, char *); +void fastfind_mmap(char *, caddr_t, int, char *); +void fastfind_mmap_icase(char *, caddr_t, int, char *); +void search_mmap(char *, char **); +void search_fopen(char *, char **); +unsigned long cputime(void); + +extern char **colon(char **, char*, char*); +extern void print_matches(u_int); +extern int getwm(caddr_t); +extern int getwf(FILE *); +extern u_char *tolower_word(u_char *); +extern int check_bigram_char(int); +extern char *patprep(char *); int main(argc, argv) diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c index 0ea85ded4e..ce7297729b 100644 --- a/usr.bin/locate/locate/util.c +++ b/usr.bin/locate/locate/util.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/locate/locate/util.c,v 1.6.2.1 2001/12/20 04:21:48 mikeh Exp $ - * $DragonFly: src/usr.bin/locate/locate/util.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/locate/locate/util.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ @@ -47,13 +47,13 @@ #include "locate.h" -char **colon __P((char **, char*, char*)); -char *patprep __P((char *)); -void print_matches __P((u_int)); -u_char *tolower_word __P((u_char *)); -int getwm __P((caddr_t)); -int getwf __P((FILE *)); -int check_bigram_char __P((int)); +char **colon(char **, char*, char*); +char *patprep(char *); +void print_matches(u_int); +u_char *tolower_word(u_char *); +int getwm(caddr_t); +int getwf(FILE *); +int check_bigram_char(int); /* * Validate bigram chars. If the test failed the database is corrupt diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 1de008db8d..4287ddb916 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -32,7 +32,7 @@ * * @(#)login.c 8.4 (Berkeley) 4/2/94 * $FreeBSD: src/usr.bin/login/login.c,v 1.51.2.15 2003/04/29 14:10:41 des Exp $ - * $DragonFly: src/usr.bin/login/login.c,v 1.3 2003/10/04 20:36:48 hmp Exp $ + * $DragonFly: src/usr.bin/login/login.c,v 1.4 2003/11/03 19:31:30 eirikn Exp $ */ #if 0 @@ -87,24 +87,24 @@ static char copyright[] = #define NI_WITHSCOPEID 0 #endif -void badlogin __P((char *)); -void checknologin __P((void)); -void dolastlog __P((int)); -void getloginname __P((void)); -void motd __P((char *)); -int rootterm __P((char *)); -void sigint __P((int)); -void sleepexit __P((int)); -void refused __P((char *,char *,int)); -char *stypeof __P((char *)); -void timedout __P((int)); -int login_access __P((char *, char *)); -void login_fbtab __P((char *, uid_t, gid_t)); +void badlogin(char *); +void checknologin(void); +void dolastlog(int); +void getloginname(void); +void motd(char *); +int rootterm(char *); +void sigint(int); +void sleepexit(int); +void refused(char *,char *,int); +char *stypeof(char *); +void timedout(int); +int login_access(char *, char *); +void login_fbtab(char *, uid_t, gid_t); #ifdef USE_PAM -static int auth_pam __P((void)); -static int export_pam_environment __P((void)); -static int ok_to_export __P((const char *)); +static int auth_pam(void); +static int export_pam_environment(void); +static int ok_to_export(const char *); static pam_handle_t *pamh = NULL; static char **environ_pam; @@ -118,9 +118,9 @@ static char **environ_pam; syslog(LOG_ERR, "pam_end: %s", pam_strerror(pamh, e)); \ } #endif /* USE_PAM */ -static int auth_traditional __P((void)); -extern void login __P((struct utmp *)); -static void usage __P((void)); +static int auth_traditional(void); +extern void login(struct utmp *); +static void usage(void); #define TTYGRPNAME "tty" /* name of group to own ttys */ #define DEFAULT_BACKOFF 3 diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index bb4b6d3330..728fe199c9 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -37,7 +37,7 @@ * * @(#)arch.c 8.2 (Berkeley) 1/2/94 * $FreeBSD: src/usr.bin/make/arch.c,v 1.15.2.1 2001/02/13 03:13:57 will Exp $ - * $DragonFly: src/usr.bin/make/arch.c,v 1.3 2003/10/04 20:36:49 hmp Exp $ + * $DragonFly: src/usr.bin/make/arch.c,v 1.4 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -112,13 +112,13 @@ typedef struct Arch { size_t fnamesize; /* Size of the string table */ } Arch; -static int ArchFindArchive __P((ClientData, ClientData)); -static void ArchFree __P((ClientData)); -static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean)); -static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *)); +static int ArchFindArchive(ClientData, ClientData); +static void ArchFree(ClientData); +static struct ar_hdr *ArchStatMember(char *, char *, Boolean); +static FILE *ArchFindMember(char *, char *, struct ar_hdr *, char *); #if defined(__svr4__) || defined(__SVR4) || defined(__ELF__) #define SVR4ARCHIVES -static int ArchSVR4Entry __P((Arch *, char *, size_t, FILE *)); +static int ArchSVR4Entry(Arch *, char *, size_t, FILE *); #endif /*- diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h index ec01bf219b..8d5bf363f4 100644 --- a/usr.bin/make/buf.h +++ b/usr.bin/make/buf.h @@ -37,7 +37,7 @@ * * from: @(#)buf.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/buf.h,v 1.9 1999/08/28 01:03:26 peter Exp $ - * $DragonFly: src/usr.bin/make/buf.h,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/buf.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -67,17 +67,17 @@ typedef struct Buffer { #define BUF_ERROR 256 -void Buf_OvAddByte __P((Buffer, int)); -void Buf_AddBytes __P((Buffer, int, const Byte *)); -void Buf_UngetByte __P((Buffer, int)); -void Buf_UngetBytes __P((Buffer, int, Byte *)); -int Buf_GetByte __P((Buffer)); -int Buf_GetBytes __P((Buffer, int, Byte *)); -Byte *Buf_GetAll __P((Buffer, int *)); -void Buf_Discard __P((Buffer, int)); -int Buf_Size __P((Buffer)); -Buffer Buf_Init __P((int)); -void Buf_Destroy __P((Buffer, Boolean)); -void Buf_ReplaceLastByte __P((Buffer, int)); +void Buf_OvAddByte(Buffer, int); +void Buf_AddBytes(Buffer, int, const Byte *); +void Buf_UngetByte(Buffer, int); +void Buf_UngetBytes(Buffer, int, Byte *); +int Buf_GetByte(Buffer); +int Buf_GetBytes(Buffer, int, Byte *); +Byte *Buf_GetAll(Buffer, int *); +void Buf_Discard(Buffer, int); +int Buf_Size(Buffer); +Buffer Buf_Init(int); +void Buf_Destroy(Buffer, Boolean); +void Buf_ReplaceLastByte(Buffer, int); #endif /* _BUF_H */ diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index 0e3197517f..4b786f1a3b 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -37,7 +37,7 @@ * * @(#)compat.c 8.2 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/compat.c,v 1.16.2.2 2000/07/01 12:24:21 ps Exp $ - * $DragonFly: src/usr.bin/make/Attic/compat.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/Attic/compat.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -76,9 +76,9 @@ static char meta[256]; static GNode *curTarg = NILGNODE; static GNode *ENDNode; -static void CompatInterrupt __P((int)); -static int CompatRunCommand __P((ClientData, ClientData)); -static int CompatMake __P((ClientData, ClientData)); +static void CompatInterrupt(int); +static int CompatRunCommand(ClientData, ClientData); +static int CompatMake(ClientData, ClientData); static char *sh_builtin[] = { "alias", "cd", "eval", "exec", "exit", "read", "set", "ulimit", diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c index 9f29442e6f..b1728b6f5c 100644 --- a/usr.bin/make/cond.c +++ b/usr.bin/make/cond.c @@ -37,7 +37,7 @@ * * @(#)cond.c 8.2 (Berkeley) 1/2/94 * $FreeBSD: src/usr.bin/make/cond.c,v 1.12 1999/09/11 13:08:01 hoek Exp $ - * $DragonFly: src/usr.bin/make/cond.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/cond.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -94,24 +94,24 @@ typedef enum { * Structures to handle elegantly the different forms of #if's. The * last two fields are stored in condInvert and condDefProc, respectively. */ -static void CondPushBack __P((Token)); -static int CondGetArg __P((char **, char **, char *, Boolean)); -static Boolean CondDoDefined __P((int, char *)); -static int CondStrMatch __P((ClientData, ClientData)); -static Boolean CondDoMake __P((int, char *)); -static Boolean CondDoExists __P((int, char *)); -static Boolean CondDoTarget __P((int, char *)); -static char * CondCvtArg __P((char *, double *)); -static Token CondToken __P((Boolean)); -static Token CondT __P((Boolean)); -static Token CondF __P((Boolean)); -static Token CondE __P((Boolean)); +static void CondPushBack(Token); +static int CondGetArg(char **, char **, char *, Boolean); +static Boolean CondDoDefined(int, char *); +static int CondStrMatch(ClientData, ClientData); +static Boolean CondDoMake(int, char *); +static Boolean CondDoExists(int, char *); +static Boolean CondDoTarget(int, char *); +static char * CondCvtArg(char *, double *); +static Token CondToken(Boolean); +static Token CondT(Boolean); +static Token CondF(Boolean); +static Token CondE(Boolean); static struct If { char *form; /* Form of if */ int formlen; /* Length of form */ Boolean doNot; /* TRUE if default function should be negated */ - Boolean (*defProc) __P((int, char *)); /* Default function to apply */ + Boolean (*defProc)(int, char *); /* Default function to apply */ } ifs[] = { { "ifdef", 5, FALSE, CondDoDefined }, { "ifndef", 6, TRUE, CondDoDefined }, @@ -123,7 +123,7 @@ static struct If { static Boolean condInvert; /* Invert the default function */ static Boolean (*condDefProc) /* Default function to apply */ - __P((int, char *)); + (int, char *); static char *condExpr; /* The expression to parse */ static Token condPushBack=None; /* Single push-back token used in * parsing */ @@ -761,7 +761,7 @@ error: break; } default: { - Boolean (*evalProc) __P((int, char *)); + Boolean (*evalProc)(int, char *); Boolean invert = FALSE; char *arg; int arglen; diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c index c6fa6cde83..42368a9b89 100644 --- a/usr.bin/make/dir.c +++ b/usr.bin/make/dir.c @@ -37,7 +37,7 @@ * * @(#)dir.c 8.2 (Berkeley) 1/2/94 * $FreeBSD: src/usr.bin/make/dir.c,v 1.10.2.1 2001/02/13 03:13:57 will Exp $ - * $DragonFly: src/usr.bin/make/dir.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/dir.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -186,12 +186,12 @@ static Hash_Table mtimes; /* Results of doing a last-resort stat in * should be ok, but... */ -static int DirFindName __P((ClientData, ClientData)); -static int DirMatchFiles __P((char *, Path *, Lst)); -static void DirExpandCurly __P((char *, char *, Lst, Lst)); -static void DirExpandInt __P((char *, Lst, Lst)); -static int DirPrintWord __P((ClientData, ClientData)); -static int DirPrintDir __P((ClientData, ClientData)); +static int DirFindName(ClientData, ClientData); +static int DirMatchFiles(char *, Path *, Lst); +static void DirExpandCurly(char *, char *, Lst, Lst); +static void DirExpandInt(char *, Lst, Lst); +static int DirPrintWord(ClientData, ClientData); +static int DirPrintDir(ClientData, ClientData); /*- *----------------------------------------------------------------------- diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h index 6f8a3e9101..151ab6d556 100644 --- a/usr.bin/make/dir.h +++ b/usr.bin/make/dir.h @@ -37,7 +37,7 @@ * * from: @(#)dir.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/dir.h,v 1.7 1999/08/28 01:03:29 peter Exp $ - * $DragonFly: src/usr.bin/make/dir.h,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/dir.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /* dir.h -- @@ -54,19 +54,19 @@ typedef struct Path { Hash_Table files; /* Hash table of files in directory */ } Path; -void Dir_Init __P((void)); -void Dir_End __P((void)); -Boolean Dir_HasWildcards __P((char *)); -void Dir_Expand __P((char *, Lst, Lst)); -char *Dir_FindFile __P((char *, Lst)); -int Dir_MTime __P((GNode *)); -void Dir_AddDir __P((Lst, char *)); -char *Dir_MakeFlags __P((char *, Lst)); -void Dir_ClearPath __P((Lst)); -void Dir_Concat __P((Lst, Lst)); -void Dir_PrintDirectories __P((void)); -void Dir_PrintPath __P((Lst)); -void Dir_Destroy __P((ClientData)); -ClientData Dir_CopyDir __P((ClientData)); +void Dir_Init(void); +void Dir_End(void); +Boolean Dir_HasWildcards(char *); +void Dir_Expand(char *, Lst, Lst); +char *Dir_FindFile(char *, Lst); +int Dir_MTime(GNode *); +void Dir_AddDir(Lst, char *); +char *Dir_MakeFlags(char *, Lst); +void Dir_ClearPath(Lst); +void Dir_Concat(Lst, Lst); +void Dir_PrintDirectories(void); +void Dir_PrintPath(Lst); +void Dir_Destroy(ClientData); +ClientData Dir_CopyDir(ClientData); #endif /* _DIR */ diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c index f5761f4f65..ef4b4313dd 100644 --- a/usr.bin/make/for.c +++ b/usr.bin/make/for.c @@ -32,7 +32,7 @@ * * @(#)for.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/for.c,v 1.10 1999/09/11 13:08:01 hoek Exp $ - * $DragonFly: src/usr.bin/make/for.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/for.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -79,7 +79,7 @@ typedef struct _For { Lst lst; /* List of variables */ } For; -static int ForExec __P((ClientData, ClientData)); +static int ForExec(ClientData, ClientData); @@ -294,6 +294,6 @@ For_Run() Lst_ForEach(arg.lst, ForExec, (ClientData) &arg); free((Address)arg.var); - Lst_Destroy(arg.lst, (void (*) __P((ClientData))) free); + Lst_Destroy(arg.lst, (void (*)(ClientData)) free); Buf_Destroy(arg.buf, TRUE); } diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c index 4ccee325fd..85d515c31b 100644 --- a/usr.bin/make/hash.c +++ b/usr.bin/make/hash.c @@ -37,7 +37,7 @@ * * @(#)hash.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/hash.c,v 1.9 1999/09/11 13:08:01 hoek Exp $ - * $DragonFly: src/usr.bin/make/hash.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/hash.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /* hash.c -- @@ -56,7 +56,7 @@ * defined: */ -static void RebuildTable __P((Hash_Table *)); +static void RebuildTable(Hash_Table *); /* * The following defines the ratio of # entries to # buckets diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h index 1f5c74be5f..8fd88a21ee 100644 --- a/usr.bin/make/hash.h +++ b/usr.bin/make/hash.h @@ -37,7 +37,7 @@ * * from: @(#)hash.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/hash.h,v 1.8 1999/08/28 01:03:30 peter Exp $ - * $DragonFly: src/usr.bin/make/hash.h,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/hash.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /* hash.h -- @@ -107,12 +107,12 @@ typedef struct Hash_Search { #define Hash_Size(n) (((n) + sizeof (int) - 1) / sizeof (int)) -void Hash_InitTable __P((Hash_Table *, int)); -void Hash_DeleteTable __P((Hash_Table *)); -Hash_Entry *Hash_FindEntry __P((Hash_Table *, char *)); -Hash_Entry *Hash_CreateEntry __P((Hash_Table *, char *, Boolean *)); -void Hash_DeleteEntry __P((Hash_Table *, Hash_Entry *)); -Hash_Entry *Hash_EnumFirst __P((Hash_Table *, Hash_Search *)); -Hash_Entry *Hash_EnumNext __P((Hash_Search *)); +void Hash_InitTable(Hash_Table *, int); +void Hash_DeleteTable(Hash_Table *); +Hash_Entry *Hash_FindEntry(Hash_Table *, char *); +Hash_Entry *Hash_CreateEntry(Hash_Table *, char *, Boolean *); +void Hash_DeleteEntry(Hash_Table *, Hash_Entry *); +Hash_Entry *Hash_EnumFirst(Hash_Table *, Hash_Search *); +Hash_Entry *Hash_EnumNext(Hash_Search *); #endif /* _HASH */ diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 85246702f1..4e172de5bb 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -37,7 +37,7 @@ * * @(#)job.c 8.2 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/job.c,v 1.17.2.2 2001/02/13 03:13:57 will Exp $ - * $DragonFly: src/usr.bin/make/job.c,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/job.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ #ifndef OLD_JOKE @@ -284,29 +284,29 @@ STATIC Lst stoppedJobs; /* Lst of Job structures describing #define W_SETEXITSTATUS(st, val) W_SETMASKED(st, val, WEXITSTATUS) -static int JobCondPassSig __P((ClientData, ClientData)); -static void JobPassSig __P((int)); -static int JobCmpPid __P((ClientData, ClientData)); -static int JobPrintCommand __P((ClientData, ClientData)); -static int JobSaveCommand __P((ClientData, ClientData)); -static void JobClose __P((Job *)); +static int JobCondPassSig(ClientData, ClientData); +static void JobPassSig(int); +static int JobCmpPid(ClientData, ClientData); +static int JobPrintCommand(ClientData, ClientData); +static int JobSaveCommand(ClientData, ClientData); +static void JobClose(Job *); #ifdef REMOTE -static int JobCmpRmtID __P((Job *, int)); +static int JobCmpRmtID(Job *, int); # ifdef RMT_WILL_WATCH -static void JobLocalInput __P((int, Job *)); +static void JobLocalInput(int, Job *); # endif #else -static void JobFinish __P((Job *, int *)); -static void JobExec __P((Job *, char **)); +static void JobFinish(Job *, int *); +static void JobExec(Job *, char **); #endif -static void JobMakeArgv __P((Job *, char **)); -static void JobRestart __P((Job *)); -static int JobStart __P((GNode *, int, Job *)); -static char *JobOutput __P((Job *, char *, char *, int)); -static void JobDoOutput __P((Job *, Boolean)); -static Shell *JobMatchShell __P((char *)); -static void JobInterrupt __P((int, int)); -static void JobRestartJobs __P((void)); +static void JobMakeArgv(Job *, char **); +static void JobRestart(Job *); +static int JobStart(GNode *, int, Job *); +static char *JobOutput(Job *, char *, char *, int); +static void JobDoOutput(Job *, Boolean); +static Shell *JobMatchShell(char *); +static void JobInterrupt(int, int); +static void JobRestartJobs(void); /*- *----------------------------------------------------------------------- @@ -1079,7 +1079,7 @@ Boolean Job_CheckCommands(gn, abortProc) GNode *gn; /* The target whose commands need * verifying */ - void (*abortProc) __P((char *, ...)); + void (*abortProc)(char *, ...); /* Function to abort with message */ { if (OP_NOP(gn->type) && Lst_IsEmpty(gn->commands) && diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h index 8dd5313514..ba81be63cf 100644 --- a/usr.bin/make/job.h +++ b/usr.bin/make/job.h @@ -37,7 +37,7 @@ * * from: @(#)job.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/job.h,v 1.11 2000/01/17 06:43:41 kris Exp $ - * $DragonFly: src/usr.bin/make/job.h,v 1.2 2003/06/17 04:29:28 dillon Exp $ + * $DragonFly: src/usr.bin/make/job.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -220,18 +220,18 @@ extern Lst stoppedJobs; /* List of jobs that are stopped or didn't extern Boolean jobFull; /* Non-zero if no more jobs should/will start*/ -void Job_Touch __P((GNode *, Boolean)); -Boolean Job_CheckCommands __P((GNode *, void (*abortProc )(char *, ...))); -void Job_CatchChildren __P((Boolean)); -void Job_CatchOutput __P((void)); -void Job_Make __P((GNode *)); -void Job_Init __P((int, int)); -Boolean Job_Full __P((void)); -Boolean Job_Empty __P((void)); -ReturnStatus Job_ParseShell __P((char *)); -int Job_End __P((void)); -void Job_Wait __P((void)); -void Job_AbortAll __P((void)); -void JobFlagForMigration __P((int)); +void Job_Touch(GNode *, Boolean); +Boolean Job_CheckCommands(GNode *, void (*abortProc )(char *, ...)); +void Job_CatchChildren(Boolean); +void Job_CatchOutput(void); +void Job_Make(GNode *); +void Job_Init(int, int); +Boolean Job_Full(void); +Boolean Job_Empty(void); +ReturnStatus Job_ParseShell(char *); +int Job_End(void); +void Job_Wait(void); +void Job_AbortAll(void); +void JobFlagForMigration(int); #endif /* _JOB_H_ */ diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h index 6d1dff5a7d..50803de59c 100644 --- a/usr.bin/make/lst.h +++ b/usr.bin/make/lst.h @@ -37,7 +37,7 @@ * * from: @(#)lst.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/lst.h,v 1.9 1999/08/28 01:03:32 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.h,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -68,8 +68,8 @@ typedef struct LstNode *LstNode; * not to be freed. * NOCOPY performs similarly when given as the copyProc to Lst_Duplicate. */ -#define NOFREE ((void (*) __P((ClientData))) 0) -#define NOCOPY ((ClientData (*) __P((ClientData))) 0) +#define NOFREE ((void (*)(ClientData)) 0) +#define NOCOPY ((ClientData (*)(ClientData)) 0) #define LST_CONCNEW 0 /* create new LstNode's when using Lst_Concat */ #define LST_CONCLINK 1 /* relink LstNode's when using Lst_Concat */ @@ -78,43 +78,43 @@ typedef struct LstNode *LstNode; * Creation/destruction functions */ /* Create a new list */ -Lst Lst_Init __P((Boolean)); +Lst Lst_Init(Boolean); /* Duplicate an existing list */ -Lst Lst_Duplicate __P((Lst, ClientData (*)(ClientData))); +Lst Lst_Duplicate(Lst, ClientData (*)(ClientData)); /* Destroy an old one */ -void Lst_Destroy __P((Lst, void (*)(ClientData))); +void Lst_Destroy(Lst, void (*)(ClientData)); /* True if list is empty */ -Boolean Lst_IsEmpty __P((Lst)); +Boolean Lst_IsEmpty(Lst); /* * Functions to modify a list */ /* Insert an element before another */ -ReturnStatus Lst_Insert __P((Lst, LstNode, ClientData)); +ReturnStatus Lst_Insert(Lst, LstNode, ClientData); /* Insert an element after another */ -ReturnStatus Lst_Append __P((Lst, LstNode, ClientData)); +ReturnStatus Lst_Append(Lst, LstNode, ClientData); /* Place an element at the front of a lst. */ -ReturnStatus Lst_AtFront __P((Lst, ClientData)); +ReturnStatus Lst_AtFront(Lst, ClientData); /* Place an element at the end of a lst. */ -ReturnStatus Lst_AtEnd __P((Lst, ClientData)); +ReturnStatus Lst_AtEnd(Lst, ClientData); /* Remove an element */ -ReturnStatus Lst_Remove __P((Lst, LstNode)); +ReturnStatus Lst_Remove(Lst, LstNode); /* Replace a node with a new value */ -ReturnStatus Lst_Replace __P((LstNode, ClientData)); +ReturnStatus Lst_Replace(LstNode, ClientData); /* Concatenate two lists */ -ReturnStatus Lst_Concat __P((Lst, Lst, int)); +ReturnStatus Lst_Concat(Lst, Lst, int); /* * Node-specific functions */ /* Return first element in list */ -LstNode Lst_First __P((Lst)); +LstNode Lst_First(Lst); /* Return last element in list */ -LstNode Lst_Last __P((Lst)); +LstNode Lst_Last(Lst); /* Return successor to given element */ -LstNode Lst_Succ __P((LstNode)); +LstNode Lst_Succ(LstNode); /* Get datum from LstNode */ -ClientData Lst_Datum __P((LstNode)); +ClientData Lst_Datum(LstNode); /* * Functions for entire lists @@ -129,38 +129,38 @@ LstNode Lst_FindFrom __P((Lst, LstNode, ClientData, * See if the given datum is on the list. Returns the LstNode containing * the datum */ -LstNode Lst_Member __P((Lst, ClientData)); +LstNode Lst_Member(Lst, ClientData); /* Apply a function to all elements of a lst */ -void Lst_ForEach __P((Lst, int (*)(ClientData, ClientData), - ClientData)); +void Lst_ForEach(Lst, int (*)(ClientData, ClientData), + ClientData); /* * Apply a function to all elements of a lst starting from a certain point. * If the list is circular, the application will wrap around to the * beginning of the list again. */ -void Lst_ForEachFrom __P((Lst, LstNode, +void Lst_ForEachFrom(Lst, LstNode, int (*)(ClientData, ClientData), - ClientData)); + ClientData); /* * these functions are for dealing with a list as a table, of sorts. * An idea of the "current element" is kept and used by all the functions * between Lst_Open() and Lst_Close(). */ /* Open the list */ -ReturnStatus Lst_Open __P((Lst)); +ReturnStatus Lst_Open(Lst); /* Next element please */ -LstNode Lst_Next __P((Lst)); +LstNode Lst_Next(Lst); /* Done yet? */ -Boolean Lst_IsAtEnd __P((Lst)); +Boolean Lst_IsAtEnd(Lst); /* Finish table access */ -void Lst_Close __P((Lst)); +void Lst_Close(Lst); /* * for using the list as a queue */ /* Place an element at tail of queue */ -ReturnStatus Lst_EnQueue __P((Lst, ClientData)); +ReturnStatus Lst_EnQueue(Lst, ClientData); /* Remove an element from head of queue */ -ClientData Lst_DeQueue __P((Lst)); +ClientData Lst_DeQueue(Lst); #endif /* _LST_H_ */ diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c index ee4138cd18..2bb6f0de27 100644 --- a/usr.bin/make/lst.lib/lstDestroy.c +++ b/usr.bin/make/lst.lib/lstDestroy.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.7 1999/08/28 01:03:49 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstDestroy.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstDestroy.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ * * @(#)lstDestroy.c 8.1 (Berkeley) 6/6/93 */ @@ -64,7 +64,7 @@ void Lst_Destroy (l, freeProc) Lst l; - register void (*freeProc) __P((ClientData)); + register void (*freeProc)(ClientData); { register ListNode ln; register ListNode tln = NilListNode; diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c index aad750a7a6..5b43b61788 100644 --- a/usr.bin/make/lst.lib/lstDupl.c +++ b/usr.bin/make/lst.lib/lstDupl.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.7 1999/08/28 01:03:49 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstDupl.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstDupl.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ * * @(#)lstDupl.c 8.1 (Berkeley) 6/6/93 */ @@ -64,7 +64,7 @@ Lst Lst_Duplicate (l, copyProc) Lst l; /* the list to duplicate */ /* A function to duplicate each ClientData */ - ClientData (*copyProc) __P((ClientData)); + ClientData (*copyProc)(ClientData); { register Lst nl; register ListNode ln; diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c index 4ccebcb8f6..bbb8391d33 100644 --- a/usr.bin/make/lst.lib/lstFind.c +++ b/usr.bin/make/lst.lib/lstFind.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.6 1999/08/28 01:03:50 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstFind.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstFind.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ * * @(#)lstFind.c 8.1 (Berkeley) 6/6/93 */ @@ -64,7 +64,7 @@ LstNode Lst_Find (l, d, cProc) Lst l; ClientData d; - int (*cProc) __P((ClientData, ClientData)); + int (*cProc)(ClientData, ClientData); { return (Lst_FindFrom (l, Lst_First(l), d, cProc)); } diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c index 811f541e28..335fb3e0bf 100644 --- a/usr.bin/make/lst.lib/lstFindFrom.c +++ b/usr.bin/make/lst.lib/lstFindFrom.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.7 1999/08/28 01:03:50 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstFindFrom.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstFindFrom.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ * * @(#)lstFindFrom.c 8.1 (Berkeley) 6/6/93 */ @@ -66,7 +66,7 @@ Lst_FindFrom (l, ln, d, cProc) Lst l; register LstNode ln; register ClientData d; - register int (*cProc) __P((ClientData, ClientData)); + register int (*cProc)(ClientData, ClientData); { register ListNode tln; Boolean found = FALSE; diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c index d6e21e7ea5..9c2b430682 100644 --- a/usr.bin/make/lst.lib/lstForEach.c +++ b/usr.bin/make/lst.lib/lstForEach.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.6 1999/08/28 01:03:51 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstForEach.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstForEach.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ * * @(#)lstForEach.c 8.1 (Berkeley) 6/6/93 */ @@ -65,7 +65,7 @@ void Lst_ForEach (l, proc, d) Lst l; - register int (*proc) __P((ClientData, ClientData)); + register int (*proc)(ClientData, ClientData); register ClientData d; { Lst_ForEachFrom(l, Lst_First(l), proc, d); diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c index 0da1a333dd..d6d8f44233 100644 --- a/usr.bin/make/lst.lib/lstForEachFrom.c +++ b/usr.bin/make/lst.lib/lstForEachFrom.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.7 1999/08/28 01:03:52 peter Exp $ - * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstForEachFrom.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/lst.lib/Attic/lstForEachFrom.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ * * @(#)lstForEachFrom.c 8.1 (Berkeley) 6/6/93 */ @@ -67,7 +67,7 @@ void Lst_ForEachFrom (l, ln, proc, d) Lst l; LstNode ln; - register int (*proc) __P((ClientData, ClientData)); + register int (*proc)(ClientData, ClientData); register ClientData d; { register ListNode tln = (ListNode)ln; diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index fd129a3635..32a6188c5c 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -38,7 +38,7 @@ * @(#) Copyright (c) 1988, 1989, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/main.c,v 1.35.2.9 2003/04/15 14:37:35 ru Exp $ - * $DragonFly: src/usr.bin/make/main.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/main.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -132,10 +132,10 @@ Boolean checkEnvFirst; /* -e flag */ Lst envFirstVars; /* (-E) vars to override from env */ static Boolean jobsRunning; /* TRUE if the jobs might be running */ -static void MainParseArgs __P((int, char **)); -char * chdir_verify_path __P((char *, char *)); -static int ReadMakefile __P((ClientData, ClientData)); -static void usage __P((void)); +static void MainParseArgs(int, char **); +char * chdir_verify_path(char *, char *); +static int ReadMakefile(ClientData, ClientData); +static void usage(void); static char *curdir; /* startup directory */ static char *objdir; /* where we chdir'ed to */ @@ -893,7 +893,7 @@ main(argc, argv) Lst_Destroy(targs, NOFREE); Lst_Destroy(variables, NOFREE); Lst_Destroy(makefiles, NOFREE); - Lst_Destroy(create, (void (*) __P((ClientData))) free); + Lst_Destroy(create, (void (*)(ClientData)) free); /* print the graph now it's been processed if the user requested it */ if (DEBUG(GRAPH2)) diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index b7ad013c83..e50c4f739c 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -37,7 +37,7 @@ * * @(#)make.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/make/make.c,v 1.11 1999/09/11 13:08:01 hoek Exp $ - * $DragonFly: src/usr.bin/make/make.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/make.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -86,12 +86,12 @@ static int numNodes; /* Number of nodes to be processed. If this * is non-zero when Job_Empty() returns * TRUE, there's a cycle in the graph */ -static int MakeAddChild __P((ClientData, ClientData)); -static int MakeAddAllSrc __P((ClientData, ClientData)); -static int MakeTimeStamp __P((ClientData, ClientData)); -static int MakeHandleUse __P((ClientData, ClientData)); -static Boolean MakeStartJobs __P((void)); -static int MakePrintStatus __P((ClientData, ClientData)); +static int MakeAddChild(ClientData, ClientData); +static int MakeAddAllSrc(ClientData, ClientData); +static int MakeTimeStamp(ClientData, ClientData); +static int MakeHandleUse(ClientData, ClientData); +static Boolean MakeStartJobs(void); +static int MakePrintStatus(ClientData, ClientData); /*- *----------------------------------------------------------------------- * Make_TimeStamp -- diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index 2058f09e8c..0a0d29ea8f 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -37,7 +37,7 @@ * * from: @(#)make.h 8.3 (Berkeley) 6/13/95 * $FreeBSD: src/usr.bin/make/make.h,v 1.12.2.2 2001/02/13 03:13:58 will Exp $ - * $DragonFly: src/usr.bin/make/make.h,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/make.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -381,11 +381,11 @@ extern int debug; */ #include "nonints.h" -int Make_TimeStamp __P((GNode *, GNode *)); -Boolean Make_OODate __P((GNode *)); -int Make_HandleUse __P((GNode *, GNode *)); -void Make_Update __P((GNode *)); -void Make_DoAllVar __P((GNode *)); -Boolean Make_Run __P((Lst)); +int Make_TimeStamp(GNode *, GNode *); +Boolean Make_OODate(GNode *); +int Make_HandleUse(GNode *, GNode *); +void Make_Update(GNode *); +void Make_DoAllVar(GNode *); +Boolean Make_Run(Lst); #endif /* _MAKE_H_ */ diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h index b879a9e6c5..135da49435 100644 --- a/usr.bin/make/nonints.h +++ b/usr.bin/make/nonints.h @@ -37,113 +37,113 @@ * * from: @(#)nonints.h 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/nonints.h,v 1.8 1999/08/28 01:03:35 peter Exp $ - * $DragonFly: src/usr.bin/make/Attic/nonints.h,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/Attic/nonints.h,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /* arch.c */ -ReturnStatus Arch_ParseArchive __P((char **, Lst, GNode *)); -void Arch_Touch __P((GNode *)); -void Arch_TouchLib __P((GNode *)); -int Arch_MTime __P((GNode *)); -int Arch_MemMTime __P((GNode *)); -void Arch_FindLib __P((GNode *, Lst)); -Boolean Arch_LibOODate __P((GNode *)); -void Arch_Init __P((void)); -void Arch_End __P((void)); +ReturnStatus Arch_ParseArchive(char **, Lst, GNode *); +void Arch_Touch(GNode *); +void Arch_TouchLib(GNode *); +int Arch_MTime(GNode *); +int Arch_MemMTime(GNode *); +void Arch_FindLib(GNode *, Lst); +Boolean Arch_LibOODate(GNode *); +void Arch_Init(void); +void Arch_End(void); /* compat.c */ -void Compat_Run __P((Lst)); +void Compat_Run(Lst); /* cond.c */ -int Cond_Eval __P((char *)); -void Cond_End __P((void)); +int Cond_Eval(char *); +void Cond_End(void); /* for.c */ -int For_Eval __P((char *)); -void For_Run __P((void)); +int For_Eval(char *); +void For_Run (void); /* main.c */ -void Main_ParseArgLine __P((char *)); -int main __P((int, char **)); -char *Cmd_Exec __P((char *, char **)); -void Error __P((char *, ...)); -void Fatal __P((char *, ...)); -void Punt __P((char *, ...)); -void DieHorribly __P((void)); -int PrintAddr __P((ClientData, ClientData)); -void Finish __P((int)); -char *estrdup __P((const char *)); -void *emalloc __P((size_t)); +void Main_ParseArgLine(char *); +int main(int, char **); +char *Cmd_Exec(char *, char **); +void Error(char *, ...); +void Fatal(char *, ...); +void Punt(char *, ...); +void DieHorribly(void); +int PrintAddr(ClientData, ClientData); +void Finish(int); +char *estrdup(const char *); +void *emalloc(size_t); /* efree(x) works when x==NULL. STDC behavior, may need some different * definition for cross-builds on deficient systems */ #define efree free -void *erealloc __P((void *, size_t)); -void enomem __P((void)); -int eunlink __P((const char *)); +void *erealloc(void *, size_t); +void enomem(void); +int eunlink(const char *); /* parse.c */ -void Parse_Error __P((int, char *, ...)); -Boolean Parse_AnyExport __P((void)); -Boolean Parse_IsVar __P((char *)); -void Parse_DoVar __P((char *, GNode *)); -void Parse_AddIncludeDir __P((char *)); -void Parse_File __P((char *, FILE *)); -void Parse_Init __P((void)); -void Parse_End __P((void)); -void Parse_FromString __P((char *)); -Lst Parse_MainName __P((void)); +void Parse_Error(int, char *, ...); +Boolean Parse_AnyExport(void); +Boolean Parse_IsVar(char *); +void Parse_DoVar(char *, GNode *); +void Parse_AddIncludeDir(char *); +void Parse_File(char *, FILE *); +void Parse_Init(void); +void Parse_End(void); +void Parse_FromString(char *); +Lst Parse_MainName(void); /* str.c */ -void str_init __P((void)); -void str_end __P((void)); -char *str_concat __P((char *, char *, int)); -char **brk_string __P((char *, int *, Boolean)); -char *Str_FindSubstring __P((char *, char *)); -int Str_Match __P((char *, char *)); -char *Str_SYSVMatch __P((char *, char *, int *len)); -void Str_SYSVSubst __P((Buffer, char *, char *, int)); +void str_init(void); +void str_end(void); +char *str_concat(char *, char *, int); +char **brk_string(char *, int *, Boolean); +char *Str_FindSubstring(char *, char *); +int Str_Match(char *, char *); +char *Str_SYSVMatch(char *, char *, int *len); +void Str_SYSVSubst(Buffer, char *, char *, int); /* suff.c */ -void Suff_ClearSuffixes __P((void)); -Boolean Suff_IsTransform __P((char *)); -GNode *Suff_AddTransform __P((char *)); -int Suff_EndTransform __P((ClientData, ClientData)); -void Suff_AddSuffix __P((char *)); -Lst Suff_GetPath __P((char *)); -void Suff_DoPaths __P((void)); -void Suff_AddInclude __P((char *)); -void Suff_AddLib __P((char *)); -void Suff_FindDeps __P((GNode *)); -void Suff_SetNull __P((char *)); -void Suff_Init __P((void)); -void Suff_End __P((void)); -void Suff_PrintAll __P((void)); +void Suff_ClearSuffixes(void); +Boolean Suff_IsTransform(char *); +GNode *Suff_AddTransform(char *); +int Suff_EndTransform(ClientData, ClientData); +void Suff_AddSuffix(char *); +Lst Suff_GetPath(char *); +void Suff_DoPaths(void); +void Suff_AddInclude(char *); +void Suff_AddLib(char *); +void Suff_FindDeps(GNode *); +void Suff_SetNull(char *); +void Suff_Init(void); +void Suff_End(void); +void Suff_PrintAll(void); /* targ.c */ -void Targ_Init __P((void)); -void Targ_End __P((void)); -GNode *Targ_NewGN __P((char *)); -GNode *Targ_FindNode __P((char *, int)); -Lst Targ_FindList __P((Lst, int)); -Boolean Targ_Ignore __P((GNode *)); -Boolean Targ_Silent __P((GNode *)); -Boolean Targ_Precious __P((GNode *)); -void Targ_SetMain __P((GNode *)); -int Targ_PrintCmd __P((ClientData, ClientData)); -char *Targ_FmtTime __P((time_t)); -void Targ_PrintType __P((int)); -void Targ_PrintGraph __P((int)); +void Targ_Init(void); +void Targ_End(void); +GNode *Targ_NewGN(char *); +GNode *Targ_FindNode(char *, int); +Lst Targ_FindList(Lst, int); +Boolean Targ_Ignore(GNode *); +Boolean Targ_Silent(GNode *); +Boolean Targ_Precious(GNode *); +void Targ_SetMain(GNode *); +int Targ_PrintCmd(ClientData, ClientData); +char *Targ_FmtTime(time_t); +void Targ_PrintType(int); +void Targ_PrintGraph(int); /* var.c */ -void Var_Delete __P((char *, GNode *)); -void Var_Set __P((char *, char *, GNode *)); -void Var_Append __P((char *, char *, GNode *)); -Boolean Var_Exists __P((char *, GNode *)); -char *Var_Value __P((char *, GNode *, char **)); -char *Var_Parse __P((char *, GNode *, Boolean, int *, Boolean *)); -char *Var_Subst __P((char *, char *, GNode *, Boolean)); -char *Var_GetTail __P((char *)); -char *Var_GetHead __P((char *)); -void Var_Init __P((void)); -void Var_End __P((void)); -void Var_Dump __P((GNode *)); +void Var_Delete(char *, GNode *); +void Var_Set(char *, char *, GNode *); +void Var_Append(char *, char *, GNode *); +Boolean Var_Exists(char *, GNode *); +char *Var_Value(char *, GNode *, char **); +char *Var_Parse(char *, GNode *, Boolean, int *, Boolean *); +char *Var_Subst(char *, char *, GNode *, Boolean); +char *Var_GetTail(char *); +char *Var_GetHead(char *); +void Var_Init(void); +void Var_End(void); +void Var_Dump(GNode *); diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 3af0454772..d22c4f0551 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -37,7 +37,7 @@ * * @(#)parse.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/parse.c,v 1.22.2.1 2002/12/26 14:36:38 ru Exp $ - * $DragonFly: src/usr.bin/make/parse.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/parse.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -233,28 +233,28 @@ static struct { { ".WAIT", Wait, 0 }, }; -static int ParseFindKeyword __P((char *)); -static int ParseLinkSrc __P((ClientData, ClientData)); -static int ParseDoOp __P((ClientData, ClientData)); -static int ParseAddDep __P((ClientData, ClientData)); -static void ParseDoSrc __P((int, char *, Lst)); -static int ParseFindMain __P((ClientData, ClientData)); -static int ParseAddDir __P((ClientData, ClientData)); -static int ParseClearPath __P((ClientData, ClientData)); -static void ParseDoDependency __P((char *)); -static int ParseAddCmd __P((ClientData, ClientData)); -static int ParseReadc __P((void)); -static void ParseUnreadc __P((int)); -static void ParseHasCommands __P((ClientData)); -static void ParseDoInclude __P((char *)); -static void ParseDoError __P((char *)); +static int ParseFindKeyword(char *); +static int ParseLinkSrc(ClientData, ClientData); +static int ParseDoOp(ClientData, ClientData); +static int ParseAddDep(ClientData, ClientData); +static void ParseDoSrc(int, char *, Lst); +static int ParseFindMain(ClientData, ClientData); +static int ParseAddDir(ClientData, ClientData); +static int ParseClearPath(ClientData, ClientData); +static void ParseDoDependency(char *); +static int ParseAddCmd(ClientData, ClientData); +static int ParseReadc(void); +static void ParseUnreadc(int); +static void ParseHasCommands(ClientData); +static void ParseDoInclude(char *); +static void ParseDoError(char *); #ifdef SYSVINCLUDE -static void ParseTraditionalInclude __P((char *)); +static void ParseTraditionalInclude(char *); #endif -static int ParseEOF __P((int)); -static char *ParseReadLine __P((void)); -static char *ParseSkipLine __P((int)); -static void ParseFinishLine __P((void)); +static int ParseEOF(int); +static char *ParseReadLine(void); +static char *ParseSkipLine(int); +static void ParseFinishLine(void); /*- *---------------------------------------------------------------------- @@ -2611,7 +2611,7 @@ Parse_Init () void Parse_End() { - Lst_Destroy(targCmds, (void (*) __P((ClientData))) free); + Lst_Destroy(targCmds, (void (*)(ClientData)) free); if (targets) Lst_Destroy(targets, NOFREE); Lst_Destroy(sysIncPath, Dir_Destroy); diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c index 3a399f867b..824895ab63 100644 --- a/usr.bin/make/suff.c +++ b/usr.bin/make/suff.c @@ -37,7 +37,7 @@ * * @(#)suff.c 8.4 (Berkeley) 3/21/94 * $FreeBSD: src/usr.bin/make/suff.c,v 1.12.2.1 2001/03/09 01:13:24 tmm Exp $ - * $DragonFly: src/usr.bin/make/suff.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/suff.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -152,30 +152,30 @@ static Suff *emptySuff; /* The empty suffix required for POSIX * single-suffix transformation rules */ -static char *SuffStrIsPrefix __P((char *, char *)); -static char *SuffSuffIsSuffix __P((Suff *, char *)); -static int SuffSuffIsSuffixP __P((ClientData, ClientData)); -static int SuffSuffHasNameP __P((ClientData, ClientData)); -static int SuffSuffIsPrefix __P((ClientData, ClientData)); -static int SuffGNHasNameP __P((ClientData, ClientData)); -static void SuffFree __P((ClientData)); -static void SuffInsert __P((Lst, Suff *)); -static void SuffRemove __P((Lst, Suff *)); -static Boolean SuffParseTransform __P((char *, Suff **, Suff **)); -static int SuffRebuildGraph __P((ClientData, ClientData)); -static int SuffAddSrc __P((ClientData, ClientData)); -static int SuffRemoveSrc __P((Lst)); -static void SuffAddLevel __P((Lst, Src *)); -static Src *SuffFindThem __P((Lst, Lst)); -static Src *SuffFindCmds __P((Src *, Lst)); -static int SuffExpandChildren __P((ClientData, ClientData)); -static Boolean SuffApplyTransform __P((GNode *, GNode *, Suff *, Suff *)); -static void SuffFindDeps __P((GNode *, Lst)); -static void SuffFindArchiveDeps __P((GNode *, Lst)); -static void SuffFindNormalDeps __P((GNode *, Lst)); -static int SuffPrintName __P((ClientData, ClientData)); -static int SuffPrintSuff __P((ClientData, ClientData)); -static int SuffPrintTrans __P((ClientData, ClientData)); +static char *SuffStrIsPrefix(char *, char *); +static char *SuffSuffIsSuffix(Suff *, char *); +static int SuffSuffIsSuffixP(ClientData, ClientData); +static int SuffSuffHasNameP(ClientData, ClientData); +static int SuffSuffIsPrefix(ClientData, ClientData); +static int SuffGNHasNameP(ClientData, ClientData); +static void SuffFree(ClientData); +static void SuffInsert(Lst, Suff *); +static void SuffRemove(Lst, Suff *); +static Boolean SuffParseTransform(char *, Suff **, Suff **); +static int SuffRebuildGraph(ClientData, ClientData); +static int SuffAddSrc(ClientData, ClientData); +static int SuffRemoveSrc(Lst); +static void SuffAddLevel(Lst, Src *); +static Src *SuffFindThem(Lst, Lst); +static Src *SuffFindCmds(Src *, Lst); +static int SuffExpandChildren(ClientData, ClientData); +static Boolean SuffApplyTransform(GNode *, GNode *, Suff *, Suff *); +static void SuffFindDeps(GNode *, Lst); +static void SuffFindArchiveDeps(GNode *, Lst); +static void SuffFindNormalDeps(GNode *, Lst); +static int SuffPrintName(ClientData, ClientData); +static int SuffPrintSuff(ClientData, ClientData); +static int SuffPrintTrans(ClientData, ClientData); /*************** Lst Predicates ****************/ /*- diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c index 9942f2ea00..2618734b2b 100644 --- a/usr.bin/make/targ.c +++ b/usr.bin/make/targ.c @@ -37,7 +37,7 @@ * * @(#)targ.c 8.2 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/targ.c,v 1.10 1999/09/11 13:08:02 hoek Exp $ - * $DragonFly: src/usr.bin/make/targ.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/targ.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -93,10 +93,10 @@ static Hash_Table targets; /* a hash table of same */ #define HTSIZE 191 /* initial size of hash table */ -static int TargPrintOnlySrc __P((ClientData, ClientData)); -static int TargPrintName __P((ClientData, ClientData)); -static int TargPrintNode __P((ClientData, ClientData)); -static void TargFreeGN __P((ClientData)); +static int TargPrintOnlySrc(ClientData, ClientData); +static int TargPrintName(ClientData, ClientData); +static int TargPrintNode(ClientData, ClientData); +static void TargFreeGN(ClientData); /*- *----------------------------------------------------------------------- diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 4e268f40f6..27192edce0 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -37,7 +37,7 @@ * * @(#)var.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/var.c,v 1.16.2.3 2002/02/27 14:18:57 cjc Exp $ - * $DragonFly: src/usr.bin/make/var.c,v 1.2 2003/06/17 04:29:29 dillon Exp $ + * $DragonFly: src/usr.bin/make/var.c,v 1.3 2003/11/03 19:31:30 eirikn Exp $ */ /*- @@ -165,29 +165,29 @@ typedef struct { int flags; } VarREPattern; -static int VarCmp __P((ClientData, ClientData)); -static Var *VarFind __P((char *, GNode *, int)); -static void VarAdd __P((char *, char *, GNode *)); -static void VarDelete __P((ClientData)); -static Boolean VarHead __P((char *, Boolean, Buffer, ClientData)); -static Boolean VarTail __P((char *, Boolean, Buffer, ClientData)); -static Boolean VarSuffix __P((char *, Boolean, Buffer, ClientData)); -static Boolean VarRoot __P((char *, Boolean, Buffer, ClientData)); -static Boolean VarMatch __P((char *, Boolean, Buffer, ClientData)); +static int VarCmp(ClientData, ClientData); +static Var *VarFind(char *, GNode *, int); +static void VarAdd(char *, char *, GNode *); +static void VarDelete(ClientData); +static Boolean VarHead(char *, Boolean, Buffer, ClientData); +static Boolean VarTail(char *, Boolean, Buffer, ClientData); +static Boolean VarSuffix(char *, Boolean, Buffer, ClientData); +static Boolean VarRoot(char *, Boolean, Buffer, ClientData); +static Boolean VarMatch(char *, Boolean, Buffer, ClientData); #ifdef SYSVVARSUB -static Boolean VarSYSVMatch __P((char *, Boolean, Buffer, ClientData)); +static Boolean VarSYSVMatch(char *, Boolean, Buffer, ClientData); #endif -static Boolean VarNoMatch __P((char *, Boolean, Buffer, ClientData)); -static void VarREError __P((int, regex_t *, const char *)); -static Boolean VarRESubstitute __P((char *, Boolean, Buffer, ClientData)); -static Boolean VarSubstitute __P((char *, Boolean, Buffer, ClientData)); -static char *VarGetPattern __P((GNode *, int, char **, int, int *, int *, - VarPattern *)); -static char *VarQuote __P((char *)); -static char *VarModify __P((char *, Boolean (*)(char *, Boolean, Buffer, +static Boolean VarNoMatch(char *, Boolean, Buffer, ClientData); +static void VarREError(int, regex_t *, const char *); +static Boolean VarRESubstitute(char *, Boolean, Buffer, ClientData); +static Boolean VarSubstitute(char *, Boolean, Buffer, ClientData); +static char *VarGetPattern(GNode *, int, char **, int, int *, int *, + VarPattern *); +static char *VarQuote(char *); +static char *VarModify(char *, Boolean (*)(char *, Boolean, Buffer, ClientData), - ClientData)); -static int VarPrintVar __P((ClientData, ClientData)); + ClientData); +static int VarPrintVar(ClientData, ClientData); /*- *----------------------------------------------------------------------- @@ -1240,7 +1240,7 @@ static char * VarModify (str, modProc, datum) char *str; /* String whose words should be trimmed */ /* Function to use to modify them */ - Boolean (*modProc) __P((char *, Boolean, Buffer, ClientData)); + Boolean (*modProc)(char *, Boolean, Buffer, ClientData); ClientData datum; /* Datum to pass it */ { Buffer buf; /* Buffer for the new string */ diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h index 13b922b5a8..a1c95e6ae5 100644 --- a/usr.bin/passwd/extern.h +++ b/usr.bin/passwd/extern.h @@ -32,8 +32,8 @@ * * From: @(#)extern.h 8.1 (Berkeley) 4/2/94 * $FreeBSD: src/usr.bin/passwd/extern.h,v 1.5 1999/08/28 01:04:50 peter Exp $ - * $DragonFly: src/usr.bin/passwd/extern.h,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/passwd/extern.h,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ -int krb_passwd __P((char *, char *, char *, char *)); -int local_passwd __P((char *)); +int krb_passwd(char *, char *, char *, char *); +int local_passwd(char *); diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h index f92e947d0c..4b5df5f583 100644 --- a/usr.bin/pr/extern.h +++ b/usr.bin/pr/extern.h @@ -35,27 +35,27 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/pr/extern.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/pr/extern.h,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ extern int eoptind; extern char *eoptarg; -void addnum __P((char *, int, int)); -int egetopt __P((int, char * const *, const char *)); -void flsh_errs __P((void)); -int horzcol __P((int, char **)); -int inln __P((FILE *, char *, int, int *, int, int *)); -int inskip __P((FILE *, int, int)); -void mfail __P((void)); -int mulfile __P((int, char **)); -FILE *nxtfile __P((int, char **, char **, char *, int)); -int onecol __P((int, char **)); -int otln __P((char *, int, int *, int *, int)); -void pfail __P((void)); -int prhead __P((char *, char *, int)); -int prtail __P((int, int)); -int setup __P((int, char **)); -void terminate __P((int)); -void usage __P((void)); -int vertcol __P((int, char **)); +void addnum(char *, int, int); +int egetopt(int, char * const *, const char *); +void flsh_errs(void); +int horzcol(int, char **); +int inln(FILE *, char *, int, int *, int, int *); +int inskip(FILE *, int, int); +void mfail(void); +int mulfile(int, char **); +FILE *nxtfile(int, char **, char **, char *, int); +int onecol(int, char **); +int otln(char *, int, int *, int *, int); +void pfail(void); +int prhead(char *, char *, int); +int prtail(int, int); +int setup(int, char **); +void terminate(int); +void usage(void); +int vertcol(int, char **); diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c index e9b3cd6279..c8175af778 100644 --- a/usr.bin/ranlib/build.c +++ b/usr.bin/ranlib/build.c @@ -35,7 +35,7 @@ * * @(#)build.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/ranlib/build.c,v 1.7 1999/08/28 01:05:01 peter Exp $ - * $DragonFly: src/usr.bin/ranlib/Attic/build.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/ranlib/Attic/build.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include @@ -53,10 +53,10 @@ #include "archive.h" -extern int tmp __P(( void )); -extern void error __P(( char * )); -extern void badfmt __P(( void )); -extern void settime __P(( int )); +extern int tmp( void ); +extern void error( char * ); +extern void badfmt( void ); +extern void settime( int ); extern CHDR chdr; /* converted header */ extern char *archive; /* archive name */ @@ -75,8 +75,8 @@ FILE *fp; long symcnt; /* symbol count */ long tsymlen; /* total string length */ -static void rexec __P((int, int)); -static void symobj __P((void)); +static void rexec(int, int); +static void symobj(void); int build(void) diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c index 54b7705d9f..27095d5f1b 100644 --- a/usr.bin/ranlib/misc.c +++ b/usr.bin/ranlib/misc.c @@ -35,7 +35,7 @@ * * @(#)misc.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/ranlib/misc.c,v 1.5 1999/08/28 01:05:02 peter Exp $ - * $DragonFly: src/usr.bin/ranlib/Attic/misc.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/ranlib/Attic/misc.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include @@ -52,7 +52,7 @@ extern char *archive; /* archive name */ char *tname = "temporary file"; /* temporary file "name" */ -void error __P(( char * )); +void error( char * ); int tmp(void) diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c index c4fb20f5ed..3c62ab1cc3 100644 --- a/usr.bin/ranlib/ranlib.c +++ b/usr.bin/ranlib/ranlib.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)ranlib.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/ranlib/ranlib.c,v 1.5.2.1 2001/03/04 08:56:30 kris Exp $ - * $DragonFly: src/usr.bin/ranlib/Attic/ranlib.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/ranlib/Attic/ranlib.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include @@ -46,9 +46,9 @@ #include #include "archive.h" -extern int build __P(( void )); -extern int touch __P(( void )); -static void usage __P((void)); +extern int build( void ); +extern int touch( void ); +static void usage(void); CHDR chdr; u_int options; /* UNUSED -- keep open_archive happy */ diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c index 279c6ebed2..5544f11336 100644 --- a/usr.bin/ranlib/touch.c +++ b/usr.bin/ranlib/touch.c @@ -35,7 +35,7 @@ * * @(#)touch.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/ranlib/touch.c,v 1.6 1999/08/28 01:05:04 peter Exp $ - * $DragonFly: src/usr.bin/ranlib/Attic/touch.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/ranlib/Attic/touch.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include @@ -53,9 +53,9 @@ extern CHDR chdr; /* converted header */ extern char *archive; /* archive name */ -extern void error __P(( char * )); -void settime __P(( int )); -int touch __P(( void )); +extern void error( char * ); +void settime( int ); +int touch( void ); int touch(void) diff --git a/usr.bin/rdist/defs.h b/usr.bin/rdist/defs.h index 80d536689d..93adeeea35 100644 --- a/usr.bin/rdist/defs.h +++ b/usr.bin/rdist/defs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)defs.h 8.1 (Berkeley) 6/9/93 - * $DragonFly: src/usr.bin/rdist/defs.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/rdist/defs.h,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include @@ -162,31 +162,31 @@ extern char buf[BUFSIZ]; /* general purpose buffer */ extern char target[BUFSIZ]; /* target/source directory name */ extern char *path_rsh; /* rsh command to use */ -int any __P((int, char *)); -char *colon __P((char *)); -void cleanup __P((int)); -void define __P((char *)); -void docmds __P((char **, int, char **)); -void error __P((const char *, ...)); -int except __P((char *)); +int any(int, char *); +char *colon(char *); +void cleanup(int); +void define(char *); +void docmds(char **, int, char **); +void error(const char *, ...); +int except(char *); struct namelist * - expand __P((struct namelist *, int)); -char *exptilde __P((char [], char *, int)); -void fatal __P((const char *, ...)); -int inlist __P((struct namelist *, char *)); + expand(struct namelist *, int); +char *exptilde(char [], char *, int); +void fatal(const char *, ...); +int inlist(struct namelist *, char *); void insert __P((char *, struct namelist *, struct namelist *, struct subcmd *)); -void install __P((char *, char *, int, int)); -void log __P((FILE *, const char *, ...)); +void install(char *, char *, int, int); +void log(FILE *, const char *, ...); struct namelist * - lookup __P((char *, int, struct namelist *)); -void lostconn __P((int)); + lookup(char *, int, struct namelist *); +void lostconn(int); struct namelist * - makenl __P((char *)); + makenl(char *); struct subcmd * - makesubcmd __P((int)); -void prnames __P((struct namelist *)); -void server __P((void)); -void yyerror __P((char *)); -int yyparse __P((void)); -int rshrcmd __P((char **, u_short, char *, char *, char *, int *)); + makesubcmd(int); +void prnames(struct namelist *); +void server(void); +void yyerror(char *); +int yyparse(void); +int rshrcmd(char **, u_short, char *, char *, char *, int *); diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c index aecf7e7cc5..3e9d91f41a 100644 --- a/usr.bin/rdist/docmd.c +++ b/usr.bin/rdist/docmd.c @@ -32,7 +32,7 @@ * * @(#)docmd.c 8.1 (Berkeley) 6/9/93 * $FreeBSD: src/usr.bin/rdist/docmd.c,v 1.12 1999/08/28 01:05:06 peter Exp $ - * $DragonFly: src/usr.bin/rdist/docmd.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/rdist/docmd.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include "defs.h" @@ -44,17 +44,17 @@ FILE *lfp; /* log file for recording files updated */ struct subcmd *subcmds; /* list of sub-commands for current cmd */ jmp_buf env; -static int makeconn __P((char *)); -static int okname __P((char *)); -static void closeconn __P((void)); -static void cmptime __P((char *)); -static void doarrow __P((char **, - struct namelist *, char *, struct subcmd *)); -static void dodcolon __P((char **, - struct namelist *, char *, struct subcmd *)); -static void notify __P((char *, char *, struct namelist *, time_t)); -static void rcmptime __P((struct stat *)); -static int remotecmd __P((char *, char *, char *, char *)); +static int makeconn(char *); +static int okname(char *); +static void closeconn(void); +static void cmptime(char *); +static void doarrow(char **, + struct namelist *, char *, struct subcmd *); +static void dodcolon(char **, + struct namelist *, char *, struct subcmd *); +static void notify(char *, char *, struct namelist *, time_t); +static void rcmptime(struct stat *); +static int remotecmd(char *, char *, char *, char *); /* * Do the commands in cmds (initialized by yyparse). diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c index 593bd86b95..f076185fb8 100644 --- a/usr.bin/rdist/expand.c +++ b/usr.bin/rdist/expand.c @@ -32,7 +32,7 @@ * * @(#)expand.c 8.1 (Berkeley) 6/9/93 * $FreeBSD: src/usr.bin/rdist/expand.c,v 1.8 1999/08/28 01:05:06 peter Exp $ - * $DragonFly: src/usr.bin/rdist/expand.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/rdist/expand.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include "defs.h" @@ -60,16 +60,16 @@ char **sortbase; #define sort() qsort((char *)sortbase, &eargv[eargc] - sortbase, \ sizeof(*sortbase), argcmp), sortbase = &eargv[eargc] -static void Cat __P((char *, char *)); -static void addpath __P((int)); -static int amatch __P((char *, char *)); -static int argcmp __P((const void *, const void *)); -static int execbrc __P((char *, char *)); -static void expsh __P((char *)); -static void expstr __P((char *)); -static int match __P((char *, char *)); -static void matchdir __P((char *)); -static int smatch __P((char *, char *)); +static void Cat(char *, char *); +static void addpath(int); +static int amatch(char *, char *); +static int argcmp(const void *, const void *); +static int execbrc(char *, char *); +static void expsh(char *); +static void expstr(char *); +static int match(char *, char *); +static void matchdir(char *); +static int smatch(char *, char *); /* * Take a list of names and expand any macros, etc. diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c index 6cedc84d69..61e95a68c5 100644 --- a/usr.bin/rdist/main.c +++ b/usr.bin/rdist/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.1 (Berkeley) 6/9/93 * $FreeBSD: src/usr.bin/rdist/main.c,v 1.5 1999/08/28 01:05:07 peter Exp $ - * $DragonFly: src/usr.bin/rdist/main.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/rdist/main.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include "defs.h" @@ -68,8 +68,8 @@ char *path_rsh = _PATH_RSH; /* rsh (or equiv command) path */ struct passwd *pw; /* pointer to static area used by getpwent */ struct group *gr; /* pointer to static area used by getgrent */ -static void usage __P((void)); -static void docmdargs __P((int, char *[])); +static void usage(void); +static void docmdargs(int, char *[]); int main(argc, argv) diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c index ae60b51428..ed8c21df5a 100644 --- a/usr.bin/rdist/server.c +++ b/usr.bin/rdist/server.c @@ -32,7 +32,7 @@ * * @(#)server.c 8.1 (Berkeley) 6/9/93 * $FreeBSD: src/usr.bin/rdist/server.c,v 1.10 1999/08/28 01:05:09 peter Exp $ - * $DragonFly: src/usr.bin/rdist/server.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/rdist/server.c,v 1.3 2003/11/03 19:31:31 eirikn Exp $ */ #include @@ -53,22 +53,22 @@ int oumask; /* old umask for creating files */ extern FILE *lfp; /* log file for mailing changes */ -static int chkparent __P((char *)); -static void clean __P((char *)); -static void comment __P((char *)); -static void dospecial __P((char *)); -static int fchog __P((int, char *, char *, char *, int)); -static void hardlink __P((char *)); -static void note __P((const char *, ...)); -static void query __P((char *)); -static void recvf __P((char *, int)); -static void removeit __P((struct stat *)); -static int response __P((void)); -static void rmchk __P((int)); +static int chkparent(char *); +static void clean(char *); +static void comment(char *); +static void dospecial(char *); +static int fchog(int, char *, char *, char *, int); +static void hardlink(char *); +static void note(const char *, ...); +static void query(char *); +static void recvf(char *, int); +static void removeit(struct stat *); +static int response(void); +static void rmchk(int); static struct linkbuf * - savelink __P((struct stat *)); -static void sendf __P((char *, int)); -static int update __P((char *, int, struct stat *)); + savelink(struct stat *); +static void sendf(char *, int); +static int update(char *, int, struct stat *); /* * Server routine to read requests and process them. diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index cd2d348b7c..894f96a837 100644 --- a/usr.bin/rev/rev.c +++ b/usr.bin/rev/rev.c @@ -32,7 +32,7 @@ * * @(#) Copyright (c) 1987, 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)rev.c 8.3 (Berkeley) 5/4/95 - * $DragonFly: src/usr.bin/rev/rev.c,v 1.3 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/rev/rev.c,v 1.4 2003/11/03 19:31:32 eirikn Exp $ */ #include @@ -44,7 +44,7 @@ #include #include -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index d310790e6d..833a45e49e 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -40,7 +40,7 @@ * @(#) Copyright (c) 1983, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)rlogin.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/rlogin/rlogin.c,v 1.24.2.2 2002/07/19 18:03:41 ru Exp $ - * $DragonFly: src/usr.bin/rlogin/rlogin.c,v 1.2 2003/06/17 04:29:30 dillon Exp $ + * $DragonFly: src/usr.bin/rlogin/rlogin.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ /* @@ -116,27 +116,27 @@ struct winsize { #endif struct winsize winsize; -void catch_child __P((int)); -void copytochild __P((int)); -void doit __P((long)) __dead2; -void done __P((int)) __dead2; -void echo __P((char)); -u_int getescape __P((char *)); -void lostpeer __P((int)); -void mode __P((int)); -void msg __P((char *)); -void oob __P((int)); -int reader __P((int)); -void sendwindow __P((void)); -void setsignal __P((int)); -void sigwinch __P((int)); -void stop __P((char)); -void usage __P((void)) __dead2; -void writer __P((void)); -void writeroob __P((int)); +void catch_child(int); +void copytochild(int); +void doit(long) __dead2; +void done(int) __dead2; +void echo(char); +u_int getescape(char *); +void lostpeer(int); +void mode(int); +void msg(char *); +void oob(int); +int reader(int); +void sendwindow(void); +void setsignal(int); +void sigwinch(int); +void stop(char); +void usage(void) __dead2; +void writer(void); +void writeroob(int); #ifdef OLDSUN -int get_window_size __P((int, struct winsize *)); +int get_window_size(int, struct winsize *); #endif int diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c index 9040cb07ed..a289d8993a 100644 --- a/usr.bin/rpcgen/rpc_clntout.c +++ b/usr.bin/rpcgen/rpc_clntout.c @@ -27,7 +27,7 @@ * Mountain View, California 94043 * * @(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI - * $DragonFly: src/usr.bin/rpcgen/rpc_clntout.c,v 1.3 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_clntout.c,v 1.4 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_clntout.c 1.15 94/04/25 SMI" @@ -42,10 +42,10 @@ #include "rpc_parse.h" #include "rpc_util.h" -extern void pdeclaration __P(( char *, declaration *, int, char * )); -void printarglist __P(( proc_list *, char *, char *, char *)); -static void write_program __P(( definition * )); -static void printbody __P(( proc_list * )); +extern void pdeclaration( char *, declaration *, int, char * ); +void printarglist( proc_list *, char *, char *, char *); +static void write_program( definition * ); +static void printbody( proc_list * ); static char RESULT[] = "clnt_res"; diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c index 08b3cb401e..2e87c86070 100644 --- a/usr.bin/rpcgen/rpc_cout.c +++ b/usr.bin/rpcgen/rpc_cout.c @@ -28,7 +28,7 @@ * * @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI * $FreeBSD: src/usr.bin/rpcgen/rpc_cout.c,v 1.7 1999/08/28 01:05:16 peter Exp $ - * $DragonFly: src/usr.bin/rpcgen/rpc_cout.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_cout.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_cout.c 1.14 93/07/05 SMI" @@ -44,16 +44,16 @@ #include "rpc_parse.h" #include "rpc_util.h" -static void print_header __P(( definition * )); -static void print_trailer __P(( void )); -static void print_stat __P(( int , declaration * )); -static void emit_enum __P(( definition * )); -static void emit_program __P(( definition * )); -static void emit_union __P(( definition * )); -static void emit_struct __P(( definition * )); -static void emit_typedef __P(( definition * )); -static void emit_inline __P(( int, declaration *, int )); -static void emit_single_in_line __P(( int, declaration *, int, relation )); +static void print_header( definition * ); +static void print_trailer( void ); +static void print_stat( int , declaration * ); +static void emit_enum( definition * ); +static void emit_program( definition * ); +static void emit_union( definition * ); +static void emit_struct( definition * ); +static void emit_typedef( definition * ); +static void emit_inline( int, declaration *, int ); +static void emit_single_in_line( int, declaration *, int, relation ); /* * Emit the C-routine for the given definition diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index d8d1b21e15..39947a8b66 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -27,7 +27,7 @@ * Mountain View, California 94043 * * @(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI - * $DragonFly: src/usr.bin/rpcgen/rpc_hout.c,v 1.3 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_hout.c,v 1.4 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_hout.c 1.16 94/04/25 SMI" @@ -41,19 +41,19 @@ #include "rpc_parse.h" #include "rpc_util.h" -void storexdrfuncdecl __P(( char *, int )); -static void pconstdef __P(( definition * )); -static void pstructdef __P(( definition * )); -static void puniondef __P(( definition * )); -static void pprogramdef __P(( definition * )); -static void pstructdef __P(( definition * )); -static void penumdef __P(( definition * )); -static void ptypedef __P(( definition * )); -static void pdefine __P(( char *, char * )); -static int undefined2 __P(( char *, char * )); -static void parglist __P(( proc_list *, char * )); -static void pprocdef __P(( proc_list *, version_list *, char *, int, int )); -void pdeclaration __P(( char *, declaration *, int, char * )); +void storexdrfuncdecl( char *, int ); +static void pconstdef( definition * ); +static void pstructdef( definition * ); +static void puniondef( definition * ); +static void pprogramdef( definition * ); +static void pstructdef( definition * ); +static void penumdef( definition * ); +static void ptypedef( definition * ); +static void pdefine( char *, char * ); +static int undefined2( char *, char * ); +static void parglist( proc_list *, char * ); +static void pprocdef( proc_list *, version_list *, char *, int, int ); +void pdeclaration( char *, declaration *, int, char * ); static char RESULT[] = "clnt_res"; diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index df7fb96dee..eedb8cd481 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -28,7 +28,7 @@ * * @(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI * $FreeBSD: src/usr.bin/rpcgen/rpc_main.c,v 1.11 1999/08/28 01:05:16 peter Exp $ - * $DragonFly: src/usr.bin/rpcgen/rpc_main.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_main.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ @@ -52,29 +52,29 @@ #include "rpc_util.h" #include "rpc_scan.h" -extern void write_sample_svc __P(( definition * )); -extern int write_sample_clnt __P(( definition * )); -extern void write_sample_clnt_main __P(( void )); -extern void add_sample_msg __P(( void )); -static void c_output __P(( char *, char *, int, char * )); -static void h_output __P(( char *, char *, int, char * )); -static void l_output __P(( char *, char *, int, char * )); -static void t_output __P(( char *, char *, int, char * )); -static void clnt_output __P(( char *, char *, int, char * )); +extern void write_sample_svc( definition * ); +extern int write_sample_clnt( definition * ); +extern void write_sample_clnt_main( void ); +extern void add_sample_msg( void ); +static void c_output( char *, char *, int, char * ); +static void h_output( char *, char *, int, char * ); +static void l_output( char *, char *, int, char * ); +static void t_output( char *, char *, int, char * ); +static void clnt_output( char *, char *, int, char * ); -void c_initialize __P(( void )); +void c_initialize( void ); #if !defined(__FreeBSD__) && !defined(__NetBSD__) char * rindex(); #endif -static void usage __P(( void )); +static void usage( void ); static void options_usage __P (( void )); -static int do_registers __P(( int, char ** )); -static int parseargs __P(( int, char **, struct commandline * )); -static void svc_output __P(( char *, char *, int, char * )); -static void mkfile_output __P(( struct commandline * )); -static void s_output __P(( int, char **, char *, char *, int, char *, int, int )); +static int do_registers( int, char ** ); +static int parseargs( int, char **, struct commandline * ); +static void svc_output( char *, char *, int, char * ); +static void mkfile_output( struct commandline * ); +static void s_output( int, char **, char *, char *, int, char *, int, int ); #define EXTEND 1 /* alias for TRUE */ #define DONT_EXTEND 0 /* alias for FALSE */ diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c index 03a0a2f132..4122cc648d 100644 --- a/usr.bin/rpcgen/rpc_parse.c +++ b/usr.bin/rpcgen/rpc_parse.c @@ -27,7 +27,7 @@ * Mountain View, California 94043 * * @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI - * $DragonFly: src/usr.bin/rpcgen/rpc_parse.c,v 1.3 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_parse.c,v 1.4 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_parse.c 1.12 93/07/05 SMI" @@ -45,18 +45,18 @@ #define ARGNAME "arg" -extern char *make_argname __P(( char *, char * )); -static void isdefined __P(( definition * )); -static void def_struct __P(( definition * )); -static void def_program __P(( definition * )); -static void def_enum __P(( definition * )); -static void def_const __P(( definition * )); -static void def_union __P(( definition * )); -static void def_typedef __P(( definition * )); -static void get_declaration __P(( declaration *, defkind )); -static void get_prog_declaration __P(( declaration *, defkind, int )); -static void get_type __P(( char **, char **, defkind )); -static void unsigned_dec __P(( char ** )); +extern char *make_argname( char *, char * ); +static void isdefined( definition * ); +static void def_struct( definition * ); +static void def_program( definition * ); +static void def_enum( definition * ); +static void def_const( definition * ); +static void def_union( definition * ); +static void def_typedef( definition * ); +static void get_declaration( declaration *, defkind ); +static void get_prog_declaration( declaration *, defkind, int ); +static void get_type( char **, char **, defkind ); +static void unsigned_dec( char ** ); #ifndef __FreeBSD__ extern char *strdup(); diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c index 5bd2b039d6..30209b92f7 100644 --- a/usr.bin/rpcgen/rpc_sample.c +++ b/usr.bin/rpcgen/rpc_sample.c @@ -25,7 +25,7 @@ * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 - * $DragonFly: src/usr.bin/rpcgen/rpc_sample.c,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_sample.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #pragma ident "@(#)rpc_sample.c 1.9 94/04/25 SMI" @@ -43,10 +43,10 @@ static char RQSTP[] = "rqstp"; -extern void printarglist __P(( proc_list *, char *, char *, char *)); -static void write_sample_client __P(( char *, version_list * )); -static void write_sample_server __P(( definition * )); -static void return_type __P(( proc_list * )); +extern void printarglist( proc_list *, char *, char *, char *); +static void write_sample_client( char *, version_list * ); +static void write_sample_server( definition * ); +static void return_type( proc_list * ); void write_sample_svc(def) diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c index 656e0a12a5..d3263622f6 100644 --- a/usr.bin/rpcgen/rpc_scan.c +++ b/usr.bin/rpcgen/rpc_scan.c @@ -27,7 +27,7 @@ * Mountain View, California 94043 * * $FreeBSD: src/usr.bin/rpcgen/rpc_scan.c,v 1.4.8.1 2001/03/04 08:59:50 kris Exp $ - * $DragonFly: src/usr.bin/rpcgen/rpc_scan.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_scan.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ * * @(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI */ @@ -55,15 +55,15 @@ static int pushed = 0; /* is a token pushed */ static token lasttok; /* last token, if pushed */ -static void unget_token __P(( token * )); -static void findstrconst __P(( char **, char **)); -static void findchrconst __P(( char **, char **)); -static void findconst __P(( char **, char **)); -static void findkind __P(( char **, token * )); -static int cppline __P(( char * )); -static int directive __P(( char * )); -static void printdirective __P(( char * )); -static void docppline __P(( char *, int *, char ** )); +static void unget_token( token * ); +static void findstrconst( char **, char **); +static void findchrconst( char **, char **); +static void findconst( char **, char **); +static void findkind( char **, token * ); +static int cppline( char * ); +static int directive( char * ); +static void printdirective( char * ); +static void docppline( char *, int *, char ** ); /* * scan expecting 1 given token diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c index 74873b5eaa..21b4365832 100644 --- a/usr.bin/rpcgen/rpc_svcout.c +++ b/usr.bin/rpcgen/rpc_svcout.c @@ -28,7 +28,7 @@ * * @(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI * $FreeBSD: src/usr.bin/rpcgen/rpc_svcout.c,v 1.6.6.1 2001/07/19 01:38:22 kris Exp $ - * $DragonFly: src/usr.bin/rpcgen/rpc_svcout.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_svcout.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_svcout.c 1.4 90/04/13 SMI" @@ -51,21 +51,21 @@ static char RETVAL[] = "retval"; char _errbuf[256]; /* For all messages */ -void internal_proctype __P(( proc_list * )); -static void write_real_program __P(( definition * )); -static void write_program __P(( definition *, char * )); -static void printerr __P(( char *, char * )); -static void printif __P(( char *, char *, char *, char * )); -static void write_inetmost __P(( char * )); -static void print_return __P(( char * )); -static void print_pmapunset __P(( char * )); -static void print_err_message __P(( char * )); -static void write_timeout_func __P(( void )); -static void write_pm_most __P(( char *, int )); -static void write_rpc_svc_fg __P(( char *, char * )); -static void open_log_file __P(( char *, char * )); -static void write_msg_out __P(( void )); -int nullproc __P(( proc_list * )); +void internal_proctype( proc_list * ); +static void write_real_program( definition * ); +static void write_program( definition *, char * ); +static void printerr( char *, char * ); +static void printif( char *, char *, char *, char * ); +static void write_inetmost( char * ); +static void print_return( char * ); +static void print_pmapunset( char * ); +static void print_err_message( char * ); +static void write_timeout_func( void ); +static void write_pm_most( char *, int ); +static void write_rpc_svc_fg( char *, char * ); +static void open_log_file( char *, char * ); +static void write_msg_out( void ); +int nullproc( proc_list * ); static void diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c index 6a32524f82..a241bff483 100644 --- a/usr.bin/rpcgen/rpc_tblout.c +++ b/usr.bin/rpcgen/rpc_tblout.c @@ -28,7 +28,7 @@ * * @(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI * $FreeBSD: src/usr.bin/rpcgen/rpc_tblout.c,v 1.4 1999/08/28 01:05:17 peter Exp $ - * $DragonFly: src/usr.bin/rpcgen/rpc_tblout.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_tblout.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_tblout.c 1.11 93/07/05 SMI" @@ -59,9 +59,9 @@ static char null_entry[] = "\n\t(char *(*)())0,\n\ static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n"; -extern int nullproc __P(( proc_list * )); -static void write_table __P(( definition * )); -static void printit __P(( char *, char * )); +extern int nullproc( proc_list * ); +static void write_table( definition * ); +static void printit( char *, char * ); void write_tables() diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c index b55d321b3a..d7fde18d38 100644 --- a/usr.bin/rpcgen/rpc_util.c +++ b/usr.bin/rpcgen/rpc_util.c @@ -28,7 +28,7 @@ * * @(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI * $FreeBSD: src/usr.bin/rpcgen/rpc_util.c,v 1.6 1999/08/28 01:05:17 peter Exp $ - * $DragonFly: src/usr.bin/rpcgen/rpc_util.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rpcgen/rpc_util.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #ident "@(#)rpc_util.c 1.14 93/07/05 SMI" @@ -63,7 +63,7 @@ FILE *fin; /* file pointer of current input */ list *defined; /* list of defined things */ -static void printwhere __P(( void )); +static void printwhere( void ); /* * Reinitialize the world diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index dd57e366c2..abdb54ad17 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1990, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)rsh.c 8.3 (Berkeley) 4/6/94 * $FreeBSD: src/usr.bin/rsh/rsh.c,v 1.21.2.4 2002/09/17 15:34:41 nectar Exp $ - * $DragonFly: src/usr.bin/rsh/rsh.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rsh/rsh.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #include @@ -78,11 +78,11 @@ int rfd2; int family = PF_UNSPEC; -void connect_timeout __P((int)); -char *copyargs __P((char **)); -void sendsig __P((int)); -void talk __P((int, long, pid_t, int, int)); -void usage __P((void)); +void connect_timeout(int); +char *copyargs(char **); +void sendsig(int); +void talk(int, long, pid_t, int, int); +void usage(void); int main(argc, argv) diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index ce9f084655..f44cd504ea 100644 --- a/usr.bin/ruptime/ruptime.c +++ b/usr.bin/ruptime/ruptime.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)ruptime.c 8.2 (Berkeley) 4/5/94 * $FreeBSD: src/usr.bin/ruptime/ruptime.c,v 1.12.2.1 2000/06/30 09:45:00 ps Exp $ - * $DragonFly: src/usr.bin/ruptime/ruptime.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/ruptime/ruptime.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ #include @@ -63,13 +63,13 @@ size_t nhosts; time_t now; int rflg = 1; -int hscmp __P((const void *, const void *)); -char *interval __P((time_t, char *)); -int lcmp __P((const void *, const void *)); -void morehosts __P((void)); -int tcmp __P((const void *, const void *)); -int ucmp __P((const void *, const void *)); -void usage __P((void)); +int hscmp(const void *, const void *); +char *interval(time_t, char *); +int lcmp(const void *, const void *); +void morehosts(void); +int tcmp(const void *, const void *); +int ucmp(const void *, const void *); +void usage(void); int main(argc, argv) @@ -84,7 +84,7 @@ main(argc, argv) size_t hspace; int aflg, cc, ch, fd, i, maxloadav; char buf[sizeof(struct whod)]; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); aflg = 0; cmp = hscmp; diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c index 924ec6e778..174049fdb1 100644 --- a/usr.bin/rwall/rwall.c +++ b/usr.bin/rwall/rwall.c @@ -34,7 +34,7 @@ * @(#) Copyright (c) 1988 Regents of the University of California. All rights reserved. * @(#)wall.c 5.14 (Berkeley) 3/2/91 * $FreeBSD: src/usr.bin/rwall/rwall.c,v 1.8.2.1 2001/02/18 02:27:54 kris Exp $ - * $DragonFly: src/usr.bin/rwall/rwall.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rwall/rwall.c,v 1.3 2003/11/03 19:31:32 eirikn Exp $ */ /* @@ -62,9 +62,9 @@ int mbufsize; char *mbuf; -void makemsg __P((char *)); -static void usage __P((void)); -char *ttymsg __P((struct iovec *, int, char *, int)); +void makemsg(char *); +static void usage(void); +char *ttymsg(struct iovec *, int, char *, int); /* ARGSUSED */ int diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c index be7f00106c..57b36cab56 100644 --- a/usr.bin/rwho/rwho.c +++ b/usr.bin/rwho/rwho.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)rwho.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/rwho/rwho.c,v 1.13.2.1 2002/03/12 19:49:09 phantom Exp $ - * $DragonFly: src/usr.bin/rwho/rwho.c,v 1.2 2003/06/17 04:29:31 dillon Exp $ + * $DragonFly: src/usr.bin/rwho/rwho.c,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -71,8 +71,8 @@ int nusers; time_t now; int aflg; -static void usage __P((void)); -int utmpcmp __P((const void *, const void *)); +static void usage(void); +int utmpcmp(const void *, const void *); int main(argc, argv) diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c index 353128dc88..9f6f19ea83 100644 --- a/usr.bin/strip/strip.c +++ b/usr.bin/strip/strip.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)strip.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/strip/strip.c,v 1.12 1999/08/28 01:05:53 peter Exp $ - * $DragonFly: src/usr.bin/strip/Attic/strip.c,v 1.3 2003/10/04 20:36:51 hmp Exp $ + * $DragonFly: src/usr.bin/strip/Attic/strip.c,v 1.4 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -67,7 +67,7 @@ main(int argc, char **argv) { register int fd, nb; EXEC head; - void (*sfcn)__P((const char *, int, EXEC *)); + void (*sfcn)(const char *, int, EXEC *); int ch; char *fn; diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h index 65f2a3308f..9f97038701 100644 --- a/usr.bin/systat/extern.h +++ b/usr.bin/systat/extern.h @@ -32,7 +32,7 @@ * * @(#)extern.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/systat/extern.h,v 1.7.6.1 2001/07/04 22:54:14 kris Exp $ - * $DragonFly: src/usr.bin/systat/extern.h,v 1.3 2003/07/12 03:09:50 dillon Exp $ + * $DragonFly: src/usr.bin/systat/extern.h,v 1.4 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -70,81 +70,81 @@ extern int num_selected; extern int num_selections; extern long select_generation; -int checkhost __P((struct inpcb *)); -int checkport __P((struct inpcb *)); -void closeiostat __P((WINDOW *)); -void closeicmp __P((WINDOW *)); -void closeip __P((WINDOW *)); -void closekre __P((WINDOW *)); -void closembufs __P((WINDOW *)); -void closenetstat __P((WINDOW *)); -void closepigs __P((WINDOW *)); -void closeswap __P((WINDOW *)); -void closetcp __P((WINDOW *)); -int cmdiostat __P((char *, char *)); -int cmdkre __P((char *, char *)); -int cmdnetstat __P((char *, char *)); -struct cmdtab *lookup __P((char *)); -void command __P((char *)); -void die __P((int)); -void display __P((int)); -int dkinit __P((void)); -int dkcmd __P((char *, char *)); -void error __P((const char *fmt, ...)) __printflike(1, 2); -void fetchicmp __P((void)); -void fetchip __P((void)); -void fetchiostat __P((void)); -void fetchkre __P((void)); -void fetchmbufs __P((void)); -void fetchnetstat __P((void)); -void fetchpigs __P((void)); -void fetchswap __P((void)); -void fetchtcp __P((void)); -int initicmp __P((void)); -int initip __P((void)); -int initiostat __P((void)); -int initkre __P((void)); -int initmbufs __P((void)); -int initnetstat __P((void)); -int initpigs __P((void)); -int initswap __P((void)); -int inittcp __P((void)); -int keyboard __P((void)); -int kvm_ckread __P((void *, void *, int)); -void labelicmp __P((void)); -void labelip __P((void)); -void labeliostat __P((void)); -void labelkre __P((void)); -void labelmbufs __P((void)); -void labelnetstat __P((void)); -void labelpigs __P((void)); -void labels __P((void)); -void labelswap __P((void)); -void labeltcp __P((void)); -void load __P((void)); -int netcmd __P((char *, char *)); -void nlisterr __P((struct nlist [])); -WINDOW *openicmp __P((void)); -WINDOW *openip __P((void)); -WINDOW *openiostat __P((void)); -WINDOW *openkre __P((void)); -WINDOW *openmbufs __P((void)); -WINDOW *opennetstat __P((void)); -WINDOW *openpigs __P((void)); -WINDOW *openswap __P((void)); -WINDOW *opentcp __P((void)); -int prefix __P((char *, char *)); -void reseticmp __P((void)); -void resetip __P((void)); -void resettcp __P((void)); -void showicmp __P((void)); -void showip __P((void)); -void showiostat __P((void)); -void showkre __P((void)); -void showmbufs __P((void)); -void shownetstat __P((void)); -void showpigs __P((void)); -void showswap __P((void)); -void showtcp __P((void)); -void status __P((void)); -void suspend __P((int)); +int checkhost(struct inpcb *); +int checkport(struct inpcb *); +void closeiostat(WINDOW *); +void closeicmp(WINDOW *); +void closeip(WINDOW *); +void closekre(WINDOW *); +void closembufs(WINDOW *); +void closenetstat(WINDOW *); +void closepigs(WINDOW *); +void closeswap(WINDOW *); +void closetcp(WINDOW *); +int cmdiostat(char *, char *); +int cmdkre(char *, char *); +int cmdnetstat(char *, char *); +struct cmdtab *lookup(char *); +void command(char *); +void die(int); +void display(int); +int dkinit(void); +int dkcmd(char *, char *); +void error(const char *fmt, ...) __printflike(1, 2); +void fetchicmp(void); +void fetchip(void); +void fetchiostat(void); +void fetchkre(void); +void fetchmbufs(void); +void fetchnetstat(void); +void fetchpigs(void); +void fetchswap(void); +void fetchtcp(void); +int initicmp(void); +int initip(void); +int initiostat(void); +int initkre(void); +int initmbufs(void); +int initnetstat(void); +int initpigs(void); +int initswap(void); +int inittcp(void); +int keyboard(void); +int kvm_ckread(void *, void *, int); +void labelicmp(void); +void labelip(void); +void labeliostat(void); +void labelkre(void); +void labelmbufs(void); +void labelnetstat(void); +void labelpigs(void); +void labels(void); +void labelswap(void); +void labeltcp(void); +void load(void); +int netcmd(char *, char *); +void nlisterr(struct nlist []); +WINDOW *openicmp(void); +WINDOW *openip(void); +WINDOW *openiostat(void); +WINDOW *openkre(void); +WINDOW *openmbufs(void); +WINDOW *opennetstat(void); +WINDOW *openpigs(void); +WINDOW *openswap(void); +WINDOW *opentcp(void); +int prefix(char *, char *); +void reseticmp(void); +void resetip(void); +void resettcp(void); +void showicmp(void); +void showip(void); +void showiostat(void); +void showkre(void); +void showmbufs(void); +void shownetstat(void); +void showpigs(void); +void showswap(void); +void showtcp(void); +void status(void); +void suspend(int); diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h index 117e3aa124..797d54911e 100644 --- a/usr.bin/tail/extern.h +++ b/usr.bin/tail/extern.h @@ -33,7 +33,7 @@ * @(#)extern.h 8.1 (Berkeley) 6/6/93 * * $FreeBSD: src/usr.bin/tail/extern.h,v 1.4.6.2 2001/12/19 20:29:29 iedowse Exp $ - * $DragonFly: src/usr.bin/tail/extern.h,v 1.2 2003/06/17 04:29:32 dillon Exp $ + * $DragonFly: src/usr.bin/tail/extern.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ #define WR(p, size) do { \ @@ -53,16 +53,16 @@ struct mapinfo { enum STYLE { NOTSET = 0, FBYTES, FLINES, RBYTES, RLINES, REVERSE }; -void forward __P((FILE *, enum STYLE, off_t, struct stat *)); -void reverse __P((FILE *, enum STYLE, off_t, struct stat *)); +void forward(FILE *, enum STYLE, off_t, struct stat *); +void reverse(FILE *, enum STYLE, off_t, struct stat *); -int bytes __P((FILE *, off_t)); -int lines __P((FILE *, off_t)); +int bytes(FILE *, off_t); +int lines(FILE *, off_t); -void ierr __P((void)); -void oerr __P((void)); -int mapprint __P((struct mapinfo *, off_t, off_t)); -int maparound __P((struct mapinfo *, off_t)); +void ierr(void); +void oerr(void); +int mapprint(struct mapinfo *, off_t, off_t); +int maparound(struct mapinfo *, off_t); extern int Fflag, fflag, rflag, rval; extern char *fname; diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h index afcf3a36a7..19c9b6b653 100644 --- a/usr.bin/talk/talk.h +++ b/usr.bin/talk/talk.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)talk.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/talk/talk.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/talk/talk.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -66,30 +66,30 @@ extern xwin_t my_win; extern xwin_t his_win; extern WINDOW *line_win; -extern void announce_invite __P((void)); -extern int check_local __P((void)); -extern void check_writeable __P((void)); -extern void ctl_transact __P((struct in_addr,CTL_MSG,int,CTL_RESPONSE *)); -extern void disp_msg __P((int)); -extern void display __P((xwin_t *, char *, int)); -extern void end_msgs __P((void)); -extern void get_addrs __P((char *, char *)); -extern int get_iface __P((struct in_addr *, struct in_addr *)); -extern void get_names __P((int, char **)); -extern void init_display __P((void)); -extern void invite_remote __P((void)); -extern int look_for_invite __P((CTL_RESPONSE *)); -extern int max __P((int, int)); -extern void message __P((char *)); -extern void open_ctl __P((void)); -extern void open_sockt __P((void)); -extern void p_error __P((char *)); -extern void print_addr __P((struct sockaddr_in)); -extern void quit __P((void)); -extern int readwin __P((WINDOW *, int, int)); -extern void re_invite __P((int)); -extern void send_delete __P((void)); -extern void set_edit_chars __P((void)); -extern void sig_sent __P((int)); -extern void start_msgs __P((void)); -extern void talk __P((void)); +extern void announce_invite(void); +extern int check_local(void); +extern void check_writeable(void); +extern void ctl_transact(struct in_addr,CTL_MSG,int,CTL_RESPONSE *); +extern void disp_msg(int); +extern void display(xwin_t *, char *, int); +extern void end_msgs(void); +extern void get_addrs(char *, char *); +extern int get_iface(struct in_addr *, struct in_addr *); +extern void get_names(int, char **); +extern void init_display(void); +extern void invite_remote(void); +extern int look_for_invite(CTL_RESPONSE *); +extern int max(int, int); +extern void message(char *); +extern void open_ctl(void); +extern void open_sockt(void); +extern void p_error(char *); +extern void print_addr(struct sockaddr_in); +extern void quit(void); +extern int readwin(WINDOW *, int, int); +extern void re_invite(int); +extern void send_delete(void); +extern void set_edit_chars(void); +extern void sig_sent(int); +extern void start_msgs(void); +extern void talk(void); diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h index 68d4d74f53..34eb4dae30 100644 --- a/usr.bin/tftp/extern.h +++ b/usr.bin/tftp/extern.h @@ -31,8 +31,8 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/tftp/extern.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/tftp/extern.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ -void recvfile __P((int, char *, char *)); -void xmitfile __P((int, char *, char *)); +void recvfile(int, char *, char *); +void xmitfile(int, char *, char *); diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h index fc57b5f99e..a99b2b84a4 100644 --- a/usr.bin/tftp/tftpsubs.h +++ b/usr.bin/tftp/tftpsubs.h @@ -31,19 +31,19 @@ * SUCH DAMAGE. * * @(#)tftpsubs.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/tftp/tftpsubs.h,v 1.2 2003/11/03 19:14:35 eirikn Exp $ + * $DragonFly: src/usr.bin/tftp/tftpsubs.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ /* * Prototypes for read-ahead/write-behind subroutines for tftp user and * server. */ -struct tftphdr *r_init __P((void)); -void read_ahead __P((FILE *, int)); -int readit __P((FILE *, struct tftphdr **, int)); +struct tftphdr *r_init(void); +void read_ahead(FILE *, int); +int readit(FILE *, struct tftphdr **, int); -int synchnet __P((int)); +int synchnet(int); -struct tftphdr *w_init __P((void)); -int write_behind __P((FILE *, int)); -int writeit __P((FILE *, struct tftphdr **, int, int)); +struct tftphdr *w_init(void); +int write_behind(FILE *, int); +int writeit(FILE *, struct tftphdr **, int, int); diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c index 3251f6878c..ab4fae5d65 100644 --- a/usr.bin/tip/tip/remote.c +++ b/usr.bin/tip/tip/remote.c @@ -34,7 +34,7 @@ * @(#) Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)remote.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/tip/tip/remote.c,v 1.4 1999/08/28 01:06:35 peter Exp $ - * $DragonFly: src/usr.bin/tip/tip/remote.c,v 1.2 2003/06/17 04:29:32 dillon Exp $ + * $DragonFly: src/usr.bin/tip/tip/remote.c,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -64,7 +64,7 @@ static char *db_array[3] = { _PATH_REMOTE, 0, 0 }; #define cgetflag(f) (cgetcap(bp, f, ':') != NULL) -static void getremcap __P((char *)); +static void getremcap(char *); /* Expand the start tilde sequence at the start of the diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c index 7f05c88da5..d374374f69 100644 --- a/usr.bin/tip/tip/tip.c +++ b/usr.bin/tip/tip/tip.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)tip.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.12.2.2 2001/06/02 08:08:24 phk Exp $ - * $DragonFly: src/usr.bin/tip/tip/tip.c,v 1.2 2003/06/17 04:29:32 dillon Exp $ + * $DragonFly: src/usr.bin/tip/tip/tip.c,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ /* @@ -78,17 +78,17 @@ void tipdone(); char *sname(); char PNbuf[256]; /* This limits the size of a number */ -static void usage __P((void)); -void setparity __P((char *)); -void xpwrite __P((int, char *, int)); -char escape __P((void)); -void tipin __P((void)); -int prompt __P((char *, char *, size_t)); -void unraw __P((void)); -void shell_uid __P((void)); -void daemon_uid __P((void)); -void user_uid __P((void)); -int speed __P((int)); +static void usage(void); +void setparity(char *); +void xpwrite(int, char *, int); +char escape(void); +void tipin(void); +int prompt(char *, char *, size_t); +void unraw(void); +void shell_uid(void); +void daemon_uid(void); +void user_uid(void); +int speed(int); int main(argc, argv) diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h index 7ec770dd01..d6b37e644b 100644 --- a/usr.bin/tip/tip/tip.h +++ b/usr.bin/tip/tip/tip.h @@ -34,7 +34,7 @@ * @(#)tip.h 8.1 (Berkeley) 6/6/93 * * $FreeBSD: src/usr.bin/tip/tip/tip.h,v 1.5.2.1 2000/07/01 12:24:23 ps Exp $ - * $DragonFly: src/usr.bin/tip/tip/tip.h,v 1.2 2003/06/17 04:29:32 dillon Exp $ + * $DragonFly: src/usr.bin/tip/tip/tip.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ /* @@ -205,9 +205,9 @@ extern value_t vtable[]; /* variable table */ #if !ACULOG #define logent(a, b, c, d) -#define loginit() +#define loginit(x) #else -void logent __P((char *, char *, char *, char*)); +void logent(char *, char *, char *, char*); #endif /* @@ -305,24 +305,24 @@ extern int disc; /* current tty discpline */ extern char *ctrl(); extern char *vinterp(); extern char *connect(); -extern int size __P((char *)); -extern int any __P((char, char *)); -extern void setscript __P((void)); -extern void tipout __P((void)); -extern void vinit __P((void)); -extern void loginit __P((void)); -extern int hunt __P((char *)); -extern int vstring __P((char *, char *)); -extern void setparity __P((char *)); -extern void vlex __P((char *)); -extern void daemon_uid __P((void)); -extern void disconnect __P((char *)); -extern void shell_uid __P((void)); -extern void unraw __P((void)); -extern void xpwrite __P((int, char *, int)); -extern int prompt __P((char *, char *, size_t)); -extern int consh __P((int)); -extern void tipabort __P((char *)); +extern int size(char *); +extern int any(char, char *); +extern void setscript(void); +extern void tipout(void); +extern void vinit(void); +extern void loginit(void); +extern int hunt(char *); +extern int vstring(char *, char *); +extern void setparity(char *); +extern void vlex(char *); +extern void daemon_uid(void); +extern void disconnect(char *); +extern void shell_uid(void); +extern void unraw(void); +extern void xpwrite(int, char *, int); +extern int prompt(char *, char *, size_t); +extern int consh(int); +extern void tipabort(char *); #define TL_VERBOSE 0x00000001 #define TL_SIGNAL_TIPOUT 0x00000002 diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c index afad93f630..a473abe2e4 100644 --- a/usr.bin/tip/tip/value.c +++ b/usr.bin/tip/tip/value.c @@ -32,7 +32,7 @@ * * @(#)value.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/tip/tip/value.c,v 1.5.2.1 2000/07/01 12:24:23 ps Exp $ - * $DragonFly: src/usr.bin/tip/tip/value.c,v 1.2 2003/06/17 04:29:33 dillon Exp $ + * $DragonFly: src/usr.bin/tip/tip/value.c,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ #include "tip.h" @@ -40,9 +40,9 @@ #define MIDDLE 35 static value_t *vlookup(); -int vstring __P((char *, char *)); -void vlex __P((char *)); -void vassign __P((value_t *, char *)); +int vstring(char *, char *); +void vlex(char *); +void vassign(value_t *, char *); static int col = 0; diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h index ea6016da52..3aa11a4186 100644 --- a/usr.bin/tset/extern.h +++ b/usr.bin/tset/extern.h @@ -32,7 +32,7 @@ * * @(#)extern.h 8.1 (Berkeley) 6/9/93 * $FreeBSD: src/usr.bin/tset/extern.h,v 1.6.2.1 2000/11/12 07:48:29 dg Exp $ - * $DragonFly: src/usr.bin/tset/extern.h,v 1.2 2003/06/17 04:29:33 dillon Exp $ + * $DragonFly: src/usr.bin/tset/extern.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -41,13 +41,13 @@ extern struct termios mode, oldmode; extern int Columns, isreset, Lines; extern int erasech, intrchar, killch; -void add_mapping __P((char *, char *)); -void cat __P((char *)); -char *get_termcap_entry __P((char *, char **)); -char *mapped __P((char *)); -int outc __P((int)); -void reset_mode __P((void)); -void set_control_chars __P((void)); -void set_conversions __P((int)); -void set_init __P((void)); -void wrtermcap __P((char *)); +void add_mapping(char *, char *); +void cat(char *); +char *get_termcap_entry(char *, char **); +char *mapped(char *); +int outc(int); +void reset_mode(void); +void set_control_chars(void); +void set_conversions(int); +void set_init(void); +void wrtermcap(char *); diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c index b44eaa0b63..7fdbe06ce4 100644 --- a/usr.bin/tset/map.c +++ b/usr.bin/tset/map.c @@ -32,7 +32,7 @@ * * @(#)map.c 8.1 (Berkeley) 6/9/93 * $FreeBSD: src/usr.bin/tset/map.c,v 1.7 1999/08/30 08:27:30 peter Exp $ - * $DragonFly: src/usr.bin/tset/map.c,v 1.3 2003/10/04 20:36:53 hmp Exp $ + * $DragonFly: src/usr.bin/tset/map.c,v 1.4 2003/11/03 19:31:33 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include "extern.h" extern speed_t Ospeed; -speed_t tset_baudrate __P((char *)); +speed_t tset_baudrate(char *); /* Baud rate conditionals for mapping. */ #define GT 0x01 diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h index c8d6fd56d2..41ae5c8e3d 100644 --- a/usr.bin/vgrind/extern.h +++ b/usr.bin/vgrind/extern.h @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.bin/vgrind/extern.h,v 1.2 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/vgrind/extern.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ typedef int boolean; @@ -59,8 +59,8 @@ extern char *language; /* the language indicator */ #include __BEGIN_DECLS -extern int STRNCMP __P((char *, char *, int)); -extern char *convexp __P((char *)); -extern char *expmatch __P((char *, char *, char *)); +extern int STRNCMP(char *, char *, int); +extern char *convexp(char *); +extern char *expmatch(char *, char *, char *); __END_DECLS diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h index 0ab3ec78d5..f50a6039d7 100644 --- a/usr.bin/w/extern.h +++ b/usr.bin/w/extern.h @@ -32,12 +32,12 @@ * * @(#)extern.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/w/extern.h,v 1.2.6.1 2002/03/12 19:51:51 phantom Exp $ - * $DragonFly: src/usr.bin/w/extern.h,v 1.2 2003/06/17 04:29:33 dillon Exp $ + * $DragonFly: src/usr.bin/w/extern.h,v 1.3 2003/11/03 19:31:33 eirikn Exp $ */ extern int use_ampm; struct proc; -void pr_attime __P((time_t *, time_t *)); -int pr_idle __P((time_t)); -int proc_compare __P((struct proc *, struct proc *)); +void pr_attime(time_t *, time_t *); +int pr_idle(time_t); +int proc_compare(struct proc *, struct proc *); diff --git a/usr.bin/xlint/lint1/cgram.y b/usr.bin/xlint/lint1/cgram.y index 124d0d3e38..ca6d0043f5 100644 --- a/usr.bin/xlint/lint1/cgram.y +++ b/usr.bin/xlint/lint1/cgram.y @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: cgram.y,v 1.8 1995/10/02 17:31:35 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/cgram.y,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/cgram.y,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -54,9 +54,9 @@ int blklev; */ int mblklev; -static int toicon __P((tnode_t *)); -static void idecl __P((sym_t *, int)); -static void ignuptorp __P((void)); +static int toicon(tnode_t *); +static void idecl(sym_t *, int); +static void ignuptorp(void); %} diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c index 6c0e4011c8..5e3e466095 100644 --- a/usr.bin/xlint/lint1/decl.c +++ b/usr.bin/xlint/lint1/decl.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.bin/xlint/lint1/decl.c,v 1.2.8.2 2001/07/19 09:19:47 kris Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/decl.c,v 1.2 2003/06/17 04:29:34 dillon Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/decl.c,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -58,25 +58,25 @@ int enumval; */ dinfo_t *dcs; -static type_t *tdeferr __P((type_t *, tspec_t)); -static void settdsym __P((type_t *, sym_t *)); -static tspec_t mrgtspec __P((tspec_t, tspec_t)); -static void align __P((int, int)); -static sym_t *newtag __P((sym_t *, scl_t, int, int)); -static int eqargs __P((type_t *, type_t *, int *)); -static int mnoarg __P((type_t *, int *)); -static int chkosdef __P((sym_t *, sym_t *)); -static int chkptdecl __P((sym_t *, sym_t *)); -static sym_t *nsfunc __P((sym_t *, sym_t *)); -static void osfunc __P((sym_t *, sym_t *)); -static void ledecl __P((sym_t *)); -static int chkinit __P((sym_t *)); -static void chkausg __P((int, sym_t *)); -static void chkvusg __P((int, sym_t *)); -static void chklusg __P((sym_t *)); -static void chktusg __P((sym_t *)); -static void chkglvar __P((sym_t *)); -static void glchksz __P((sym_t *)); +static type_t *tdeferr(type_t *, tspec_t); +static void settdsym(type_t *, sym_t *); +static tspec_t mrgtspec(tspec_t, tspec_t); +static void align(int, int); +static sym_t *newtag(sym_t *, scl_t, int, int); +static int eqargs(type_t *, type_t *, int *); +static int mnoarg(type_t *, int *); +static int chkosdef(sym_t *, sym_t *); +static int chkptdecl(sym_t *, sym_t *); +static sym_t *nsfunc(sym_t *, sym_t *); +static void osfunc(sym_t *, sym_t *); +static void ledecl(sym_t *); +static int chkinit(sym_t *); +static void chkausg(int, sym_t *); +static void chkvusg(int, sym_t *); +static void chklusg(sym_t *); +static void chktusg(sym_t *); +static void chkglvar(sym_t *); +static void glchksz(sym_t *); /* * initializes all global vars used in declarations diff --git a/usr.bin/xlint/lint1/emit.c b/usr.bin/xlint/lint1/emit.c index be72ccca4a..1e36ca7532 100644 --- a/usr.bin/xlint/lint1/emit.c +++ b/usr.bin/xlint/lint1/emit.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.bin/xlint/lint1/emit.c,v 1.1.1.1.8.1 2001/03/04 09:27:26 kris Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/emit.c,v 1.2 2003/06/17 04:29:34 dillon Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/emit.c,v 1.3 2003/11/03 19:31:34 eirikn Exp $ * * $NetBSD: emit.c,v 1.2 1995/07/03 21:24:00 cgd Exp $ */ @@ -50,7 +50,7 @@ static FILE *lout; /* output buffer data */ ob_t ob; -static void outxbuf __P((void)); +static void outxbuf(void); /* diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c index a710e8dd29..53770af595 100644 --- a/usr.bin/xlint/lint1/emit1.c +++ b/usr.bin/xlint/lint1/emit1.c @@ -31,15 +31,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: emit1.c,v 1.4 1995/10/02 17:21:28 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/emit1.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/emit1.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include #include "lint1.h" -static void outtt __P((sym_t *, sym_t *)); -static void outfstrg __P((strg_t *)); +static void outtt(sym_t *, sym_t *); +static void outfstrg(strg_t *); /* * Write type into the output buffer. diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c index ba15d0e86d..f1ed0d8fe4 100644 --- a/usr.bin/xlint/lint1/err.c +++ b/usr.bin/xlint/lint1/err.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/err.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/err.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ /* number of errors found */ @@ -49,9 +49,9 @@ int sytxerr; #include "lint1.h" -static const char *basename __P((const char *)); -static void verror __P((int, va_list)); -static void vwarning __P((int, va_list)); +static const char *basename(const char *); +static void verror(int, va_list); +static void vwarning(int, va_list); const char *msgs[] = { diff --git a/usr.bin/xlint/lint1/externs.h b/usr.bin/xlint/lint1/externs.h index 5aa5ae6e50..1f2f7fa43b 100644 --- a/usr.bin/xlint/lint1/externs.h +++ b/usr.bin/xlint/lint1/externs.h @@ -30,29 +30,29 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $DragonFly: src/usr.bin/xlint/lint1/externs.h,v 1.2 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/externs.h,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ /* * mem.c */ -extern void *xmalloc __P((size_t)); -extern void *xcalloc __P((size_t, size_t)); -extern void *xrealloc __P((void *, size_t)); -extern char *xstrdup __P((const char *)); -extern void nomem __P((void)); +extern void *xmalloc(size_t); +extern void *xcalloc(size_t, size_t); +extern void *xrealloc(void *, size_t); +extern char *xstrdup(const char *); +extern void nomem(void); /* * emit.c */ extern ob_t ob; -extern void outopen __P((const char *)); -extern void outclose __P((void)); -extern void outclr __P((void)); -extern void outchar __P((int)); -extern void outqchar __P((int)); -extern void outstrg __P((const char *)); -extern void outint __P((int)); -extern void outname __P((const char *)); -extern void outsrc __P((const char *)); +extern void outopen(const char *); +extern void outclose(void); +extern void outclr(void); +extern void outchar(int); +extern void outqchar(int); +extern void outstrg(const char *); +extern void outint(int); +extern void outname(const char *); +extern void outsrc(const char *); diff --git a/usr.bin/xlint/lint1/externs1.h b/usr.bin/xlint/lint1/externs1.h index 8bf14ddaed..74d4e27bc1 100644 --- a/usr.bin/xlint/lint1/externs1.h +++ b/usr.bin/xlint/lint1/externs1.h @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.bin/xlint/lint1/externs1.h,v 1.1.1.1.8.1 2001/07/19 01:28:12 kris Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/externs1.h,v 1.2 2003/06/17 04:29:34 dillon Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/externs1.h,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ /* @@ -54,7 +54,7 @@ extern int vflag; extern int yflag; extern int zflag; -extern void norecover __P((void)); +extern void norecover(void); /* * cgram.y @@ -63,8 +63,8 @@ extern int blklev; extern int mblklev; extern int yydebug; -extern int yyerror __P((char *)); -extern int yyparse __P((void)); +extern int yyerror(char *); +extern int yyparse(void); /* * scan.l @@ -75,39 +75,39 @@ extern symt_t symtyp; extern FILE *yyin; extern u_quad_t qbmasks[], qlmasks[], qumasks[]; -extern void initscan __P((void)); -extern int sign __P((quad_t, tspec_t, int)); -extern int msb __P((quad_t, tspec_t, int)); -extern quad_t xsign __P((quad_t, tspec_t, int)); -extern void clrwflgs __P((void)); -extern sym_t *getsym __P((sbuf_t *)); -extern void cleanup __P((void)); -extern sym_t *pushdown __P((sym_t *)); -extern void rmsym __P((sym_t *)); -extern void rmsyms __P((sym_t *)); -extern void inssym __P((int, sym_t *)); -extern void freeyyv __P((void *, int)); -extern int yylex __P((void)); +extern void initscan(void); +extern int sign(quad_t, tspec_t, int); +extern int msb(quad_t, tspec_t, int); +extern quad_t xsign(quad_t, tspec_t, int); +extern void clrwflgs(void); +extern sym_t *getsym(sbuf_t *); +extern void cleanup(void); +extern sym_t *pushdown(sym_t *); +extern void rmsym(sym_t *); +extern void rmsyms(sym_t *); +extern void inssym(int, sym_t *); +extern void freeyyv(void *, int); +extern int yylex(void); /* * mem1.c */ -extern const char *fnalloc __P((const char *)); -extern const char *fnnalloc __P((const char *, size_t)); -extern int getfnid __P((const char *)); +extern const char *fnalloc(const char *); +extern const char *fnnalloc(const char *, size_t); +extern int getfnid(const char *); -extern void initmem __P((void)); +extern void initmem(void); -extern void *getblk __P((size_t)); -extern void *getlblk __P((int, size_t)); -extern void freeblk __P((void)); -extern void freelblk __P((int)); +extern void *getblk(size_t); +extern void *getlblk(int, size_t); +extern void freeblk(void); +extern void freelblk(int); -extern void *tgetblk __P((size_t)); -extern tnode_t *getnode __P((void)); -extern void tfreeblk __P((void)); -extern struct mbl *tsave __P((void)); -extern void trestor __P((struct mbl *)); +extern void *tgetblk(size_t); +extern tnode_t *getnode(void); +extern void tfreeblk(void); +extern struct mbl *tsave(void); +extern void trestor(struct mbl *); /* * err.c @@ -116,11 +116,11 @@ extern int nerr; extern int sytxerr; extern const char *msgs[]; -extern void error __P((int, ...)); -extern void warning __P((int, ...)); -extern void message __P((int, ...)); -extern int gnuism __P((int, ...)); -extern void lerror __P((const char *, ...)) __printflike(1, 2); +extern void error(int, ...); +extern void warning(int, ...); +extern void message(int, ...); +extern int gnuism(int, ...); +extern void lerror(const char *, ...) __printflike(1, 2); /* * decl.c @@ -129,82 +129,82 @@ extern dinfo_t *dcs; extern const char *unnamed; extern int enumval; -extern void initdecl __P((void)); -extern type_t *gettyp __P((tspec_t)); -extern type_t *duptyp __P((const type_t *)); -extern type_t *tduptyp __P((const type_t *)); -extern int incompl __P((type_t *)); -extern void setcompl __P((type_t *, int)); -extern void addscl __P((scl_t)); -extern void addtype __P((type_t *)); -extern void addqual __P((tqual_t)); -extern void pushdecl __P((scl_t)); -extern void popdecl __P((void)); -extern void setasm __P((void)); -extern void clrtyp __P((void)); -extern void deftyp __P((void)); -extern int length __P((type_t *, const char *)); -extern int getbound __P((type_t *)); -extern sym_t *lnklst __P((sym_t *, sym_t *)); -extern void chktyp __P((sym_t *)); -extern sym_t *decl1str __P((sym_t *)); -extern sym_t *bitfield __P((sym_t *, int)); -extern pqinf_t *mergepq __P((pqinf_t *, pqinf_t *)); -extern sym_t *addptr __P((sym_t *, pqinf_t *)); -extern sym_t *addarray __P((sym_t *, int, int)); -extern sym_t *addfunc __P((sym_t *, sym_t *)); -extern void chkfdef __P((sym_t *, int)); -extern sym_t *dname __P((sym_t *)); -extern sym_t *iname __P((sym_t *)); -extern type_t *mktag __P((sym_t *, tspec_t, int, int)); -extern const char *scltoa __P((scl_t)); -extern type_t *compltag __P((type_t *, sym_t *)); -extern sym_t *ename __P((sym_t *, int, int)); -extern void decl1ext __P((sym_t *, int)); -extern void cpuinfo __P((sym_t *, sym_t *)); -extern int isredec __P((sym_t *, int *)); -extern int eqtype __P((type_t *, type_t *, int, int, int *)); -extern void compltyp __P((sym_t *, sym_t *)); -extern sym_t *decl1arg __P((sym_t *, int)); -extern void cluparg __P((void)); -extern void decl1loc __P((sym_t *, int)); -extern sym_t *aname __P((void)); -extern void globclup __P((void)); -extern sym_t *decl1abs __P((sym_t *)); -extern void chksz __P((sym_t *)); -extern void setsflg __P((sym_t *)); -extern void setuflg __P((sym_t *, int, int)); -extern void chkusage __P((dinfo_t *)); -extern void chkusg1 __P((int, sym_t *)); -extern void chkglsyms __P((void)); -extern void prevdecl __P((int, sym_t *)); +extern void initdecl(void); +extern type_t *gettyp(tspec_t); +extern type_t *duptyp(const type_t *); +extern type_t *tduptyp(const type_t *); +extern int incompl(type_t *); +extern void setcompl(type_t *, int); +extern void addscl(scl_t); +extern void addtype(type_t *); +extern void addqual(tqual_t); +extern void pushdecl(scl_t); +extern void popdecl(void); +extern void setasm(void); +extern void clrtyp(void); +extern void deftyp(void); +extern int length(type_t *, const char *); +extern int getbound(type_t *); +extern sym_t *lnklst(sym_t *, sym_t *); +extern void chktyp(sym_t *); +extern sym_t *decl1str(sym_t *); +extern sym_t *bitfield(sym_t *, int); +extern pqinf_t *mergepq(pqinf_t *, pqinf_t *); +extern sym_t *addptr(sym_t *, pqinf_t *); +extern sym_t *addarray(sym_t *, int, int); +extern sym_t *addfunc(sym_t *, sym_t *); +extern void chkfdef(sym_t *, int); +extern sym_t *dname(sym_t *); +extern sym_t *iname(sym_t *); +extern type_t *mktag(sym_t *, tspec_t, int, int); +extern const char *scltoa(scl_t); +extern type_t *compltag(type_t *, sym_t *); +extern sym_t *ename(sym_t *, int, int); +extern void decl1ext(sym_t *, int); +extern void cpuinfo(sym_t *, sym_t *); +extern int isredec(sym_t *, int *); +extern int eqtype(type_t *, type_t *, int, int, int *); +extern void compltyp(sym_t *, sym_t *); +extern sym_t *decl1arg(sym_t *, int); +extern void cluparg(void); +extern void decl1loc(sym_t *, int); +extern sym_t *aname(void); +extern void globclup(void); +extern sym_t *decl1abs(sym_t *); +extern void chksz(sym_t *); +extern void setsflg(sym_t *); +extern void setuflg(sym_t *, int, int); +extern void chkusage(dinfo_t *); +extern void chkusg1(int, sym_t *); +extern void chkglsyms(void); +extern void prevdecl(int, sym_t *); /* * tree.c */ -extern void initmtab __P((void)); -extern type_t *incref __P((type_t *, tspec_t)); -extern type_t *tincref __P((type_t *, tspec_t)); -extern tnode_t *getcnode __P((type_t *, val_t *)); -extern tnode_t *getnnode __P((sym_t *, int)); -extern tnode_t *getsnode __P((strg_t *)); -extern sym_t *strmemb __P((tnode_t *, op_t, sym_t *)); -extern tnode_t *build __P((op_t, tnode_t *, tnode_t *)); -extern tnode_t *cconv __P((tnode_t *)); -extern int typeok __P((op_t, int, tnode_t *, tnode_t *)); -extern tnode_t *promote __P((op_t, int, tnode_t *)); -extern tnode_t *convert __P((op_t, int, type_t *, tnode_t *)); -extern void cvtcon __P((op_t, int, type_t *, val_t *, val_t *)); -extern const char *tyname __P((type_t *)); -extern tnode_t *bldszof __P((type_t *)); -extern tnode_t *cast __P((tnode_t *, type_t *)); -extern tnode_t *funcarg __P((tnode_t *, tnode_t *)); -extern tnode_t *funccall __P((tnode_t *, tnode_t *)); -extern val_t *constant __P((tnode_t *)); -extern void expr __P((tnode_t *, int, int)); -extern void chkmisc __P((tnode_t *, int, int, int, int, int, int)); -extern int conaddr __P((tnode_t *, sym_t **, ptrdiff_t *)); -extern strg_t *catstrg __P((strg_t *, strg_t *)); +extern void initmtab(void); +extern type_t *incref(type_t *, tspec_t); +extern type_t *tincref(type_t *, tspec_t); +extern tnode_t *getcnode(type_t *, val_t *); +extern tnode_t *getnnode(sym_t *, int); +extern tnode_t *getsnode(strg_t *); +extern sym_t *strmemb(tnode_t *, op_t, sym_t *); +extern tnode_t *build(op_t, tnode_t *, tnode_t *); +extern tnode_t *cconv(tnode_t *); +extern int typeok(op_t, int, tnode_t *, tnode_t *); +extern tnode_t *promote(op_t, int, tnode_t *); +extern tnode_t *convert(op_t, int, type_t *, tnode_t *); +extern void cvtcon(op_t, int, type_t *, val_t *, val_t *); +extern const char *tyname(type_t *); +extern tnode_t *bldszof(type_t *); +extern tnode_t *cast(tnode_t *, type_t *); +extern tnode_t *funcarg(tnode_t *, tnode_t *); +extern tnode_t *funccall(tnode_t *, tnode_t *); +extern val_t *constant(tnode_t *); +extern void expr(tnode_t *, int, int); +extern void chkmisc(tnode_t *, int, int, int, int, int, int); +extern int conaddr(tnode_t *, sym_t **, ptrdiff_t *); +extern strg_t *catstrg(strg_t *, strg_t *); /* * func.c @@ -227,39 +227,39 @@ extern int nowarn; extern int plibflg; extern int quadflg; -extern void pushctrl __P((int)); -extern void popctrl __P((int)); -extern void chkreach __P((void)); -extern void funcdef __P((sym_t *)); -extern void funcend __P((void)); -extern void label __P((int, sym_t *, tnode_t *)); -extern void if1 __P((tnode_t *)); -extern void if2 __P((void)); -extern void if3 __P((int)); -extern void switch1 __P((tnode_t *)); -extern void switch2 __P((void)); -extern void while1 __P((tnode_t *)); -extern void while2 __P((void)); -extern void do1 __P((void)); -extern void do2 __P((tnode_t *)); -extern void for1 __P((tnode_t *, tnode_t *, tnode_t *)); -extern void for2 __P((void)); -extern void dogoto __P((sym_t *)); -extern void docont __P((void)); -extern void dobreak __P((void)); -extern void doreturn __P((tnode_t *)); -extern void glclup __P((int)); -extern void argsused __P((int)); -extern void constcond __P((int)); -extern void fallthru __P((int)); -extern void notreach __P((int)); -extern void lintlib __P((int)); -extern void linted __P((int)); -extern void varargs __P((int)); -extern void printflike __P((int)); -extern void scanflike __P((int)); -extern void protolib __P((int)); -extern void longlong __P((int)); +extern void pushctrl(int); +extern void popctrl(int); +extern void chkreach(void); +extern void funcdef(sym_t *); +extern void funcend(void); +extern void label(int, sym_t *, tnode_t *); +extern void if1(tnode_t *); +extern void if2(void); +extern void if3(int); +extern void switch1(tnode_t *); +extern void switch2(void); +extern void while1(tnode_t *); +extern void while2(void); +extern void do1(void); +extern void do2(tnode_t *); +extern void for1(tnode_t *, tnode_t *, tnode_t *); +extern void for2(void); +extern void dogoto(sym_t *); +extern void docont(void); +extern void dobreak(void); +extern void doreturn(tnode_t *); +extern void glclup(int); +extern void argsused(int); +extern void constcond(int); +extern void fallthru(int); +extern void notreach(int); +extern void lintlib(int); +extern void linted(int); +extern void varargs(int); +extern void printflike(int); +extern void scanflike(int); +extern void protolib(int); +extern void longlong(int); /* * init.c @@ -268,17 +268,17 @@ extern int initerr; extern sym_t *initsym; extern int startinit; -extern void prepinit __P((void)); -extern void initrbr __P((void)); -extern void initlbr __P((void)); -extern void mkinit __P((tnode_t *)); +extern void prepinit(void); +extern void initrbr(void); +extern void initlbr(void); +extern void mkinit(tnode_t *); /* * emit.c */ -extern void outtype __P((type_t *)); -extern const char *ttos __P((type_t *)); -extern void outsym __P((sym_t *, scl_t, def_t)); -extern void outfdef __P((sym_t *, pos_t *, int, int, sym_t *)); -extern void outcall __P((tnode_t *, int, int)); -extern void outusg __P((sym_t *)); +extern void outtype(type_t *); +extern const char *ttos(type_t *); +extern void outsym(sym_t *, scl_t, def_t); +extern void outfdef(sym_t *, pos_t *, int, int, sym_t *); +extern void outcall(tnode_t *, int, int); +extern void outusg(sym_t *); diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c index 6347f6ac55..15e4f936c4 100644 --- a/usr.bin/xlint/lint1/init.c +++ b/usr.bin/xlint/lint1/init.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: init.c,v 1.4 1995/10/02 17:21:37 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/init.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/init.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -52,12 +52,12 @@ sym_t *initsym; istk_t *initstk; -static void popi2 __P((void)); -static void popinit __P((int)); -static void pushinit __P((void)); -static void testinit __P((void)); -static void nextinit __P((int)); -static int strginit __P((tnode_t *)); +static void popi2(void); +static void popinit(int); +static void pushinit(void); +static void testinit(void); +static void nextinit(int); +static int strginit(tnode_t *); /* diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c index f2e074ea97..bf9595aec0 100644 --- a/usr.bin/xlint/lint1/main1.c +++ b/usr.bin/xlint/lint1/main1.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: main1.c,v 1.3 1995/10/02 17:29:56 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/main1.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/main1.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -103,7 +103,7 @@ int vflag = 1; /* Complain about structures which are never defined. */ int zflag = 1; -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c index f8c8e074b6..5910c7f627 100644 --- a/usr.bin/xlint/lint1/mem1.c +++ b/usr.bin/xlint/lint1/mem1.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: mem1.c,v 1.2 1995/07/03 21:24:25 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/mem1.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/mem1.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -56,7 +56,7 @@ typedef struct fn { static fn_t *fnames; -static fn_t *srchfn __P((const char *, size_t)); +static fn_t *srchfn(const char *, size_t); /* * Look for a Filename of length l. @@ -162,9 +162,9 @@ static mbl_t *frmblks; /* length of new allocated memory blocks */ static size_t mblklen; -static void *xgetblk __P((mbl_t **, size_t)); -static void xfreeblk __P((mbl_t **)); -static mbl_t *xnewblk __P((void)); +static void *xgetblk(mbl_t **, size_t); +static void xfreeblk(mbl_t **); +static mbl_t *xnewblk(void); static mbl_t * xnewblk() diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l index 12cf8e44e5..5252df4de4 100644 --- a/usr.bin/xlint/lint1/scan.l +++ b/usr.bin/xlint/lint1/scan.l @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/scan.l,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/scan.l,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -58,25 +58,25 @@ pos_t curr_pos = { 1, "" }; */ pos_t csrc_pos = { 1, "" }; -static void incline __P((void)); -static void badchar __P((int)); -static sbuf_t *allocsb __P((void)); -static void freesb __P((sbuf_t *)); -static int inpc __P((void)); -static int hash __P((const char *)); -static sym_t *search __P((sbuf_t *)); -static int name __P((void)); -static int keyw __P((sym_t *)); -static int icon __P((int)); -static int fcon __P((void)); -static int operator __P((int, op_t)); -static int ccon __P((void)); -static int wccon __P((void)); -static int getescc __P((int)); -static void directive __P((void)); -static void comment __P((void)); -static int string __P((void)); -static int wcstrg __P((void)); +static void incline(void); +static void badchar(int); +static sbuf_t *allocsb(void); +static void freesb(sbuf_t *); +static int inpc(void); +static int hash(const char *); +static sym_t *search(sbuf_t *); +static int name(void); +static int keyw(sym_t *); +static int icon(int); +static int fcon(void); +static int operator(int, op_t); +static int ccon(void); +static int wccon(void); +static int getescc(int); +static void directive(void); +static void comment(void); +static int string(void); +static int wcstrg(void); %} @@ -1005,7 +1005,7 @@ comment() static struct { const char *keywd; int arg; - void (*func) __P((int)); + void (*func)(int); } keywtab[] = { { "ARGSUSED", 1, argsused }, { "CONSTCOND", 0, constcond }, diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c index 501e5af295..40161ed5cd 100644 --- a/usr.bin/xlint/lint1/tree.c +++ b/usr.bin/xlint/lint1/tree.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $ - * $DragonFly: src/usr.bin/xlint/lint1/tree.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint1/tree.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -46,40 +46,40 @@ /* Various flags for each operator. */ static mod_t modtab[NOPS]; -static tnode_t *getinode __P((tspec_t, quad_t)); -static void ptrcmpok __P((op_t, tnode_t *, tnode_t *)); -static int asgntypok __P((op_t, int, tnode_t *, tnode_t *)); -static void chkbeop __P((op_t, tnode_t *, tnode_t *)); -static void chkeop2 __P((op_t, int, tnode_t *, tnode_t *)); -static void chkeop1 __P((op_t, int, tnode_t *, tnode_t *)); -static tnode_t *mktnode __P((op_t, type_t *, tnode_t *, tnode_t *)); -static void balance __P((op_t, tnode_t **, tnode_t **)); -static void incompat __P((op_t, tspec_t, tspec_t)); -static void illptrc __P((mod_t *, type_t *, type_t *)); -static void mrgqual __P((type_t **, type_t *, type_t *)); -static int conmemb __P((type_t *)); -static void ptconv __P((int, tspec_t, tspec_t, type_t *, tnode_t *)); -static void iiconv __P((op_t, int, tspec_t, tspec_t, type_t *, tnode_t *)); -static void piconv __P((op_t, tspec_t, type_t *, tnode_t *)); -static void ppconv __P((op_t, tnode_t *, type_t *)); -static tnode_t *bldstr __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *bldincdec __P((op_t, tnode_t *)); -static tnode_t *bldamper __P((tnode_t *, int)); -static tnode_t *bldplmi __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *bldshft __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *bldcol __P((tnode_t *, tnode_t *)); -static tnode_t *bldasgn __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *plength __P((type_t *)); -static tnode_t *fold __P((tnode_t *)); -static tnode_t *foldtst __P((tnode_t *)); -static tnode_t *foldflt __P((tnode_t *)); -static tnode_t *chkfarg __P((type_t *, tnode_t *)); -static tnode_t *parg __P((int, type_t *, tnode_t *)); -static void nulleff __P((tnode_t *)); -static void displexpr __P((tnode_t *, int)); -static void chkaidx __P((tnode_t *, int)); -static void chkcomp __P((op_t, tnode_t *, tnode_t *)); -static void precconf __P((tnode_t *)); +static tnode_t *getinode(tspec_t, quad_t); +static void ptrcmpok(op_t, tnode_t *, tnode_t *); +static int asgntypok(op_t, int, tnode_t *, tnode_t *); +static void chkbeop(op_t, tnode_t *, tnode_t *); +static void chkeop2(op_t, int, tnode_t *, tnode_t *); +static void chkeop1(op_t, int, tnode_t *, tnode_t *); +static tnode_t *mktnode(op_t, type_t *, tnode_t *, tnode_t *); +static void balance(op_t, tnode_t **, tnode_t **); +static void incompat(op_t, tspec_t, tspec_t); +static void illptrc(mod_t *, type_t *, type_t *); +static void mrgqual(type_t **, type_t *, type_t *); +static int conmemb(type_t *); +static void ptconv(int, tspec_t, tspec_t, type_t *, tnode_t *); +static void iiconv(op_t, int, tspec_t, tspec_t, type_t *, tnode_t *); +static void piconv(op_t, tspec_t, type_t *, tnode_t *); +static void ppconv(op_t, tnode_t *, type_t *); +static tnode_t *bldstr(op_t, tnode_t *, tnode_t *); +static tnode_t *bldincdec(op_t, tnode_t *); +static tnode_t *bldamper(tnode_t *, int); +static tnode_t *bldplmi(op_t, tnode_t *, tnode_t *); +static tnode_t *bldshft(op_t, tnode_t *, tnode_t *); +static tnode_t *bldcol(tnode_t *, tnode_t *); +static tnode_t *bldasgn(op_t, tnode_t *, tnode_t *); +static tnode_t *plength(type_t *); +static tnode_t *fold(tnode_t *); +static tnode_t *foldtst(tnode_t *); +static tnode_t *foldflt(tnode_t *); +static tnode_t *chkfarg(type_t *, tnode_t *); +static tnode_t *parg(int, type_t *, tnode_t *); +static void nulleff(tnode_t *); +static void displexpr(tnode_t *, int); +static void chkaidx(tnode_t *, int); +static void chkcomp(op_t, tnode_t *, tnode_t *); +static void precconf(tnode_t *); /* * Initialize mods of operators. diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c index 675c333e88..ae072e0853 100644 --- a/usr.bin/xlint/lint2/chk.c +++ b/usr.bin/xlint/lint2/chk.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: chk.c,v 1.2 1995/07/03 21:24:42 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint2/chk.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/chk.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -45,28 +45,28 @@ ttab_t ttab[NTSPEC]; -static void chkund __P((hte_t *)); -static void chkdnu __P((hte_t *)); -static void chkdnud __P((hte_t *)); -static void chkmd __P((hte_t *)); -static void chkvtui __P((hte_t *, sym_t *, sym_t *)); -static void chkvtdi __P((hte_t *, sym_t *, sym_t *)); -static void chkfaui __P((hte_t *, sym_t *, sym_t *)); +static void chkund(hte_t *); +static void chkdnu(hte_t *); +static void chkdnud(hte_t *); +static void chkmd(hte_t *); +static void chkvtui(hte_t *, sym_t *, sym_t *); +static void chkvtdi(hte_t *, sym_t *, sym_t *); +static void chkfaui(hte_t *, sym_t *, sym_t *); static void chkau __P((hte_t *, int, sym_t *, sym_t *, pos_t *, fcall_t *, fcall_t *, type_t *, type_t *)); -static void chkrvu __P((hte_t *, sym_t *)); -static void chkadecl __P((hte_t *, sym_t *, sym_t *)); +static void chkrvu(hte_t *, sym_t *); +static void chkadecl(hte_t *, sym_t *, sym_t *); static void printflike __P((hte_t *,fcall_t *, int, const char *, type_t **)); static void scanflike __P((hte_t *, fcall_t *, int, const char *, type_t **)); -static void badfmt __P((hte_t *, fcall_t *)); -static void inconarg __P((hte_t *, fcall_t *, int)); -static void tofewarg __P((hte_t *, fcall_t *)); -static void tomanyarg __P((hte_t *, fcall_t *)); -static int eqtype __P((type_t *, type_t *, int, int, int, int *)); -static int eqargs __P((type_t *, type_t *, int *)); -static int mnoarg __P((type_t *, int *)); +static void badfmt(hte_t *, fcall_t *); +static void inconarg(hte_t *, fcall_t *, int); +static void tofewarg(hte_t *, fcall_t *); +static void tomanyarg(hte_t *, fcall_t *); +static int eqtype(type_t *, type_t *, int, int, int, int *); +static int eqargs(type_t *, type_t *, int *); +static int mnoarg(type_t *, int *); void diff --git a/usr.bin/xlint/lint2/emit2.c b/usr.bin/xlint/lint2/emit2.c index f4036ac831..349a1d4db6 100644 --- a/usr.bin/xlint/lint2/emit2.c +++ b/usr.bin/xlint/lint2/emit2.c @@ -31,16 +31,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: emit2.c,v 1.2 1995/07/03 21:24:44 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint2/emit2.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/emit2.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include #include "lint2.h" -static void outtype __P((type_t *)); -static void outdef __P((hte_t *, sym_t *)); -static void dumpname __P((hte_t *)); +static void outtype(type_t *); +static void outdef(hte_t *, sym_t *); +static void dumpname(hte_t *); /* * Write type into the output buffer. diff --git a/usr.bin/xlint/lint2/externs2.h b/usr.bin/xlint/lint2/externs2.h index 531acb8588..9ea8d86f5c 100644 --- a/usr.bin/xlint/lint2/externs2.h +++ b/usr.bin/xlint/lint2/externs2.h @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $DragonFly: src/usr.bin/xlint/lint2/externs2.h,v 1.2 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/externs2.h,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ /* @@ -51,9 +51,9 @@ extern int Fflag; /* * hash.c */ -extern void inithash __P((void)); -extern hte_t *hsearch __P((const char *, int)); -extern void forall __P((void (*)(hte_t *))); +extern void inithash(void); +extern hte_t *hsearch(const char *, int); +extern void forall(void (*)(hte_t *)); /* * read.c @@ -61,29 +61,29 @@ extern void forall __P((void (*)(hte_t *))); extern const char **fnames; extern type_t **tlst; -extern void readfile __P((const char *)); -extern void mkstatic __P((hte_t *)); +extern void readfile(const char *); +extern void mkstatic(hte_t *); /* * mem2.c */ -extern void initmem __P((void)); -extern void *xalloc __P((size_t)); +extern void initmem(void); +extern void *xalloc(size_t); /* * chk.c */ -extern void inittyp __P((void)); -extern void mainused __P((void)); -extern void chkname __P((hte_t *)); +extern void inittyp(void); +extern void mainused(void); +extern void chkname(hte_t *); /* * msg.c */ -extern void msg __P((int, ...)); -extern const char *mkpos __P((pos_t *)); +extern void msg(int, ...); +extern const char *mkpos(pos_t *); /* * emit2.c */ -extern void outlib __P((const char *)); +extern void outlib(const char *); diff --git a/usr.bin/xlint/lint2/hash.c b/usr.bin/xlint/lint2/hash.c index 48cc2f4deb..8281a20ad6 100644 --- a/usr.bin/xlint/lint2/hash.c +++ b/usr.bin/xlint/lint2/hash.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: hash.c,v 1.2 1995/07/03 21:24:47 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint2/hash.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/hash.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ /* pointer to hash table, initialized in inithash() */ static hte_t **htab; -static int hash __P((const char *)); +static int hash(const char *); /* * Initialize hash table. @@ -110,7 +110,7 @@ hsearch(s, mknew) */ void forall(f) - void (*f) __P((hte_t *)); + void (*f)(hte_t *); { int i; hte_t *hte; diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c index 1a404ffeba..4b526df191 100644 --- a/usr.bin/xlint/lint2/main2.c +++ b/usr.bin/xlint/lint2/main2.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: main2.c,v 1.2 1995/07/03 21:24:53 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint2/main2.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/main2.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -82,7 +82,7 @@ int Fflag; */ const char **libs; -static void usage __P((void)); +static void usage(void); int diff --git a/usr.bin/xlint/lint2/msg.c b/usr.bin/xlint/lint2/msg.c index 3bfd5cebba..9323a0ad6c 100644 --- a/usr.bin/xlint/lint2/msg.c +++ b/usr.bin/xlint/lint2/msg.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: msg.c,v 1.2 1995/07/03 21:24:56 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint2/msg.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/msg.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -67,7 +67,7 @@ static const char *msgs[] = { "%s function value must be declared before use \t%s :: %s",/* 17 */ }; -static const char *basename __P((const char *)); +static const char *basename(const char *); #ifdef __STDC__ void diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c index 9e47c40f45..95b1a8cc03 100644 --- a/usr.bin/xlint/lint2/read.c +++ b/usr.bin/xlint/lint2/read.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: read.c,v 1.2 1995/07/03 21:24:59 cgd Exp $ - * $DragonFly: src/usr.bin/xlint/lint2/read.c,v 1.3 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.bin/xlint/lint2/read.c,v 1.4 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -81,20 +81,20 @@ static size_t tlstlen; /* length of tlst */ static int csrcfile; -static void inperr __P((void)); -static void setsrc __P((const char *)); -static void setfnid __P((int, const char *)); -static void funccall __P((pos_t *, const char *)); -static void decldef __P((pos_t *, const char *)); -static void usedsym __P((pos_t *, const char *)); -static u_short inptype __P((const char *, const char **)); -static int gettlen __P((const char *, const char **)); -static u_short findtype __P((const char *, size_t, int)); -static u_short storetyp __P((type_t *, const char *, size_t, int)); -static int thash __P((const char *, size_t)); -static char *inpqstrg __P((const char *, const char **)); -static const char *inpname __P((const char *, const char **)); -static int getfnidx __P((const char *)); +static void inperr(void); +static void setsrc(const char *); +static void setfnid(int, const char *); +static void funccall(pos_t *, const char *); +static void decldef(pos_t *, const char *); +static void usedsym(pos_t *, const char *); +static u_short inptype(const char *, const char **); +static int gettlen(const char *, const char **); +static u_short findtype(const char *, size_t, int); +static u_short storetyp(type_t *, const char *, size_t, int); +static int thash(const char *, size_t); +static char *inpqstrg(const char *, const char **); +static const char *inpname(const char *, const char **); +static int getfnidx(const char *); void readfile(name) diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c index 5168958b8e..c9a3684ca1 100644 --- a/usr.bin/xlint/xlint/xlint.c +++ b/usr.bin/xlint/xlint/xlint.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.bin/xlint/xlint/xlint.c,v 1.8 2000/01/14 09:25:31 sheldonh Exp $ - * $DragonFly: src/usr.bin/xlint/xlint/xlint.c,v 1.2 2003/06/17 04:29:34 dillon Exp $ + * $DragonFly: src/usr.bin/xlint/xlint/xlint.c,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -109,22 +109,22 @@ static int first = 1; static const char *currfn; -static void appstrg __P((char ***, char *)); -static void appcstrg __P((char ***, const char *)); -static void applst __P((char ***, char *const *)); -static void freelst __P((char ***)); -static char *concat2 __P((const char *, const char *)); -static char *concat3 __P((const char *, const char *, const char *)); -static void terminate __P((int)); -static const char *basename __P((const char *, int)); -static void appdef __P((char ***, const char *)); -static void usage __P((void)); -static void fname __P((const char *, int)); -static void runchild __P((const char *, char *const *, const char *)); -static void findlibs __P((char *const *)); -static int rdok __P((const char *)); -static void lint2 __P((void)); -static void cat __P((char *const *, const char *)); +static void appstrg(char ***, char *); +static void appcstrg(char ***, const char *); +static void applst(char ***, char *const *); +static void freelst(char ***); +static char *concat2(const char *, const char *); +static char *concat3(const char *, const char *, const char *); +static void terminate(int); +static const char *basename(const char *, int); +static void appdef(char ***, const char *); +static void usage(void); +static void fname(const char *, int); +static void runchild(const char *, char *const *, const char *); +static void findlibs(char *const *); +static int rdok(const char *); +static void lint2(void); +static void cat(char *const *, const char *); /* * Some functions to deal with lists of strings. diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h index 0ced2643f9..8271a783aa 100644 --- a/usr.bin/yacc/defs.h +++ b/usr.bin/yacc/defs.h @@ -35,7 +35,7 @@ * * @(#)defs.h 5.6 (Berkeley) 5/24/93 * $FreeBSD: src/usr.bin/yacc/defs.h,v 1.8.2.1 2001/10/05 03:00:19 obrien Exp $ - * $DragonFly: src/usr.bin/yacc/defs.h,v 1.2 2003/06/17 04:29:34 dillon Exp $ + * $DragonFly: src/usr.bin/yacc/defs.h,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ #include /* for __P macro */ @@ -313,53 +313,53 @@ extern short final_state; /* global functions */ -char *allocate __P((unsigned)); -void closure __P((short *, int)); -void create_symbol_table __P((void)); -void default_action_warning __P((void)); -void dollar_error __P((int, char *, char *)); -void dollar_warning __P((int, int)); -void done __P((int)); -void fatal __P((char *msg)); -void finalize_closure __P((void)); -void free_parser __P((void)); -void free_symbols __P((void)); -void free_symbol_table __P((void)); -void illegal_character __P((char *)); -void illegal_tag __P((int, char *, char *)); -void lalr __P((void)); -bucket *lookup __P((char *)); -void lr0 __P((void)); -bucket *make_bucket __P((char *)); -void make_parser __P((void)); -void no_grammar __P((void)); -void no_space __P((void)); -void open_error __P((char *)); -void output __P((void)); -void over_unionized __P((char *)); -void prec_redeclared __P((void)); -void reader __P((void)); -void reflexive_transitive_closure __P((unsigned *, int)); -void reprec_warning __P((char *)); -void restarted_warning __P((void)); -void retyped_warning __P((char *)); -void revalued_warning __P((char *)); -void set_first_derives __P((void)); -void syntax_error __P((int, char *, char *)); -void terminal_lhs __P((int)); -void terminal_start __P((char *)); -void tokenized_start __P((char *)); -void undefined_goal __P((char *)); -void undefined_symbol_warning __P((char *)); -void unexpected_EOF __P((void)); -void unknown_rhs __P((int)); -void unterminated_action __P((int, char *, char *)); -void unterminated_comment __P((int, char *, char *)); -void unterminated_string __P((int, char *, char *)); -void unterminated_text __P((int, char *, char *)); -void unterminated_union __P((int, char *, char *)); -void untyped_lhs __P((void)); -void untyped_rhs __P((int, char *)); -void used_reserved __P((char *)); -void verbose __P((void)); -void write_section __P((char **)); +char *allocate(unsigned); +void closure(short *, int); +void create_symbol_table(void); +void default_action_warning(void); +void dollar_error(int, char *, char *); +void dollar_warning(int, int); +void done(int); +void fatal(char *msg); +void finalize_closure(void); +void free_parser(void); +void free_symbols(void); +void free_symbol_table(void); +void illegal_character(char *); +void illegal_tag(int, char *, char *); +void lalr(void); +bucket *lookup(char *); +void lr0(void); +bucket *make_bucket(char *); +void make_parser(void); +void no_grammar(void); +void no_space(void); +void open_error(char *); +void output(void); +void over_unionized(char *); +void prec_redeclared(void); +void reader(void); +void reflexive_transitive_closure(unsigned *, int); +void reprec_warning(char *); +void restarted_warning(void); +void retyped_warning(char *); +void revalued_warning(char *); +void set_first_derives(void); +void syntax_error(int, char *, char *); +void terminal_lhs(int); +void terminal_start(char *); +void tokenized_start(char *); +void undefined_goal(char *); +void undefined_symbol_warning(char *); +void unexpected_EOF(void); +void unknown_rhs(int); +void unterminated_action(int, char *, char *); +void unterminated_comment(int, char *, char *); +void unterminated_string(int, char *, char *); +void unterminated_text(int, char *, char *); +void unterminated_union(int, char *, char *); +void untyped_lhs(void); +void untyped_rhs(int, char *); +void used_reserved(char *); +void verbose(void); +void write_section(char **); diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 28d413278c..e8d40c4c65 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -13,7 +13,7 @@ * other than his own. * * $FreeBSD: src/usr.sbin/ac/ac.c,v 1.14.2.2 2002/03/12 19:55:04 phantom Exp $ - * $DragonFly: src/usr.sbin/ac/ac.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/ac/ac.c,v 1.3 2003/11/03 19:31:34 eirikn Exp $ */ #include @@ -81,20 +81,20 @@ static struct tty_list *Ttys = NULL; static int Debug = 0; #endif -int main __P((int, char **)); -int ac __P((FILE *)); -struct tty_list *add_tty __P((char *)); -int do_tty __P((char *)); -FILE *file __P((char *)); -struct utmp_list *log_in __P((struct utmp_list *, struct utmp *)); -struct utmp_list *log_out __P((struct utmp_list *, struct utmp *)); -int on_console __P((struct utmp_list *)); -void show __P((char *, time_t)); +int main(int, char **); +int ac(FILE *); +struct tty_list *add_tty(char *); +int do_tty(char *); +FILE *file(char *); +struct utmp_list *log_in(struct utmp_list *, struct utmp *); +struct utmp_list *log_out(struct utmp_list *, struct utmp *); +int on_console(struct utmp_list *); +void show(char *, time_t); void show_today __P((struct user_list *, struct utmp_list *, time_t)); -void show_users __P((struct user_list *)); -struct user_list *update_user __P((struct user_list *, char *, time_t)); -void usage __P((void)); +void show_users(struct user_list *); +struct user_list *update_user(struct user_list *, char *, time_t); +void usage(void); /* * open wtmp or die diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c index 87d721730a..7f44f84acc 100644 --- a/usr.sbin/accton/accton.c +++ b/usr.sbin/accton/accton.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)accton.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/accton/accton.c,v 1.5 1999/08/28 01:15:10 peter Exp $ - * $DragonFly: src/usr.sbin/accton/accton.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/accton/accton.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include #include -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c index 96d96d4f52..699239efa2 100644 --- a/usr.sbin/ancontrol/ancontrol.c +++ b/usr.sbin/ancontrol/ancontrol.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.9 2003/02/01 03:25:13 ambrisko Exp $ - * $DragonFly: src/usr.sbin/ancontrol/ancontrol.c,v 1.3 2003/08/08 04:18:44 dillon Exp $ + * $DragonFly: src/usr.sbin/ancontrol/ancontrol.c,v 1.4 2003/11/03 19:31:35 eirikn Exp $ * * @(#) Copyright (c) 1997, 1998, 1999 Bill Paul. All rights reserved. * @(#) $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.9 2003/02/01 03:25:13 ambrisko Exp @@ -59,36 +59,36 @@ #include #include -static int an_getval __P((const char *, struct an_req *)); -static void an_setval __P((const char *, struct an_req *)); -static void an_printwords __P((u_int16_t *, int)); -static void an_printspeeds __P((u_int8_t*, int)); -static void an_printbool __P((int)); -static void an_printhex __P((char *, int)); -static void an_printstr __P((char *, int)); -static void an_dumpstatus __P((const char *)); -static void an_dumpstats __P((const char *)); -static void an_dumpconfig __P((const char *)); -static void an_dumpcaps __P((const char *)); -static void an_dumpssid __P((const char *)); -static void an_dumpap __P((const char *)); -static void an_setconfig __P((const char *, int, void *)); -static void an_setssid __P((const char *, int, void *)); -static void an_setap __P((const char *, int, void *)); -static void an_setspeed __P((const char *, int, void *)); -static void an_readkeyinfo __P((const char *)); +static int an_getval (const char *, struct an_req *); +static void an_setval (const char *, struct an_req *); +static void an_printwords(u_int16_t *, int); +static void an_printspeeds(u_int8_t*, int); +static void an_printbool(int); +static void an_printhex (char *, int); +static void an_printstr (char *, int); +static void an_dumpstatus(const char *); +static void an_dumpstats(const char *); +static void an_dumpconfig(const char *); +static void an_dumpcaps (const char *); +static void an_dumpssid (const char *); +static void an_dumpap (const char *); +static void an_setconfig(const char *, int, void *); +static void an_setssid (const char *, int, void *); +static void an_setap (const char *, int, void *); +static void an_setspeed (const char *, int, void *); +static void an_readkeyinfo(const char *); #ifdef ANCACHE -static void an_zerocache __P((const char *)); -static void an_readcache __P((const char *)); +static void an_zerocache(const char *); +static void an_readcache(const char *); #endif -static int an_hex2int __P((char)); -static void an_str2key __P((char *, struct an_ltv_key *)); -static void an_setkeys __P((const char *, char *, int)); -static void an_enable_tx_key __P((const char *, char *)); -static void an_enable_leap_mode __P((const char *, char *)); -static void usage __P((char *)); -static void __P(an_dumprssimap(const char *)); -int main __P((int, char **)); +static int an_hex2int (char); +static void an_str2key (char *, struct an_ltv_key *); +static void an_setkeys (const char *, char *, int); +static void an_enable_tx_key(const char *, char *); +static void an_enable_leap_mode(const char *, char *); +static void usage (char *); +static void an_dumprssimap(const char *); +int main (int, char **); #define ACT_DUMPSTATS 1 #define ACT_DUMPCONFIG 2 diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h index dbd851caee..db688dd274 100644 --- a/usr.sbin/apmd/apmd.h +++ b/usr.sbin/apmd/apmd.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/apmd/apmd.h,v 1.2.2.1 2001/08/13 17:30:30 nsayer Exp $ - * $DragonFly: src/usr.sbin/apmd/apmd.h,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/apmd/apmd.h,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ #define APMD_CONFIGFILE "/etc/apmd.conf" @@ -54,10 +54,10 @@ enum { }; struct event_cmd_op { - int (* act) __P((void *this)); - void (* dump) __P((void *this, FILE * fp)); - struct event_cmd * (* clone) __P((void *this)); - void (* free) __P((void *this)); + int (* act)(void *this); + void (* dump)(void *this, FILE * fp); + struct event_cmd * (* clone)(void *this); + void (* free)(void *this); }; struct event_cmd { struct event_cmd * next; diff --git a/usr.sbin/atm/atmarpd/atmarp_var.h b/usr.sbin/atm/atmarpd/atmarp_var.h index 1264243a91..fdff57ff84 100644 --- a/usr.sbin/atm/atmarpd/atmarp_var.h +++ b/usr.sbin/atm/atmarpd/atmarp_var.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/atmarpd/atmarp_var.h,v 1.3 1999/08/28 01:15:31 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/atmarpd/atmarp_var.h,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/atmarpd/atmarp_var.h,v 1.3 2003/11/03 19:31:35 eirikn Exp $ * */ @@ -181,46 +181,46 @@ extern FILE *atmarp_log_file; */ /* atmarp_config.c */ -extern int atmarp_cfg_netif __P((char *)); +extern int atmarp_cfg_netif(char *); /* atmarp_log.c */ #if __STDC__ -extern void atmarp_log __P((const int, const char *, ...)); +extern void atmarp_log(const int, const char *, ...); #else -extern void atmarp_log __P((int, char *, va_alist)); +extern void atmarp_log(int, char *, va_alist); #endif -extern void atmarp_mem_err __P((char *)); +extern void atmarp_mem_err(char *); /* atmarp_scsp.c */ -extern int atmarp_scsp_cache __P((Atmarp_intf *, Scsp_if_msg *)); -extern int atmarp_scsp_update __P((Atmarp *, int)); -extern int atmarp_scsp_update_in __P((Atmarp_intf *, - Scsp_if_msg *)); -extern int atmarp_scsp_read __P((Atmarp_intf *)); -extern int atmarp_scsp_out __P((Atmarp_intf *, char *, int)); -extern int atmarp_scsp_connect __P((Atmarp_intf *)); -extern void atmarp_scsp_close __P((Atmarp_intf *)); -extern int atmarp_scsp_disconnect __P((Atmarp_intf *)); +extern int atmarp_scsp_cache(Atmarp_intf *, Scsp_if_msg *); +extern int atmarp_scsp_update(Atmarp *, int); +extern int atmarp_scsp_update_in(Atmarp_intf *, + Scsp_if_msg *); +extern int atmarp_scsp_read(Atmarp_intf *); +extern int atmarp_scsp_out(Atmarp_intf *, char *, int); +extern int atmarp_scsp_connect(Atmarp_intf *); +extern void atmarp_scsp_close(Atmarp_intf *); +extern int atmarp_scsp_disconnect(Atmarp_intf *); /* atmarp_subr.c */ -extern Atmarp_intf *atmarp_find_intf_sock __P((int)); -extern Atmarp_intf *atmarp_find_intf_name __P((char *)); -extern void atmarp_clear_marks __P(()); -extern int atmarp_is_server __P((Atmarp_intf *)); -extern int atmarp_if_ready __P((Atmarp_intf *)); -extern Atmarp * atmarp_copy_cache_entry __P((struct air_arp_rsp *)); -extern int atmarp_update_kernel __P((Atmarp *)); -extern void atmarp_get_updated_cache __P(()); -extern void atmarp_process_cache_entry __P((struct air_arp_rsp *)); -extern void print_atmarp_intf __P((FILE *, Atmarp_intf *)); -extern void print_atmarp_cache __P((FILE *, Atmarp *)); -extern void dump_atmarp_cache __P((FILE *, Atmarp_intf *)); -extern void atmarp_sigint __P((int)); +extern Atmarp_intf *atmarp_find_intf_sock(int); +extern Atmarp_intf *atmarp_find_intf_name(char *); +extern void atmarp_clear_marks(); +extern int atmarp_is_server(Atmarp_intf *); +extern int atmarp_if_ready(Atmarp_intf *); +extern Atmarp * atmarp_copy_cache_entry(struct air_arp_rsp *); +extern int atmarp_update_kernel(Atmarp *); +extern void atmarp_get_updated_cache(); +extern void atmarp_process_cache_entry(struct air_arp_rsp *); +extern void print_atmarp_intf(FILE *, Atmarp_intf *); +extern void print_atmarp_cache(FILE *, Atmarp *); +extern void dump_atmarp_cache(FILE *, Atmarp_intf *); +extern void atmarp_sigint(int); /* atmarp_timer.c */ -extern void atmarp_cache_timeout __P((Harp_timer *)); -extern void atmarp_perm_timeout __P((Harp_timer *)); -extern void atmarp_keepalive_timeout __P((Harp_timer *)); +extern void atmarp_cache_timeout(Harp_timer *); +extern void atmarp_perm_timeout(Harp_timer *); +extern void atmarp_keepalive_timeout(Harp_timer *); #endif /* _ATMARP_ATMARP_VAR_H */ diff --git a/usr.sbin/atm/scspd/scsp_cafsm.c b/usr.sbin/atm/scspd/scsp_cafsm.c index e9c9509923..b051e4abdd 100644 --- a/usr.sbin/atm/scspd/scsp_cafsm.c +++ b/usr.sbin/atm/scspd/scsp_cafsm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.3 1999/08/28 01:15:32 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_cafsm.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ @@ -64,26 +64,26 @@ * CA FSM actions */ #define CA_ACTION_CNT 20 -int scsp_ca_act_00 __P((Scsp_dcs *, void *)); -int scsp_ca_act_01 __P((Scsp_dcs *, void *)); -int scsp_ca_act_02 __P((Scsp_dcs *, void *)); -int scsp_ca_act_03 __P((Scsp_dcs *, void *)); -int scsp_ca_act_04 __P((Scsp_dcs *, void *)); -int scsp_ca_act_05 __P((Scsp_dcs *, void *)); -int scsp_ca_act_06 __P((Scsp_dcs *, void *)); -int scsp_ca_act_07 __P((Scsp_dcs *, void *)); -int scsp_ca_act_08 __P((Scsp_dcs *, void *)); -int scsp_ca_act_09 __P((Scsp_dcs *, void *)); -int scsp_ca_act_10 __P((Scsp_dcs *, void *)); -int scsp_ca_act_11 __P((Scsp_dcs *, void *)); -int scsp_ca_act_12 __P((Scsp_dcs *, void *)); -int scsp_ca_act_13 __P((Scsp_dcs *, void *)); -int scsp_ca_act_14 __P((Scsp_dcs *, void *)); -int scsp_ca_act_15 __P((Scsp_dcs *, void *)); -int scsp_ca_act_16 __P((Scsp_dcs *, void *)); -int scsp_ca_act_17 __P((Scsp_dcs *, void *)); -int scsp_ca_act_18 __P((Scsp_dcs *, void *)); -int scsp_ca_act_19 __P((Scsp_dcs *, void *)); +int scsp_ca_act_00(Scsp_dcs *, void *); +int scsp_ca_act_01(Scsp_dcs *, void *); +int scsp_ca_act_02(Scsp_dcs *, void *); +int scsp_ca_act_03(Scsp_dcs *, void *); +int scsp_ca_act_04(Scsp_dcs *, void *); +int scsp_ca_act_05(Scsp_dcs *, void *); +int scsp_ca_act_06(Scsp_dcs *, void *); +int scsp_ca_act_07(Scsp_dcs *, void *); +int scsp_ca_act_08(Scsp_dcs *, void *); +int scsp_ca_act_09(Scsp_dcs *, void *); +int scsp_ca_act_10(Scsp_dcs *, void *); +int scsp_ca_act_11(Scsp_dcs *, void *); +int scsp_ca_act_12(Scsp_dcs *, void *); +int scsp_ca_act_13(Scsp_dcs *, void *); +int scsp_ca_act_14(Scsp_dcs *, void *); +int scsp_ca_act_15(Scsp_dcs *, void *); +int scsp_ca_act_16(Scsp_dcs *, void *); +int scsp_ca_act_17(Scsp_dcs *, void *); +int scsp_ca_act_18(Scsp_dcs *, void *); +int scsp_ca_act_19(Scsp_dcs *, void *); static int (*scsp_ca_act_vec[CA_ACTION_CNT])() = { scsp_ca_act_00, diff --git a/usr.sbin/atm/scspd/scsp_config.c b/usr.sbin/atm/scspd/scsp_config.c index 4943b1dd9c..deeb14dacb 100644 --- a/usr.sbin/atm/scspd/scsp_config.c +++ b/usr.sbin/atm/scspd/scsp_config.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config.c,v 1.3 1999/08/28 01:15:32 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_config.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_config.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ /* @@ -59,7 +59,7 @@ #include "scsp_if.h" #include "scsp_var.h" -extern int yyparse __P((void)); +extern int yyparse(void); /* * Global variables diff --git a/usr.sbin/atm/scspd/scsp_config_parse.y b/usr.sbin/atm/scspd/scsp_config_parse.y index 7ab935d5ac..b339f1acd4 100644 --- a/usr.sbin/atm/scspd/scsp_config_parse.y +++ b/usr.sbin/atm/scspd/scsp_config_parse.y @@ -25,7 +25,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.3 1999/08/28 01:15:32 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_config_parse.y,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ @@ -65,7 +65,7 @@ #include "scsp_if.h" #include "scsp_var.h" -void yyerror __P((char *)); +void yyerror(char *); %} diff --git a/usr.sbin/atm/scspd/scsp_hfsm.c b/usr.sbin/atm/scspd/scsp_hfsm.c index 026ba0ae05..18b0595188 100644 --- a/usr.sbin/atm/scspd/scsp_hfsm.c +++ b/usr.sbin/atm/scspd/scsp_hfsm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.3 1999/08/28 01:15:33 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_hfsm.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ @@ -61,13 +61,13 @@ * HELLO FSM actions */ #define HELLO_ACTION_CNT 7 -int scsp_hello_act_00 __P((Scsp_dcs *, Scsp_msg *)); -int scsp_hello_act_01 __P((Scsp_dcs *, Scsp_msg *)); -int scsp_hello_act_02 __P((Scsp_dcs *, Scsp_msg *)); -int scsp_hello_act_03 __P((Scsp_dcs *, Scsp_msg *)); -int scsp_hello_act_04 __P((Scsp_dcs *, Scsp_msg *)); -int scsp_hello_act_05 __P((Scsp_dcs *, Scsp_msg *)); -int scsp_hello_act_06 __P((Scsp_dcs *, Scsp_msg *)); +int scsp_hello_act_00(Scsp_dcs *, Scsp_msg *); +int scsp_hello_act_01(Scsp_dcs *, Scsp_msg *); +int scsp_hello_act_02(Scsp_dcs *, Scsp_msg *); +int scsp_hello_act_03(Scsp_dcs *, Scsp_msg *); +int scsp_hello_act_04(Scsp_dcs *, Scsp_msg *); +int scsp_hello_act_05(Scsp_dcs *, Scsp_msg *); +int scsp_hello_act_06(Scsp_dcs *, Scsp_msg *); static int (*scsp_action_vector[HELLO_ACTION_CNT])() = { scsp_hello_act_00, diff --git a/usr.sbin/atm/scspd/scsp_if.c b/usr.sbin/atm/scspd/scsp_if.c index 2ad98d8711..6915a8e496 100644 --- a/usr.sbin/atm/scspd/scsp_if.c +++ b/usr.sbin/atm/scspd/scsp_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_if.c,v 1.3 1999/08/28 01:15:33 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_if.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_if.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ @@ -66,27 +66,27 @@ */ #define SCSP_CIFSM_ACTION_CNT 11 int scsp_client_act_00 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_01 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_02 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_03 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_04 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_05 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_06 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_07 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_08 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_09 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); int scsp_client_act_10 - __P((Scsp_dcs *, Scsp_msg *, Scsp_if_msg *)); + (Scsp_dcs *, Scsp_msg *, Scsp_if_msg *); static int (*scsp_action_vector[SCSP_CIFSM_ACTION_CNT])() = { scsp_client_act_00, diff --git a/usr.sbin/atm/scspd/scsp_input.c b/usr.sbin/atm/scspd/scsp_input.c index 12cf4caab0..bc2e87cdfa 100644 --- a/usr.sbin/atm/scspd/scsp_input.c +++ b/usr.sbin/atm/scspd/scsp_input.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_input.c,v 1.3 1999/08/28 01:15:33 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_input.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_input.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ /* @@ -60,7 +60,7 @@ #include "scsp_if.h" #include "scsp_var.h" -static int scsp_parse_atmarp __P((char *, int, Scsp_atmarp_csa **)); +static int scsp_parse_atmarp(char *, int, Scsp_atmarp_csa **); /* diff --git a/usr.sbin/atm/scspd/scsp_var.h b/usr.sbin/atm/scspd/scsp_var.h index 6ca40742b9..1a72973d0b 100644 --- a/usr.sbin/atm/scspd/scsp_var.h +++ b/usr.sbin/atm/scspd/scsp_var.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/usr.sbin/atm/scspd/scsp_var.h,v 1.3 1999/08/28 01:15:34 peter Exp $ - * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_var.h,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * @(#) $DragonFly: src/usr.sbin/atm/scspd/scsp_var.h,v 1.3 2003/11/03 19:31:35 eirikn Exp $ * */ @@ -334,132 +334,132 @@ extern FILE *scsp_trace_file; * Executable functions */ /* scsp_cafsm.c */ -extern int scsp_cafsm __P((Scsp_dcs *, int, void *)); +extern int scsp_cafsm(Scsp_dcs *, int, void *); /* scsp_config.c */ -extern int scsp_config __P((char *)); -extern int start_dcs __P((void)); -extern int finish_dcs __P((void)); -extern int set_dcs_addr __P((char *, char *)); -extern int set_dcs_ca_rexmit __P((int)); -extern int set_dcs_csus_rexmit __P((int)); -extern int set_dcs_csu_rexmit __P((int)); -extern int set_dcs_csu_rexmit_max __P((int)); -extern int set_dcs_hello_df __P((int)); -extern int set_dcs_hello_int __P((int)); -extern int set_dcs_hops __P((int)); -extern int set_dcs_id __P((char *)); -extern int set_intf __P((char *)); -extern int set_protocol __P((int)); -extern int set_server_group __P((int)); -extern int start_server __P((char *)); -extern int finish_server __P((void)); -extern int set_log_file __P((char *)); +extern int scsp_config(char *); +extern int start_dcs(void); +extern int finish_dcs(void); +extern int set_dcs_addr(char *, char *); +extern int set_dcs_ca_rexmit(int); +extern int set_dcs_csus_rexmit(int); +extern int set_dcs_csu_rexmit(int); +extern int set_dcs_csu_rexmit_max(int); +extern int set_dcs_hello_df(int); +extern int set_dcs_hello_int(int); +extern int set_dcs_hops(int); +extern int set_dcs_id(char *); +extern int set_intf(char *); +extern int set_protocol(int); +extern int set_server_group(int); +extern int start_server(char *); +extern int finish_server(void); +extern int set_log_file(char *); /* scsp_config_lex.c */ -extern int yylex __P((void)); +extern int yylex(void); /* scsp_config_parse.y */ #if __STDC__ -extern void parse_error __P((const char *, ...)); +extern void parse_error(const char *, ...); #else -extern void parse_error __P((char *, va_alist)); +extern void parse_error(char *, va_alist); #endif /* scsp_hfsm.c */ -extern int scsp_hfsm __P((Scsp_dcs *, int, Scsp_msg *)); +extern int scsp_hfsm(Scsp_dcs *, int, Scsp_msg *); /* scsp_if.c */ -extern int scsp_cfsm __P((Scsp_dcs *, int, Scsp_msg *, - Scsp_if_msg *)); +extern int scsp_cfsm(Scsp_dcs *, int, Scsp_msg *, + Scsp_if_msg *); /* scsp_input.c */ -extern void scsp_free_msg __P((Scsp_msg *)); -extern Scsp_msg *scsp_parse_msg __P((char *, int)); +extern void scsp_free_msg(Scsp_msg *); +extern Scsp_msg *scsp_parse_msg(char *, int); /* scsp_log.c */ #if __STDC__ -extern void scsp_log __P((const int, const char *, ...)); -extern void scsp_trace __P((const char *, ...)); +extern void scsp_log(const int, const char *, ...); +extern void scsp_trace(const char *, ...); #else -extern void scsp_log __P((int, char *, va_alist)); -extern void scsp_trace __P((const char *, va_alist)); +extern void scsp_log(int, char *, va_alist); +extern void scsp_trace(const char *, va_alist); #endif -extern void scsp_open_trace __P(()); -extern void scsp_trace_msg __P((Scsp_dcs *, Scsp_msg *, int)); -extern void scsp_mem_err __P((char *)); +extern void scsp_open_trace(); +extern void scsp_trace_msg(Scsp_dcs *, Scsp_msg *, int); +extern void scsp_mem_err(char *); /* scsp_msg.c */ -extern void scsp_csus_ack __P((Scsp_dcs *, Scsp_msg *)); -extern int scsp_send_ca __P((Scsp_dcs *)); -extern int scsp_send_csus __P((Scsp_dcs *)); -extern int scsp_send_csu_req __P((Scsp_dcs *, Scsp_csa *)); -extern int scsp_send_csu_reply __P((Scsp_dcs *, Scsp_csa *)); -extern int scsp_send_hello __P((Scsp_dcs *)); +extern void scsp_csus_ack(Scsp_dcs *, Scsp_msg *); +extern int scsp_send_ca(Scsp_dcs *); +extern int scsp_send_csus(Scsp_dcs *); +extern int scsp_send_csu_req(Scsp_dcs *, Scsp_csa *); +extern int scsp_send_csu_reply(Scsp_dcs *, Scsp_csa *); +extern int scsp_send_hello(Scsp_dcs *); /* scsp_output.c */ -extern int scsp_format_msg __P((Scsp_dcs *, Scsp_msg *, char **)); -extern int scsp_send_msg __P((Scsp_dcs *, Scsp_msg *)); +extern int scsp_format_msg(Scsp_dcs *, Scsp_msg *, char **); +extern int scsp_send_msg(Scsp_dcs *, Scsp_msg *); /* scsp_print.c */ -extern char *format_hfsm_state __P((int)); -extern char *format_hfsm_event __P((int)); -extern char *format_cafsm_state __P((int)); -extern char *format_cafsm_event __P((int)); -extern char *format_cifsm_state __P((int)); -extern char *format_cifsm_event __P((int)); -extern void print_scsp_cse __P((FILE *, Scsp_cse *)); -extern void print_scsp_msg __P((FILE *, Scsp_msg *)); -extern void print_scsp_if_msg __P((FILE *, Scsp_if_msg *)); -extern void print_scsp_pending __P((FILE *, Scsp_pending *)); -extern void print_scsp_server __P((FILE *, Scsp_server *)); -extern void print_scsp_dcs __P((FILE *, Scsp_dcs *)); -extern void print_scsp_dump __P(()); +extern char *format_hfsm_state(int); +extern char *format_hfsm_event(int); +extern char *format_cafsm_state(int); +extern char *format_cafsm_event(int); +extern char *format_cifsm_state(int); +extern char *format_cifsm_event(int); +extern void print_scsp_cse(FILE *, Scsp_cse *); +extern void print_scsp_msg(FILE *, Scsp_msg *); +extern void print_scsp_if_msg(FILE *, Scsp_if_msg *); +extern void print_scsp_pending(FILE *, Scsp_pending *); +extern void print_scsp_server(FILE *, Scsp_server *); +extern void print_scsp_dcs(FILE *, Scsp_dcs *); +extern void print_scsp_dump(); /* scsp_socket.c */ -extern Scsp_dcs * scsp_find_dcs __P((int)); -extern Scsp_server * scsp_find_server __P((int)); -extern int scsp_dcs_connect __P((Scsp_dcs *)); -extern int scsp_dcs_listen __P((Scsp_server *)); -extern Scsp_dcs * scsp_dcs_accept __P((Scsp_server *)); -extern int scsp_dcs_read __P((Scsp_dcs *)); -extern int scsp_server_listen __P(()); -extern int scsp_server_accept __P((int)); -extern Scsp_if_msg * scsp_if_sock_read __P((int)); -extern int scsp_if_sock_write __P((int, Scsp_if_msg *)); -extern int scsp_server_read __P((Scsp_server *)); -extern int scsp_send_cache_ind __P((Scsp_server *)); -extern int scsp_pending_read __P((Scsp_pending *)); +extern Scsp_dcs * scsp_find_dcs(int); +extern Scsp_server * scsp_find_server(int); +extern int scsp_dcs_connect(Scsp_dcs *); +extern int scsp_dcs_listen(Scsp_server *); +extern Scsp_dcs * scsp_dcs_accept(Scsp_server *); +extern int scsp_dcs_read(Scsp_dcs *); +extern int scsp_server_listen(); +extern int scsp_server_accept(int); +extern Scsp_if_msg * scsp_if_sock_read(int); +extern int scsp_if_sock_write(int, Scsp_if_msg *); +extern int scsp_server_read(Scsp_server *); +extern int scsp_send_cache_ind(Scsp_server *); +extern int scsp_pending_read(Scsp_pending *); /* scsp_subr.c */ -extern int scsp_hash __P((Scsp_ckey *)); -extern int scsp_cmp_id __P((Scsp_id *, Scsp_id *)); -extern int scsp_cmp_key __P((Scsp_ckey *, Scsp_ckey *)); -extern int scsp_is_atmarp_server __P((char *)); -extern Scsp_cse * scsp_dup_cse __P((Scsp_cse *)); -extern Scsp_csa * scsp_dup_csa __P((Scsp_csa *)); -extern Scsp_csa * scsp_cse2csas __P((Scsp_cse *)); -extern void scsp_dcs_cleanup __P((Scsp_dcs *)); -extern void scsp_dcs_delete __P((Scsp_dcs *)); -extern void scsp_server_shutdown __P((Scsp_server *)); -extern void scsp_server_delete __P((Scsp_server *)); -extern int scsp_get_server_info __P((Scsp_server *)); -extern void scsp_process_ca __P((Scsp_dcs *, Scsp_ca *)); -extern void scsp_process_cache_rsp __P((Scsp_server *, - Scsp_if_msg *)); -extern int scsp_propagate_csa __P(( Scsp_dcs *, - Scsp_csa *)); -extern void scsp_update_cache __P(( Scsp_dcs *, - Scsp_csa *)); -extern void scsp_reconfigure __P(()); +extern int scsp_hash(Scsp_ckey *); +extern int scsp_cmp_id(Scsp_id *, Scsp_id *); +extern int scsp_cmp_key(Scsp_ckey *, Scsp_ckey *); +extern int scsp_is_atmarp_server(char *); +extern Scsp_cse * scsp_dup_cse(Scsp_cse *); +extern Scsp_csa * scsp_dup_csa(Scsp_csa *); +extern Scsp_csa * scsp_cse2csas(Scsp_cse *); +extern void scsp_dcs_cleanup(Scsp_dcs *); +extern void scsp_dcs_delete(Scsp_dcs *); +extern void scsp_server_shutdown(Scsp_server *); +extern void scsp_server_delete(Scsp_server *); +extern int scsp_get_server_info(Scsp_server *); +extern void scsp_process_ca(Scsp_dcs *, Scsp_ca *); +extern void scsp_process_cache_rsp(Scsp_server *, + Scsp_if_msg *); +extern int scsp_propagate_csa( Scsp_dcs *, + Scsp_csa *); +extern void scsp_update_cache( Scsp_dcs *, + Scsp_csa *); +extern void scsp_reconfigure(); /* scsp_timer.c */ -extern void scsp_open_timeout __P((Harp_timer *)); -extern void scsp_hello_timeout __P((Harp_timer *)); -extern void scsp_hello_rcv_timeout __P((Harp_timer *)); -extern void scsp_ca_retran_timeout __P((Harp_timer *)); -extern void scsp_csus_retran_timeout __P((Harp_timer *)); -extern void scsp_csu_req_retran_timeout __P((Harp_timer *)); +extern void scsp_open_timeout(Harp_timer *); +extern void scsp_hello_timeout(Harp_timer *); +extern void scsp_hello_rcv_timeout(Harp_timer *); +extern void scsp_ca_retran_timeout(Harp_timer *); +extern void scsp_csus_retran_timeout(Harp_timer *); +extern void scsp_csu_req_retran_timeout(Harp_timer *); diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c index b4e6755496..b4066d94aa 100644 --- a/usr.sbin/bootparamd/bootparamd/bootparamd.c +++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c @@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to /* * $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.c,v 1.10 1999/08/28 01:15:39 peter Exp $ - * $DragonFly: src/usr.sbin/bootparamd/bootparamd/bootparamd.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/bootparamd/bootparamd/bootparamd.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ #include #include @@ -37,8 +37,8 @@ static char askname[MAX_MACHINE_NAME]; static char path[MAX_PATH_LEN]; static char domain_name[MAX_MACHINE_NAME]; -int getthefile __P((char *, char *, char *, int)); -int checkhost __P((char *, char *, int)); +int getthefile(char *, char *, char *, int); +int checkhost(char *, char *, int); bp_whoami_res * bootparamproc_whoami_1(whoami) diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c index f3bae8690b..367e3eb44e 100644 --- a/usr.sbin/bootparamd/bootparamd/main.c +++ b/usr.sbin/bootparamd/bootparamd/main.c @@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to /* * $FreeBSD: src/usr.sbin/bootparamd/bootparamd/main.c,v 1.9 1999/08/28 01:15:39 peter Exp $ - * $DragonFly: src/usr.sbin/bootparamd/bootparamd/main.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/bootparamd/bootparamd/main.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ #include #include @@ -36,7 +36,7 @@ struct sockaddr_in my_addr; char *bootpfile = "/etc/bootparams"; extern void bootparamprog_1(); -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c index 464a0768cb..ba2404db1c 100644 --- a/usr.sbin/bootparamd/callbootd/callbootd.c +++ b/usr.sbin/bootparamd/callbootd/callbootd.c @@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to /* * $FreeBSD: src/usr.sbin/bootparamd/callbootd/callbootd.c,v 1.8 1999/08/28 01:15:40 peter Exp $ - * $DragonFly: src/usr.sbin/bootparamd/callbootd/callbootd.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/bootparamd/callbootd/callbootd.c,v 1.3 2003/11/03 19:31:35 eirikn Exp $ */ #include "bootparam_prot.h" #include @@ -31,9 +31,9 @@ char cln[MAX_MACHINE_NAME+1]; char dmn[MAX_MACHINE_NAME+1]; char path[MAX_PATH_LEN+1]; extern char *inet_ntoa(); -static void usage __P((void)); -int printgetfile __P((bp_getfile_res *)); -int printwhoami __P((bp_whoami_res *)); +static void usage(void); +int printgetfile(bp_getfile_res *); +int printwhoami(bp_whoami_res *); int eachres_whoami(resultp, raddr) diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c index 725c3f3f37..b874f52f56 100644 --- a/usr.sbin/cdcontrol/cdcontrol.c +++ b/usr.sbin/cdcontrol/cdcontrol.c @@ -18,7 +18,7 @@ * Some code style reformatting. * * $FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.24.2.11 2002/11/20 00:26:19 njl Exp $ - * $DragonFly: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.3 2003/08/22 19:38:36 asmodai Exp $ + * $DragonFly: src/usr.sbin/cdcontrol/cdcontrol.c,v 1.4 2003/11/03 19:31:36 eirikn Exp $ */ #include @@ -116,32 +116,32 @@ int fd = -1; int verbose = 1; int msf = 1; -int setvol __P((int, int)); -int read_toc_entrys __P((int)); -int play_msf __P((int, int, int, int, int, int)); -int play_track __P((int, int, int, int)); -int get_vol __P((int *, int *)); -int status __P((int *, int *, int *, int *)); -int open_cd __P((void)); -int next_prev __P((char *arg, int)); -int play __P((char *arg)); -int info __P((char *arg)); -int cdid __P((void)); -int pstatus __P((char *arg)); -char *input __P((int *)); -void prtrack __P((struct cd_toc_entry *e, int lastflag)); -void lba2msf __P((unsigned long lba, - u_char *m, u_char *s, u_char *f)); -unsigned int msf2lba __P((u_char m, u_char s, u_char f)); -int play_blocks __P((int blk, int len)); -int run __P((int cmd, char *arg)); -char *parse __P((char *buf, int *cmd)); -void help __P((void)); -void usage __P((void)); -char *use_cdrom_instead __P((const char *)); -const char *strstatus __P((int)); -static u_int dbprog_discid __P((void)); -const char *cdcontrol_prompt __P((void)); +int setvol(int, int); +int read_toc_entrys(int); +int play_msf(int, int, int, int, int, int); +int play_track(int, int, int, int); +int get_vol(int *, int *); +int status(int *, int *, int *, int *); +int open_cd(void); +int next_prev(char *arg, int); +int play(char *arg); +int info(char *arg); +int cdid(void); +int pstatus(char *arg); +char *input(int *); +void prtrack(struct cd_toc_entry *e, int lastflag); +void lba2msf(unsigned long lba, + u_char *m, u_char *s, u_char *f); +unsigned int msf2lba(u_char m, u_char s, u_char f); +int play_blocks(int blk, int len); +int run(int cmd, char *arg); +char *parse(char *buf, int *cmd); +void help(void); +void usage(void); +char *use_cdrom_instead(const char *); +const char *strstatus(int); +static u_int dbprog_discid(void); +const char *cdcontrol_prompt(void); void help () { diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index 58c7456ba8..dcaf3d0b75 100644 --- a/usr.sbin/chown/chown.c +++ b/usr.sbin/chown/chown.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)chown.c 8.8 (Berkeley) 4/4/94 * $FreeBSD: src/usr.sbin/chown/chown.c,v 1.15.2.3 2002/08/07 21:24:33 schweikh Exp $ - * $DragonFly: src/usr.sbin/chown/chown.c,v 1.2 2003/06/17 04:29:52 dillon Exp $ + * $DragonFly: src/usr.sbin/chown/chown.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #include @@ -51,11 +51,11 @@ #include #include -void a_gid __P((char *)); -void a_uid __P((char *)); -void chownerr __P((char *)); -u_long id __P((char *, char *)); -void usage __P((void)); +void a_gid(char *); +void a_uid(char *); +void chownerr(char *); +u_long id(char *, char *); +void usage(void); uid_t uid; gid_t gid; diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index f6cba89b5f..b217f2044d 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -32,7 +32,7 @@ * * @(#)config.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/config.h,v 1.35.2.1 2000/08/03 00:09:56 peter Exp $ - * $DragonFly: src/usr.sbin/config/config.h,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/config.h,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* @@ -145,18 +145,18 @@ struct opt_list { extern char *ident; extern int do_trace; -char *get_word __P((FILE *)); -char *get_quoted_word __P((FILE *)); -char *path __P((char *)); -char *raisestr __P((char *)); -void moveifchanged __P((const char *, const char *)); -void init_dev __P((struct device *)); -void newbus_ioconf __P((void)); -int yyparse __P((void)); -int yylex __P((void)); -void options __P((void)); -void makefile __P((void)); -void headers __P((void)); +char *get_word(FILE *); +char *get_quoted_word(FILE *); +char *path(char *); +char *raisestr(char *); +void moveifchanged(const char *, const char *); +void init_dev(struct device *); +void newbus_ioconf(void); +int yyparse(void); +int yylex(void); +void options(void); +void makefile(void); +void headers(void); extern struct device *dtab; diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 3a590b32dd..045344a4fc 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -83,7 +83,7 @@ * * @(#)config.y 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/config.y,v 1.42.2.1 2001/01/23 00:09:32 peter Exp $ - * $DragonFly: src/usr.sbin/config/config.y,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/config.y,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #include @@ -105,8 +105,8 @@ int maxusers; #define ns(s) strdup(s) -static int connect __P((char *, int)); -static void yyerror __P((char *s)); +static int connect(char *, int); +static void yyerror(char *s); %} diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l index dc60d4b812..0705c99701 100644 --- a/usr.sbin/config/lang.l +++ b/usr.sbin/config/lang.l @@ -33,7 +33,7 @@ * * @(#)lang.l 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/lang.l,v 1.27 1999/11/09 07:20:22 peter Exp $ - * $DragonFly: src/usr.sbin/config/lang.l,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/lang.l,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #include @@ -82,9 +82,9 @@ struct kt { }; -int kw_lookup __P((char *)); -int octal __P((char *)); -int hex __P((char *)); +int kw_lookup(char *); +int octal(char *); +int hex(char *); %} WORD [A-Za-z_][-A-Za-z_]* diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c index 1efbd2f4f1..d4d56bb07d 100644 --- a/usr.sbin/config/main.c +++ b/usr.sbin/config/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/main.c,v 1.37.2.3 2001/06/13 00:25:53 cg Exp $ - * $DragonFly: src/usr.sbin/config/main.c,v 1.4 2003/08/15 06:32:45 dillon Exp $ + * $DragonFly: src/usr.sbin/config/main.c,v 1.5 2003/11/03 19:31:36 eirikn Exp $ */ #include @@ -67,9 +67,9 @@ static int no_config_clobber = TRUE; int debugging; int profiling; -static void configfile __P((void)); -static void get_srcdir __P((void)); -static void usage __P((void)); +static void configfile(void); +static void get_srcdir(void); +static void usage(void); /* * Config builds a set of files for building a UNIX diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c index e0dd4bbaa6..c5db591a60 100644 --- a/usr.sbin/config/mkheaders.c +++ b/usr.sbin/config/mkheaders.c @@ -32,7 +32,7 @@ * * @(#)mkheaders.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/mkheaders.c,v 1.14.2.2 2001/01/23 00:09:32 peter Exp $ - * $DragonFly: src/usr.sbin/config/mkheaders.c,v 1.3 2003/08/07 21:19:25 dillon Exp $ + * $DragonFly: src/usr.sbin/config/mkheaders.c,v 1.4 2003/11/03 19:31:36 eirikn Exp $ */ /* @@ -47,10 +47,10 @@ #include "config.h" #include "y.tab.h" -static void do_header __P((char *, char *, int)); -static void do_count __P((char *, char *, int)); -static char *toheader __P((char *)); -static char *tomacro __P((char *)); +static void do_header(char *, char *, int); +static void do_count(char *, char *, int); +static char *toheader(char *); +static char *tomacro(char *); void headers() diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 030290062f..91fdbd6e20 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -32,7 +32,7 @@ * * @(#)mkmakefile.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.51.2.3 2001/01/23 00:09:32 peter Exp $ - * $DragonFly: src/usr.sbin/config/mkmakefile.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/mkmakefile.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* @@ -67,16 +67,16 @@ static struct file_list *fcur; -static char *tail __P((char *)); -static void do_clean __P((FILE *)); -static void do_rules __P((FILE *)); -static void do_sfiles __P((FILE *)); -static void do_mfiles __P((FILE *)); -static void do_cfiles __P((FILE *)); -static void do_objs __P((FILE *)); -static void do_before_depend __P((FILE *)); -static int opteq __P((char *, char *)); -static void read_files __P((void)); +static char *tail(char *); +static void do_clean(FILE *); +static void do_rules(FILE *); +static void do_sfiles(FILE *); +static void do_mfiles(FILE *); +static void do_cfiles(FILE *); +static void do_objs(FILE *); +static void do_before_depend(FILE *); +static int opteq(char *, char *); +static void read_files(void); /* * Lookup a file, by name. diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c index 810ca1a527..6bae265b2a 100644 --- a/usr.sbin/config/mkoptions.c +++ b/usr.sbin/config/mkoptions.c @@ -33,7 +33,7 @@ * * @(#)mkheaders.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/mkoptions.c,v 1.17.2.3 2001/12/13 19:18:01 dillon Exp $ - * $DragonFly: src/usr.sbin/config/mkoptions.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/mkoptions.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* @@ -59,10 +59,10 @@ static struct users { }; #define NUSERS (sizeof (users) / sizeof (users[0])) -static char *lower __P((char *)); -static void read_options __P((void)); -static void do_option __P((char *)); -static char *tooption __P((char *)); +static char *lower(char *); +static void read_options(void); +static void do_option(char *); +static char *tooption(char *); void options() diff --git a/usr.sbin/cron/cron/cron.c b/usr.sbin/cron/cron/cron.c index 0a5170516a..44790c0f6c 100644 --- a/usr.sbin/cron/cron/cron.c +++ b/usr.sbin/cron/cron/cron.c @@ -15,7 +15,7 @@ * Paul Vixie uunet!decwrl!vixie!paul * * $FreeBSD: src/usr.sbin/cron/cron/cron.c,v 1.9.2.2 2001/05/28 23:37:26 babkin Exp $ - * $DragonFly: src/usr.sbin/cron/cron/cron.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/cron/cron.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #define MAIN_PROGRAM @@ -30,17 +30,17 @@ #endif -static void usage __P((void)), - run_reboot_jobs __P((cron_db *)), - cron_tick __P((cron_db *)), - cron_sync __P((void)), - cron_sleep __P((cron_db *)), - cron_clean __P((cron_db *)), +static void usage(void), + run_reboot_jobs(cron_db *), + cron_tick(cron_db *), + cron_sync(void), + cron_sleep(cron_db *), + cron_clean(cron_db *), #ifdef USE_SIGCHLD - sigchld_handler __P((int)), + sigchld_handler(int), #endif - sighup_handler __P((int)), - parse_args __P((int c, char *v[])); + sighup_handler(int), + parse_args(int c, char *v[]); static time_t last_time = 0; static int dst_enabled = 0; diff --git a/usr.sbin/cron/cron/cron.h b/usr.sbin/cron/cron/cron.h index 6fe7d9bbf3..6552f68fdc 100644 --- a/usr.sbin/cron/cron/cron.h +++ b/usr.sbin/cron/cron/cron.h @@ -18,7 +18,7 @@ /* cron.h - header for vixie's cron * * $FreeBSD: src/usr.sbin/cron/cron/cron.h,v 1.9.2.3 2001/05/28 23:37:26 babkin Exp $ - * $DragonFly: src/usr.sbin/cron/cron/cron.h,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/cron/cron.h,v 1.3 2003/11/03 19:31:36 eirikn Exp $ * * vix 14nov88 [rest of log is in RCS] * vix 14jan87 [0 or 7 can be sunday; thanks, mwm@berkeley] @@ -198,50 +198,50 @@ typedef struct _cron_db { } cron_db; -void set_cron_uid __P((void)), - set_cron_cwd __P((void)), - load_database __P((cron_db *)), - open_logfile __P((void)), - sigpipe_func __P((void)), - job_add __P((entry *, user *)), - do_command __P((entry *, user *)), - link_user __P((cron_db *, user *)), - unlink_user __P((cron_db *, user *)), - free_user __P((user *)), - env_free __P((char **)), - unget_char __P((int, FILE *)), - free_entry __P((entry *)), - acquire_daemonlock __P((int)), - skip_comments __P((FILE *)), - log_it __P((char *, int, char *, char *)), - log_close __P((void)); - -int job_runqueue __P((void)), - set_debug_flags __P((char *)), - get_char __P((FILE *)), - get_string __P((char *, int, FILE *, char *)), - swap_uids __P((void)), - load_env __P((char *, FILE *)), - cron_pclose __P((FILE *)), - strcmp_until __P((char *, char *, int)), - allowed __P((char *)), - strdtb __P((char *)); - -char *env_get __P((char *, char **)), - *arpadate __P((time_t *)), - *mkprints __P((unsigned char *, unsigned int)), - *first_word __P((char *, char *)), - **env_init __P((void)), - **env_copy __P((char **)), - **env_set __P((char **, char *)); - -user *load_user __P((int, struct passwd *, char *)), - *find_user __P((cron_db *, char *)); - -entry *load_entry __P((FILE *, void (*)(), - struct passwd *, char **)); - -FILE *cron_popen __P((char *, char *, entry *)); +void set_cron_uid(void), + set_cron_cwd(void), + load_database(cron_db *), + open_logfile(void), + sigpipe_func(void), + job_add(entry *, user *), + do_command(entry *, user *), + link_user(cron_db *, user *), + unlink_user(cron_db *, user *), + free_user(user *), + env_free(char **), + unget_char(int, FILE *), + free_entry(entry *), + acquire_daemonlock(int), + skip_comments(FILE *), + log_it(char *, int, char *, char *), + log_close(void); + +int job_runqueue(void), + set_debug_flags(char *), + get_char(FILE *), + get_string(char *, int, FILE *, char *), + swap_uids(void), + load_env(char *, FILE *), + cron_pclose(FILE *), + strcmp_until(char *, char *, int), + allowed(char *), + strdtb(char *); + +char *env_get(char *, char **), + *arpadate(time_t *), + *mkprints(unsigned char *, unsigned int), + *first_word(char *, char *), + **env_init(void), + **env_copy(char **), + **env_set(char **, char *); + +user *load_user(int, struct passwd *, char *), + *find_user(cron_db *, char *); + +entry *load_entry(FILE *, void (*)(), + struct passwd *, char **); + +FILE *cron_popen(char *, char *, entry *); /* in the C tradition, we only create diff --git a/usr.sbin/cron/cron/database.c b/usr.sbin/cron/cron/database.c index 9746a26efe..0ad16e2588 100644 --- a/usr.sbin/cron/cron/database.c +++ b/usr.sbin/cron/cron/database.c @@ -15,7 +15,7 @@ * Paul Vixie uunet!decwrl!vixie!paul * * $FreeBSD: src/usr.sbin/cron/cron/database.c,v 1.8 1999/08/28 01:15:50 peter Exp $ - * $DragonFly: src/usr.sbin/cron/cron/database.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/cron/database.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* vix 26jan87 [RCS has the log] @@ -31,9 +31,9 @@ #define TMAX(a,b) ((a)>(b)?(a):(b)) -static void process_crontab __P((char *, char *, char *, +static void process_crontab(char *, char *, char *, struct stat *, - cron_db *, cron_db *)); + cron_db *, cron_db *); void diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c index 70134f870f..b72aa11a47 100644 --- a/usr.sbin/cron/cron/do_command.c +++ b/usr.sbin/cron/cron/do_command.c @@ -15,7 +15,7 @@ * Paul Vixie uunet!decwrl!vixie!paul * * $FreeBSD: src/usr.sbin/cron/cron/do_command.c,v 1.15.2.5 2001/05/04 00:59:40 peter Exp $ - * $DragonFly: src/usr.sbin/cron/cron/do_command.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/cron/do_command.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #include "cron.h" @@ -31,8 +31,8 @@ #endif -static void child_process __P((entry *, user *)), - do_univ __P((user *)); +static void child_process(entry *, user *), + do_univ(user *); void diff --git a/usr.sbin/cron/cron/externs.h b/usr.sbin/cron/cron/externs.h index f8b40a5d97..5342947203 100644 --- a/usr.sbin/cron/cron/externs.h +++ b/usr.sbin/cron/cron/externs.h @@ -14,7 +14,7 @@ * I'll try to keep a version up to date. I can be reached as follows: * Paul Vixie uunet!decwrl!vixie!paul * - * $DragonFly: src/usr.sbin/cron/cron/externs.h,v 1.2 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.sbin/cron/cron/externs.h,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #if defined(POSIX) || defined(ATT) @@ -73,7 +73,7 @@ extern void *malloc(), *realloc(); * external variables needed for the interface. */ #if (!defined(BSD) || (BSD < 198911)) && !defined(ATT) && !defined(UNICOS) -int getopt __P((int, char * const *, const char *)); +int getopt(int, char * const *, const char *); #endif #if (!defined(BSD) || (BSD < 199103)) @@ -111,19 +111,19 @@ extern int optind, opterr, optopt; #endif #ifdef NEED_STRCASECMP -extern int strcasecmp __P((char *, char *)); +extern int strcasecmp(char *, char *); #endif #ifdef NEED_STRDUP -extern char *strdup __P((char *)); +extern char *strdup(char *); #endif #ifdef NEED_STRERROR -extern char *strerror __P((int)); +extern char *strerror(int); #endif #ifdef NEED_FLOCK -extern int flock __P((int, int)); +extern int flock(int, int); # define LOCK_SH 1 # define LOCK_EX 2 # define LOCK_NB 4 @@ -131,17 +131,17 @@ extern int flock __P((int, int)); #endif #ifdef NEED_SETSID -extern int setsid __P((void)); +extern int setsid(void); #endif #ifdef NEED_GETDTABLESIZE -extern int getdtablesize __P((void)); +extern int getdtablesize(void); #endif #ifdef NEED_SETENV -extern int setenv __P((char *, char *, int)); +extern int setenv(char *, char *, int); #endif #ifdef NEED_VFORK -extern PID_T vfork __P((void)); +extern PID_T vfork(void); #endif diff --git a/usr.sbin/cron/crontab/crontab.c b/usr.sbin/cron/crontab/crontab.c index 4b684847b5..a4c90b7e1a 100644 --- a/usr.sbin/cron/crontab/crontab.c +++ b/usr.sbin/cron/crontab/crontab.c @@ -16,7 +16,7 @@ * * From Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp * $FreeBSD: src/usr.sbin/cron/crontab/crontab.c,v 1.12.2.4 2001/06/16 03:18:37 peter Exp $ - * $DragonFly: src/usr.sbin/cron/crontab/crontab.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/crontab/crontab.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* crontab - install and manage per-user crontab files @@ -24,7 +24,7 @@ * vix 26jan87 [original] */ -static char version[] = "$DragonFly: src/usr.sbin/cron/crontab/crontab.c,v 1.2 2003/06/17 04:29:53 dillon Exp $"; +static char version[] = "$DragonFly: src/usr.sbin/cron/crontab/crontab.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $"; #define MAIN_PROGRAM @@ -62,13 +62,13 @@ static FILE *NewCrontab; static int CheckErrorCount; static enum opt_t Option; static struct passwd *pw; -static void list_cmd __P((void)), - delete_cmd __P((void)), - edit_cmd __P((void)), - poke_daemon __P((void)), - check_error __P((char *)), - parse_args __P((int c, char *v[])); -static int replace_cmd __P((void)); +static void list_cmd(void), + delete_cmd(void), + edit_cmd(void), + poke_daemon(void), + check_error(char *), + parse_args(int c, char *v[]); +static int replace_cmd(void); static void diff --git a/usr.sbin/cron/lib/entry.c b/usr.sbin/cron/lib/entry.c index 860faf1f68..70150748c5 100644 --- a/usr.sbin/cron/lib/entry.c +++ b/usr.sbin/cron/lib/entry.c @@ -15,7 +15,7 @@ * Paul Vixie uunet!decwrl!vixie!paul * * $FreeBSD: src/usr.sbin/cron/lib/entry.c,v 1.9.2.5 2001/08/18 04:20:31 mikeh Exp $ - * $DragonFly: src/usr.sbin/cron/lib/entry.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/cron/lib/entry.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* vix 26jan87 [RCS'd; rest of log is in RCS file] @@ -39,10 +39,10 @@ typedef enum ecode { #endif } ecode_e; -static char get_list __P((bitstr_t *, int, int, char *[], int, FILE *)), - get_range __P((bitstr_t *, int, int, char *[], int, FILE *)), - get_number __P((int *, int, char *[], int, FILE *)); -static int set_element __P((bitstr_t *, int, int, int)); +static char get_list(bitstr_t *, int, int, char *[], int, FILE *), + get_range(bitstr_t *, int, int, char *[], int, FILE *), + get_number(int *, int, char *[], int, FILE *); +static int set_element(bitstr_t *, int, int, int); static char *ecodes[] = { diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c index 80690b7f4c..838e9473ed 100644 --- a/usr.sbin/crunch/crunchide/crunchide.c +++ b/usr.sbin/crunch/crunchide/crunchide.c @@ -1,6 +1,6 @@ /* $NetBSD: crunchide.c,v 1.8 1997/11/01 06:51:45 lukem Exp $ */ /* $FreeBSD: src/usr.sbin/crunch/crunchide/crunchide.c,v 1.6.6.1 2002/07/25 09:33:17 ru Exp $ */ -/* $DragonFly: src/usr.sbin/crunch/crunchide/crunchide.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/crunch/crunchide/crunchide.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ /* * Copyright (c) 1997 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1994 University of Maryland @@ -87,7 +87,7 @@ int hide_syms(const char *filename); int verbose; -int main __P((int, char *[])); +int main(int, char *[]); int main(argc, argv) int argc; diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c index 4af63ea24d..adc93e5f7b 100644 --- a/usr.sbin/dev_mkdb/dev_mkdb.c +++ b/usr.sbin/dev_mkdb/dev_mkdb.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)dev_mkdb.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/dev_mkdb/dev_mkdb.c,v 1.4.2.1 2001/11/25 18:34:09 iedowse Exp $ - * $DragonFly: src/usr.sbin/dev_mkdb/dev_mkdb.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/dev_mkdb/dev_mkdb.c,v 1.3 2003/11/03 19:31:36 eirikn Exp $ */ #include @@ -51,7 +51,7 @@ #include #include -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/diskpart/diskpart.c b/usr.sbin/diskpart/diskpart.c index 120103cfc5..a0cf751015 100644 --- a/usr.sbin/diskpart/diskpart.c +++ b/usr.sbin/diskpart/diskpart.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)diskpart.c 8.3 (Berkeley) 11/30/94 * $FreeBSD: src/usr.sbin/diskpart/diskpart.c,v 1.11.2.2 2002/12/04 16:24:08 roam Exp $ - * $DragonFly: src/usr.sbin/diskpart/Attic/diskpart.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/diskpart/Attic/diskpart.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* @@ -106,7 +106,7 @@ int pflag; /* print device driver partition tables */ int dflag; /* print disktab entry */ struct disklabel *promptfordisk(); -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c index afb6fd91b0..da68f50b5f 100644 --- a/usr.sbin/faithd/faithd.c +++ b/usr.sbin/faithd/faithd.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/faithd/faithd.c,v 1.2.2.7 2002/04/28 08:01:39 ume Exp $ - * $DragonFly: src/usr.sbin/faithd/faithd.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/faithd/faithd.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* @@ -105,25 +105,25 @@ static int pflag = 0; static int inetd = 0; static char *configfile = NULL; -int main __P((int, char **)); -static int inetd_main __P((int, char **)); -static int daemon_main __P((int, char **)); -static void play_service __P((int)); -static void play_child __P((int, struct sockaddr *)); -static int faith_prefix __P((struct sockaddr *)); -static int map6to4 __P((struct sockaddr_in6 *, struct sockaddr_in *)); +int main(int, char **); +static int inetd_main(int, char **); +static int daemon_main(int, char **); +static void play_service(int); +static void play_child(int, struct sockaddr *); +static int faith_prefix(struct sockaddr *); +static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *); #ifdef FAITH4 -static int map4to6 __P((struct sockaddr_in *, struct sockaddr_in6 *)); +static int map4to6(struct sockaddr_in *, struct sockaddr_in6 *); #endif -static void sig_child __P((int)); -static void sig_terminate __P((int)); -static void start_daemon __P((void)); -static void exit_stderr __P((const char *, ...)) +static void sig_child(int); +static void sig_terminate(int); +static void start_daemon(void); +static void exit_stderr(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -static void grab_myaddrs __P((void)); -static void free_myaddrs __P((void)); -static void update_myaddrs __P((void)); -static void usage __P((void)); +static void grab_myaddrs(void); +static void free_myaddrs(void); +static void update_myaddrs(void); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h index eebb6d7323..f47a996a46 100644 --- a/usr.sbin/faithd/faithd.h +++ b/usr.sbin/faithd/faithd.h @@ -29,21 +29,21 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/faithd/faithd.h,v 1.1.2.3 2002/04/28 05:40:29 suz Exp $ - * $DragonFly: src/usr.sbin/faithd/faithd.h,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/faithd/faithd.h,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ extern char logname[]; extern int dflag; -extern void tcp_relay __P((int, int, const char *)); -extern void ftp_relay __P((int, int)); -extern int ftp_active __P((int, int, int *, int *)); -extern int ftp_passive __P((int, int, int *, int *)); -extern void rsh_relay __P((int, int)); -extern void rsh_dual_relay __P((int, int)); -extern void exit_success __P((const char *, ...)) +extern void tcp_relay(int, int, const char *); +extern void ftp_relay(int, int); +extern int ftp_active(int, int, int *, int *); +extern int ftp_passive(int, int, int *, int *); +extern void rsh_relay(int, int); +extern void rsh_dual_relay(int, int); +extern void exit_success(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -extern void exit_failure __P((const char *, ...)) +extern void exit_failure(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); #define DEFAULT_PORT_NAME "telnet" diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c index e5ee6e49ce..189eb09ecc 100644 --- a/usr.sbin/faithd/ftp.c +++ b/usr.sbin/faithd/ftp.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/faithd/ftp.c,v 1.2.2.5 2002/04/28 05:40:29 suz Exp $ - * $DragonFly: src/usr.sbin/faithd/ftp.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/faithd/ftp.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #include @@ -69,11 +69,11 @@ enum state { NONE, LPRT, EPRT, PORT, LPSV, EPSV, PASV }; enum state { NONE, LPRT, EPRT, LPSV, EPSV }; #endif -static int ftp_activeconn __P((void)); -static int ftp_passiveconn __P((void)); -static int ftp_copy __P((int, int)); -static int ftp_copyresult __P((int, int, enum state)); -static int ftp_copycommand __P((int, int, enum state *)); +static int ftp_activeconn(void); +static int ftp_passiveconn(void); +static int ftp_copy(int, int); +static int ftp_copyresult(int, int, enum state); +static int ftp_copycommand(int, int, enum state *); void ftp_relay(int ctl6, int ctl4) diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c index b35fe6c8f0..2bfb0138f2 100644 --- a/usr.sbin/faithd/prefix.c +++ b/usr.sbin/faithd/prefix.c @@ -1,6 +1,6 @@ /* $KAME: prefix.c,v 1.9 2001/07/02 14:36:49 itojun Exp $ */ /* $FreeBSD: src/usr.sbin/faithd/prefix.c,v 1.1.2.2 2002/04/28 05:40:29 suz Exp $ */ -/* $DragonFly: src/usr.sbin/faithd/prefix.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/faithd/prefix.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* * Copyright (C) 2000 WIDE Project. @@ -48,11 +48,11 @@ #include "faithd.h" #include "prefix.h" -static int prefix_set __P((const char *, struct prefix *, int)); -static struct config *config_load1 __P((const char *)); +static int prefix_set(const char *, struct prefix *, int); +static struct config *config_load1(const char *); #if 0 -static void config_show1 __P((const struct config *)); -static void config_show __P((void)); +static void config_show1(const struct config *); +static void config_show(void); #endif struct config *config_list = NULL; diff --git a/usr.sbin/faithd/prefix.h b/usr.sbin/faithd/prefix.h index 8d6dcd396d..dd1e0c7ec3 100644 --- a/usr.sbin/faithd/prefix.h +++ b/usr.sbin/faithd/prefix.h @@ -1,6 +1,6 @@ /* $KAME: prefix.h,v 1.4 2001/09/05 03:04:21 itojun Exp $ */ /* $FreeBSD: src/usr.sbin/faithd/prefix.h,v 1.1.2.2 2002/04/28 05:40:29 suz Exp $ */ -/* $DragonFly: src/usr.sbin/faithd/prefix.h,v 1.2 2003/06/17 04:29:53 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/faithd/prefix.h,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* * Copyright (C) 2000 WIDE Project. @@ -47,7 +47,7 @@ struct config { #define _PATH_PREFIX_CONF "/etc/faithd.conf" -extern const char *prefix_string __P((const struct prefix *)); -extern int prefix_match __P((const struct prefix *, const struct sockaddr *)); -extern int config_load __P((const char *)); -extern const struct config *config_match __P((struct sockaddr *, struct sockaddr *)); +extern const char *prefix_string(const struct prefix *); +extern int prefix_match(const struct prefix *, const struct sockaddr *); +extern int config_load(const char *); +extern const struct config *config_match(struct sockaddr *, struct sockaddr *); diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c index a0a9d027e4..ba4dbd65a0 100644 --- a/usr.sbin/faithd/tcp.c +++ b/usr.sbin/faithd/tcp.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/faithd/tcp.c,v 1.1.2.3 2002/04/28 05:40:29 suz Exp $ - * $DragonFly: src/usr.sbin/faithd/tcp.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/faithd/tcp.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #include @@ -64,12 +64,12 @@ static pid_t ppid = (pid_t)0; volatile time_t child_lastactive = (time_t)0; static time_t parent_lastactive = (time_t)0; -static void sig_ctimeout __P((int)); -static void sig_child __P((int)); -static void notify_inactive __P((void)); -static void notify_active __P((void)); -static void send_data __P((int, int, const char *, int)); -static void relay __P((int, int, const char *, int)); +static void sig_ctimeout(int); +static void sig_child(int); +static void notify_inactive(void); +static void notify_active(void); +static void send_data(int, int, const char *, int); +static void relay(int, int, const char *, int); /* * Inactivity timer: diff --git a/usr.sbin/gifconfig/gifconfig.c b/usr.sbin/gifconfig/gifconfig.c index 68500bd5a3..6d2b695abf 100644 --- a/usr.sbin/gifconfig/gifconfig.c +++ b/usr.sbin/gifconfig/gifconfig.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/gifconfig/gifconfig.c,v 1.2.2.4 2002/08/30 14:23:39 sobomax Exp $ */ -/* $DragonFly: src/usr.sbin/gifconfig/gifconfig.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/gifconfig/gifconfig.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* $KAME: gifconfig.c,v 1.14 2001/01/01 04:04:56 jinmei Exp $ */ /* @@ -103,11 +103,11 @@ kvm_t *kvmd; char ntop_buf[INET6_ADDRSTRLEN]; /*inet_ntop()*/ #endif -void setifpsrc __P((char *, int)); -void setifpdst __P((char *, int)); -void setifflags __P((char *, int)); +void setifpsrc(char *, int); +void setifpdst(char *, int); +void setifflags(char *, int); #ifdef SIOCDIFPHYADDR -void delifaddrs __P((char *, int)); +void delifaddrs(char *, int); #endif #define NEXTARG 0xffffff @@ -115,7 +115,7 @@ void delifaddrs __P((char *, int)); static struct cmd { char *c_name; int c_parameter; /* NEXTARG means next argv */ - void (*c_func) __P((char *, int)); + void (*c_func)(char *, int); } cmds[] = { { "up", IFF_UP, setifflags } , { "down", -IFF_UP, setifflags }, @@ -130,22 +130,22 @@ static struct cmd { * XNS support liberally adapted from code written at the University of * Maryland principally by James O'Toole and Chris Torek. */ -int main __P((int, char *[])); -void status __P((void)); -void phys_status __P((int)); -void in_status __P((int)); +int main(int, char *[]); +void status(void); +void phys_status(int); +void in_status(int); #ifdef INET6 -void in6_status __P((int)); +void in6_status(int); #endif -void ether_status __P((int)); -void Perror __P((char *)); -void in_getaddr __P((char *, int)); +void ether_status(int); +void Perror(char *); +void in_getaddr(char *, int); #ifdef INET6 -void in6_getaddr __P((char *, int)); -void in6_getprefix __P((char *, int)); +void in6_getaddr(char *, int); +void in6_getprefix(char *, int); #endif -void printb __P((char *, unsigned int, char *)); -int prefix __P((void *, int)); +void printb(char *, unsigned int, char *); +int prefix(void *, int); char ntop_buf[INET6_ADDRSTRLEN]; @@ -153,9 +153,9 @@ char ntop_buf[INET6_ADDRSTRLEN]; struct afswtch { char *af_name; short af_af; - void (*af_status) __P((int)); - void (*af_getaddr) __P((char *, int)); - void (*af_getprefix) __P((char *, int)); + void (*af_status)(int); + void (*af_getaddr)(char *, int); + void (*af_getprefix)(char *, int); u_long af_pifaddr; caddr_t af_addreq; caddr_t af_req; @@ -173,8 +173,8 @@ struct afswtch { struct afswtch *afp = NULL; /*the address family being set or asked about*/ -void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); -int ifconfig __P((int argc, char *argv[], int af, struct afswtch *rafp)); +void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); +int ifconfig(int argc, char *argv[], int af, struct afswtch *rafp); diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c index 48d02c0d2e..27d11c73b5 100644 --- a/usr.sbin/ifmcstat/ifmcstat.c +++ b/usr.sbin/ifmcstat/ifmcstat.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.c,v 1.3.2.2 2001/07/03 11:02:06 ume Exp $ - * $DragonFly: src/usr.sbin/ifmcstat/ifmcstat.c,v 1.3 2003/08/27 03:21:50 dillon Exp $ + * $DragonFly: src/usr.sbin/ifmcstat/ifmcstat.c,v 1.4 2003/11/03 19:31:37 eirikn Exp $ */ #define _KERNEL_STRUCTURES @@ -63,13 +63,13 @@ struct nlist nl[] = { { "" }, }; -const char *inet6_n2a __P((struct in6_addr *)); -int main __P((void)); -char *ifname __P((struct ifnet *)); -void kread __P((u_long, void *, int)); -void if6_addrlist __P((struct ifaddr *)); -void in6_multilist __P((struct in6_multi *)); -struct in6_multi * in6_multientry __P((struct in6_multi *)); +const char *inet6_n2a(struct in6_addr *); +int main(void); +char *ifname(struct ifnet *); +void kread(u_long, void *, int); +void if6_addrlist(struct ifaddr *); +void in6_multilist(struct in6_multi *); +struct in6_multi * in6_multientry(struct in6_multi *); #define KREAD(addr, buf, type) \ kread((u_long)addr, (void *)buf, sizeof(type)) diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c index 7da5f7f619..0fcc6e96e0 100644 --- a/usr.sbin/inetd/builtins.c +++ b/usr.sbin/inetd/builtins.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/inetd/builtins.c,v 1.19.2.7 2002/07/22 14:05:56 fanf Exp $ - * $DragonFly: src/usr.sbin/inetd/builtins.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/inetd/builtins.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ * */ @@ -53,21 +53,21 @@ #include "inetd.h" -void chargen_dg __P((int, struct servtab *)); -void chargen_stream __P((int, struct servtab *)); -void daytime_dg __P((int, struct servtab *)); -void daytime_stream __P((int, struct servtab *)); -void discard_dg __P((int, struct servtab *)); -void discard_stream __P((int, struct servtab *)); -void echo_dg __P((int, struct servtab *)); -void echo_stream __P((int, struct servtab *)); -static int getline __P((int, char *, int)); -void iderror __P((int, int, int, const char *)); -void ident_stream __P((int, struct servtab *)); -void initring __P((void)); -unsigned long machtime __P((void)); -void machtime_dg __P((int, struct servtab *)); -void machtime_stream __P((int, struct servtab *)); +void chargen_dg(int, struct servtab *); +void chargen_stream(int, struct servtab *); +void daytime_dg(int, struct servtab *); +void daytime_stream(int, struct servtab *); +void discard_dg(int, struct servtab *); +void discard_stream(int, struct servtab *); +void echo_dg(int, struct servtab *); +void echo_stream(int, struct servtab *); +static int getline(int, char *, int); +void iderror(int, int, int, const char *); +void ident_stream(int, struct servtab *); +void initring(void); +unsigned long machtime(void); +void machtime_dg(int, struct servtab *); +void machtime_stream(int, struct servtab *); char ring[128]; char *endring; diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index a150169ebb..2340ab8544 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)from: inetd.c 8.4 (Berkeley) 4/13/94 * $FreeBSD: src/usr.sbin/inetd/inetd.c,v 1.80.2.11 2003/04/05 13:39:18 dwmalone Exp $ - * $DragonFly: src/usr.sbin/inetd/inetd.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/inetd/inetd.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* @@ -201,40 +201,40 @@ #define SIGBLOCK (sigmask(SIGCHLD)|sigmask(SIGHUP)|sigmask(SIGALRM)) -void close_sep __P((struct servtab *)); -void flag_signal __P((int)); -void flag_config __P((int)); -void config __P((void)); -int cpmip __P((const struct servtab *, int)); -void endconfig __P((void)); -struct servtab *enter __P((struct servtab *)); -void freeconfig __P((struct servtab *)); -struct servtab *getconfigent __P((void)); -int matchservent __P((const char *, const char *, const char *)); -char *nextline __P((FILE *)); -void addchild __P((struct servtab *, int)); -void flag_reapchild __P((int)); -void reapchild __P((void)); -void enable __P((struct servtab *)); -void disable __P((struct servtab *)); -void flag_retry __P((int)); -void retry __P((void)); -int setconfig __P((void)); -void setup __P((struct servtab *)); +void close_sep(struct servtab *); +void flag_signal(int); +void flag_config(int); +void config(void); +int cpmip(const struct servtab *, int); +void endconfig(void); +struct servtab *enter(struct servtab *); +void freeconfig(struct servtab *); +struct servtab *getconfigent(void); +int matchservent(const char *, const char *, const char *); +char *nextline(FILE *); +void addchild(struct servtab *, int); +void flag_reapchild(int); +void reapchild(void); +void enable(struct servtab *); +void disable(struct servtab *); +void flag_retry(int); +void retry(void); +int setconfig(void); +void setup(struct servtab *); #ifdef IPSEC -void ipsecsetup __P((struct servtab *)); +void ipsecsetup(struct servtab *); #endif -void unregisterrpc __P((register struct servtab *sep)); -static struct conninfo *search_conn __P((struct servtab *sep, int ctrl)); -static int room_conn __P((struct servtab *sep, struct conninfo *conn)); -static void addchild_conn __P((struct conninfo *conn, pid_t pid)); -static void reapchild_conn __P((pid_t pid)); -static void free_conn __P((struct conninfo *conn)); -static void resize_conn __P((struct servtab *sep, int maxperip)); -static void free_connlist __P((struct servtab *sep)); -static void free_proc __P((struct procinfo *)); -static struct procinfo *search_proc __P((pid_t pid, int add)); -static int hashval __P((char *p, int len)); +void unregisterrpc(register struct servtab *sep); +static struct conninfo *search_conn(struct servtab *sep, int ctrl); +static int room_conn(struct servtab *sep, struct conninfo *conn); +static void addchild_conn(struct conninfo *conn, pid_t pid); +static void reapchild_conn(pid_t pid); +static void free_conn(struct conninfo *conn); +static void resize_conn(struct servtab *sep, int maxperip); +static void free_connlist(struct servtab *sep); +static void free_proc(struct procinfo *); +static struct procinfo *search_proc(pid_t pid, int add); +static int hashval(char *p, int len); int allow_severity; int deny_severity; diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h index 6f68a6d608..b114b9eade 100644 --- a/usr.sbin/inetd/inetd.h +++ b/usr.sbin/inetd/inetd.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/inetd/inetd.h,v 1.4.2.4 2002/08/21 10:00:24 ume Exp $ - * $DragonFly: src/usr.sbin/inetd/inetd.h,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/inetd/inetd.h,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #include @@ -129,19 +129,19 @@ struct servtab { #define se_nomapped se_flags.se_nomapped #define se_reset se_flags.se_reset -int check_loop __P((const struct sockaddr *, const struct servtab *sep)); -int getvalue __P((const char *, int *, const char *)); -char *newstr __P((const char *)); -void inetd_setproctitle __P((const char *, int)); -void print_service __P((const char *, const struct servtab *)); -char *sskip __P((char **)); -char *skip __P((char **)); -struct servtab *tcpmux __P((int)); +int check_loop(const struct sockaddr *, const struct servtab *sep); +int getvalue(const char *, int *, const char *); +char *newstr(const char *); +void inetd_setproctitle(const char *, int); +void print_service(const char *, const struct servtab *); +char *sskip(char **); +char *skip(char **); +struct servtab *tcpmux(int); extern int debug; extern struct servtab *servtab; -typedef void (bi_fn_t) __P((int, struct servtab *)); +typedef void (bi_fn_t)(int, struct servtab *); struct biltin { const char *bi_service; /* internally provided service name */ diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index 27e689a1a4..3977cb3157 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.30.2.2 2001/06/08 18:27:32 sobomax Exp $ - * $DragonFly: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/kbdcontrol/kbdcontrol.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #include @@ -98,9 +98,9 @@ int number; char letter; int token; -int get_accent_definition_line __P((accentmap_t *)); -int get_key_definition_line __P((keymap_t *)); -void usage __P((void)); +int get_accent_definition_line(accentmap_t *); +int get_key_definition_line(keymap_t *); +void usage(void); char * nextarg(int ac, char **av, int *indp, int oc) diff --git a/usr.sbin/kbdcontrol/lex.h b/usr.sbin/kbdcontrol/lex.h index 0997c9f542..00b153f2fc 100644 --- a/usr.sbin/kbdcontrol/lex.h +++ b/usr.sbin/kbdcontrol/lex.h @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/kbdcontrol/lex.h,v 1.9.2.2 2001/06/08 18:27:32 sobomax Exp $ - * $DragonFly: src/usr.sbin/kbdcontrol/lex.h,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/kbdcontrol/lex.h,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #define TNOP 256 @@ -69,4 +69,4 @@ extern int number; extern char letter; extern FILE *yyin; -extern int yylex __P((void)); +extern int yylex(void); diff --git a/usr.sbin/keyadmin/keyadmin.c b/usr.sbin/keyadmin/keyadmin.c index a0266673b0..42b91faf9e 100644 --- a/usr.sbin/keyadmin/keyadmin.c +++ b/usr.sbin/keyadmin/keyadmin.c @@ -73,7 +73,7 @@ Research Laboratory (NRL). /* * $ANA: keyadmin.c,v 1.2 1996/06/13 19:42:40 wollman Exp $ - * $DragonFly: src/usr.sbin/keyadmin/keyadmin.c,v 1.2 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.sbin/keyadmin/keyadmin.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #include @@ -116,9 +116,9 @@ Research Laboratory (NRL). #include -int parse7 __P((int, char **)); -int parse4 __P((int, char **)); -int docmd __P((int, char **)); +int parse7(int, char **); +int parse4(int, char **); +int docmd(int, char **); #define KEYCMD_ARG_MAX 10 @@ -145,7 +145,7 @@ char parse4usage[] = " "; struct keycmd { char *name; int num; - int (*parse) __P((int, char **)); + int (*parse)(int, char **); char *usage; char *help; } keycmds[] = { diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c index c1cf9923e2..73f7941813 100644 --- a/usr.sbin/keyserv/crypt_server.c +++ b/usr.sbin/keyserv/crypt_server.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/keyserv/crypt_server.c,v 1.6.2.1 2001/07/19 04:21:20 kris Exp $ - * $DragonFly: src/usr.sbin/keyserv/crypt_server.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/keyserv/crypt_server.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ #include @@ -160,7 +160,7 @@ int _arcfour_crypt(buf, len, desp) return(DESERR_NOHWDEVICE); } -int (*_my_crypt)__P((char *, int, struct desparams *)) = NULL; +int (*_my_crypt)(char *, int, struct desparams *) = NULL; static void *dlhandle; diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c index c5e4a066d3..87393f1e3e 100644 --- a/usr.sbin/keyserv/keyserv.c +++ b/usr.sbin/keyserv/keyserv.c @@ -28,7 +28,7 @@ * * @(#)keyserv.c 1.15 94/04/25 SMI * $FreeBSD: src/usr.sbin/keyserv/keyserv.c,v 1.3.2.2 2001/07/19 10:58:22 roam Exp $ - * $DragonFly: src/usr.sbin/keyserv/keyserv.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/keyserv/keyserv.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* @@ -69,10 +69,10 @@ #define KEYSERVSOCK "/var/run/keyservsock" #endif -static void randomize __P(( des_block * )); -static void usage __P(( void )); -static int getrootkey __P(( des_block *, int )); -static int root_auth __P(( SVCXPRT *, struct svc_req * )); +static void randomize( des_block * ); +static void usage( void ); +static int getrootkey( des_block *, int ); +static int root_auth( SVCXPRT *, struct svc_req * ); #ifdef DEBUG static int debugging = 1; @@ -99,9 +99,9 @@ extern cryptkeyres *(*__key_decryptsession_pk_LOCAL)(); extern des_block *(*__key_gendes_LOCAL)(); extern int (*__des_crypt_LOCAL)(); -cryptkeyres *key_encrypt_pk_2_svc_prog __P(( uid_t, cryptkeyarg2 * )); -cryptkeyres *key_decrypt_pk_2_svc_prog __P(( uid_t, cryptkeyarg2 * )); -des_block *key_gen_1_svc_prog __P(( void *, struct svc_req * )); +cryptkeyres *key_encrypt_pk_2_svc_prog( uid_t, cryptkeyarg2 * ); +cryptkeyres *key_decrypt_pk_2_svc_prog( uid_t, cryptkeyarg2 * ); +des_block *key_gen_1_svc_prog( void *, struct svc_req * ); int main(argc, argv) diff --git a/usr.sbin/keyserv/keyserv.h b/usr.sbin/keyserv/keyserv.h index d24172180f..ace781ccd3 100644 --- a/usr.sbin/keyserv/keyserv.h +++ b/usr.sbin/keyserv/keyserv.h @@ -1,22 +1,22 @@ /* - * $DragonFly: src/usr.sbin/keyserv/keyserv.h,v 1.2 2003/11/03 19:14:36 eirikn Exp $ + * $DragonFly: src/usr.sbin/keyserv/keyserv.h,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ -extern void setmodulus __P((char *modx)); +extern void setmodulus(char *modx); -extern keystatus pk_setkey __P(( uid_t, keybuf ));; -extern keystatus pk_encrypt __P(( uid_t, char *, netobj *, des_block * )); -extern keystatus pk_decrypt __P(( uid_t, char *, netobj *, des_block * )); -extern keystatus pk_netput __P(( uid_t, key_netstarg * )); -extern keystatus pk_netget __P(( uid_t, key_netstarg * )); -extern keystatus pk_get_conv_key __P(( uid_t, keybuf, cryptkeyres * )); -extern void pk_nodefaultkeys __P(( void )); +extern keystatus pk_setkey( uid_t, keybuf );; +extern keystatus pk_encrypt( uid_t, char *, netobj *, des_block * ); +extern keystatus pk_decrypt( uid_t, char *, netobj *, des_block * ); +extern keystatus pk_netput( uid_t, key_netstarg * ); +extern keystatus pk_netget( uid_t, key_netstarg * ); +extern keystatus pk_get_conv_key( uid_t, keybuf, cryptkeyres * ); +extern void pk_nodefaultkeys( void ); -extern int __rpc_get_local_uid __P(( uid_t * , SVCXPRT * )); -extern void crypt_prog_1 __P(( struct svc_req *, register SVCXPRT * )); -extern void load_des __P(( int, char * )); +extern int __rpc_get_local_uid( uid_t * , SVCXPRT * ); +extern void crypt_prog_1( struct svc_req *, register SVCXPRT * ); +extern void load_des( int, char * ); -extern int (*_my_crypt)__P(( char *, int, struct desparams * )); +extern int (*_my_crypt)( char *, int, struct desparams * ); extern char ROOTKEY[]; diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c index e1f2c36981..a419031c88 100644 --- a/usr.sbin/keyserv/setkey.c +++ b/usr.sbin/keyserv/setkey.c @@ -28,7 +28,7 @@ * * @(#)setkey.c 1.11 94/04/25 SMI * $FreeBSD: src/usr.sbin/keyserv/setkey.c,v 1.3 1999/08/28 01:16:41 peter Exp $ - * $DragonFly: src/usr.sbin/keyserv/setkey.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/keyserv/setkey.c,v 1.3 2003/11/03 19:31:37 eirikn Exp $ */ /* @@ -55,12 +55,12 @@ #include "keyserv.h" static MINT *MODULUS; -static char *fetchsecretkey __P(( uid_t )); -static void writecache __P(( char *, char *, des_block * )); -static int readcache __P(( char *, char *, des_block * )); +static char *fetchsecretkey( uid_t ); +static void writecache( char *, char *, des_block * ); +static int readcache( char *, char *, des_block * ); static void extractdeskey __P (( MINT *, des_block * )); -static int storesecretkey __P(( uid_t, keybuf )); -static keystatus pk_crypt __P(( uid_t, char *, netobj *, des_block *, int)); +static int storesecretkey( uid_t, keybuf ); +static keystatus pk_crypt( uid_t, char *, netobj *, des_block *, int); static int nodefaultkeys = 0; @@ -125,8 +125,8 @@ pk_decrypt(uid, remote_name, remote_key, key) return (pk_crypt(uid, remote_name, remote_key, key, DES_DECRYPT)); } -static int store_netname __P(( uid_t, key_netstarg * )); -static int fetch_netname __P(( uid_t, key_netstarg * )); +static int store_netname( uid_t, key_netstarg * ); +static int fetch_netname( uid_t, key_netstarg * ); keystatus pk_netput(uid, netstore) diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index e628efbea2..e08ac500c1 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)kgmon.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.9 1999/08/28 01:16:42 peter Exp $ - * $DragonFly: src/usr.sbin/kgmon/kgmon.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/kgmon/kgmon.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include @@ -68,14 +68,14 @@ struct kvmvars { int Bflag, bflag, hflag, kflag, rflag, pflag; int debug = 0; -int getprof __P((struct kvmvars *)); -int getprofhz __P((struct kvmvars *)); -void kern_readonly __P((int)); -int openfiles __P((char *, char *, struct kvmvars *)); -void setprof __P((struct kvmvars *kvp, int state)); -void dumpstate __P((struct kvmvars *kvp)); -void reset __P((struct kvmvars *kvp)); -static void usage __P((void)); +int getprof(struct kvmvars *); +int getprofhz(struct kvmvars *); +void kern_readonly(int); +int openfiles(char *, char *, struct kvmvars *); +void setprof(struct kvmvars *kvp, int state); +void dumpstate(struct kvmvars *kvp); +void reset(struct kvmvars *kvp); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 7fb546c4ee..e1c4463634 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -31,7 +31,7 @@ * * $NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $ * $FreeBSD: src/usr.sbin/lastlogin/lastlogin.c,v 1.2.2.2 2001/07/19 05:02:46 kris Exp $ - * $DragonFly: src/usr.sbin/lastlogin/lastlogin.c,v 1.2 2003/06/17 04:29:55 dillon Exp $ + * $DragonFly: src/usr.sbin/lastlogin/lastlogin.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include @@ -46,9 +46,9 @@ static const char *logfile = _PATH_LASTLOG; - int main __P((int, char **)); -static void output __P((struct passwd *, struct lastlog *)); -static void usage __P((void)); + int main(int, char **); +static void output(struct passwd *, struct lastlog *); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 4020fea412..65922e1bac 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -34,7 +34,7 @@ * @(#) Copyright (c) 1983, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)lpd.c 8.7 (Berkeley) 5/10/95 * $FreeBSD: src/usr.sbin/lpr/lpd/lpd.c,v 1.12.2.22 2002/06/30 04:09:11 gad Exp $ - * $DragonFly: src/usr.sbin/lpr/lpd/lpd.c,v 1.2 2003/06/17 04:29:56 dillon Exp $ + * $DragonFly: src/usr.sbin/lpr/lpd/lpd.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ /* @@ -110,8 +110,8 @@ static int *socksetup(int _af, int _debuglvl); static void usage(void); /* XXX from libc/net/rcmd.c */ -extern int __ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t, - const char *, const char *)); +extern int __ivaliduser_sa(FILE *, struct sockaddr *, socklen_t, + const char *, const char *); uid_t uid, euid; diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index fd95446646..19f2229af4 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -1,7 +1,7 @@ /* $OpenBSD: mailwrapper.c,v 1.6 1999/12/17 05:06:28 mickey Exp $ */ /* $NetBSD: mailwrapper.c,v 1.3 1999/05/29 18:18:15 christos Exp $ */ /* $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.4.2.3 2001/10/01 12:52:47 dd Exp $ */ -/* $DragonFly: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/mailwrapper/mailwrapper.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ /* * Copyright (c) 1998 @@ -50,11 +50,11 @@ struct arglist { char **argv; }; -int main __P((int, char *[], char *[])); +int main(int, char *[], char *[]); -static void initarg __P((struct arglist *)); -static void addarg __P((struct arglist *, const char *, int)); -static void freearg __P((struct arglist *, int)); +static void initarg(struct arglist *); +static void addarg(struct arglist *, const char *, int); +static void freearg(struct arglist *, int); extern const char *__progname; /* from crt0.o */ diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c index e492a89a0d..30c64ce1e2 100644 --- a/usr.sbin/mrouted/callout.c +++ b/usr.sbin/mrouted/callout.c @@ -10,7 +10,7 @@ * callout.c,v 3.8.4.8 1998/01/06 01:58:45 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/callout.c,v 1.12 1999/08/28 01:17:03 peter Exp $ - * $DragonFly: src/usr.sbin/mrouted/callout.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/callout.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include "defs.h" @@ -28,7 +28,7 @@ struct timeout_q { }; #ifdef IGMP_DEBUG -static void print_Q __P((void)); +static void print_Q(void); #else #define print_Q() #endif diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y index 9ef799a80c..390232eda4 100644 --- a/usr.sbin/mrouted/cfparse.y +++ b/usr.sbin/mrouted/cfparse.y @@ -5,7 +5,7 @@ * Written by Bill Fenner, NRL, 1994 * * $FreeBSD: src/usr.sbin/mrouted/cfparse.y,v 1.10.2.2 2001/07/19 01:41:11 kris Exp $ - * $DragonFly: src/usr.sbin/mrouted/cfparse.y,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/cfparse.y,v 1.3 2003/11/03 19:31:38 eirikn Exp $ * cfparse.y,v 3.8.4.30 1998/03/01 01:48:58 fenner Exp */ #include @@ -20,14 +20,14 @@ /* * Local function declarations */ -static void fatal __P((char *fmt, ...)) __printflike(1, 2); -static void warn __P((char *fmt, ...)) __printflike(1, 2);; -static void yyerror __P((char *s)); -static char * next_word __P((void)); -static int yylex __P((void)); -static u_int32 valid_if __P((char *s)); -static struct ifreq * ifconfaddr __P((struct ifconf *ifcp, u_int32 a)); -int yyparse __P((void)); +static void fatal(char *fmt, ...) __printflike(1, 2); +static void warn(char *fmt, ...) __printflike(1, 2);; +static void yyerror(char *s); +static char * next_word(void); +static int yylex(void); +static u_int32 valid_if(char *s); +static struct ifreq * ifconfaddr(struct ifconf *ifcp, u_int32 a); +int yyparse(void); static FILE *f; diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h index b27ee0444f..eeb89c18ee 100644 --- a/usr.sbin/mrouted/defs.h +++ b/usr.sbin/mrouted/defs.h @@ -8,7 +8,7 @@ * * * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.12.2.1 2001/07/19 01:41:11 kris Exp $ - * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.3 2003/08/08 04:18:46 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.4 2003/11/03 19:31:38 eirikn Exp $ * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp */ @@ -66,8 +66,8 @@ typedef u_int u_int32; #endif #endif -typedef void (*cfunc_t) __P((void *)); -typedef void (*ihfunc_t) __P((int, fd_set *)); +typedef void (*cfunc_t)(void *); +typedef void (*ihfunc_t)(int, fd_set *); #include "dvmrp.h" #include "igmpv2.h" @@ -236,169 +236,169 @@ extern char * sys_errlist[]; #endif /* main.c */ -extern char * scaletime __P((u_long)); -extern void log __P((int, int, char *, ...)) __printflike(3, 4); -extern int register_input_handler __P((int, ihfunc_t)); +extern char * scaletime(u_long); +extern void log(int, int, char *, ...) __printflike(3, 4); +extern int register_input_handler(int, ihfunc_t); /* igmp.c */ -extern void init_igmp __P((void)); -extern void accept_igmp __P((int)); -extern void build_igmp __P((u_int32, u_int32, int, int, u_int32, - int)); -extern void send_igmp __P((u_int32, u_int32, int, int, u_int32, - int)); -extern char * igmp_packet_kind __P((u_int, u_int)); -extern int igmp_debug_kind __P((u_int, u_int)); +extern void init_igmp(void); +extern void accept_igmp(int); +extern void build_igmp(u_int32, u_int32, int, int, u_int32, + int); +extern void send_igmp(u_int32, u_int32, int, int, u_int32, + int); +extern char * igmp_packet_kind(u_int, u_int); +extern int igmp_debug_kind(u_int, u_int); /* icmp.c */ -extern void init_icmp __P((void)); +extern void init_icmp(void); /* ipip.c */ -extern void init_ipip __P((void)); -extern void init_ipip_on_vif __P((struct uvif *)); -extern void send_ipip __P((u_int32, u_int32, int, int, u_int32, - int, struct uvif *)); +extern void init_ipip(void); +extern void init_ipip_on_vif(struct uvif *); +extern void send_ipip(u_int32, u_int32, int, int, u_int32, + int, struct uvif *); /* callout.c */ -extern void callout_init __P((void)); -extern void free_all_callouts __P((void)); -extern void age_callout_queue __P((int)); -extern int timer_nextTimer __P((void)); -extern int timer_setTimer __P((int, cfunc_t, void *)); -extern int timer_clearTimer __P((int)); -extern int timer_leftTimer __P((int)); +extern void callout_init(void); +extern void free_all_callouts(void); +extern void age_callout_queue(int); +extern int timer_nextTimer(void); +extern int timer_setTimer(int, cfunc_t, void *); +extern int timer_clearTimer(int); +extern int timer_leftTimer(int); /* route.c */ -extern void init_routes __P((void)); -extern void start_route_updates __P((void)); -extern void update_route __P((u_int32, u_int32, u_int, u_int32, - vifi_t, struct listaddr *)); -extern void age_routes __P((void)); -extern void expire_all_routes __P((void)); -extern void free_all_routes __P((void)); -extern void accept_probe __P((u_int32, u_int32, char *, int, - u_int32)); -extern void accept_report __P((u_int32, u_int32, char *, int, - u_int32)); -extern struct rtentry * determine_route __P((u_int32 src)); -extern void report __P((int, vifi_t, u_int32)); -extern void report_to_all_neighbors __P((int)); -extern int report_next_chunk __P((void)); -extern void blaster_alloc __P((vifi_t)); -extern void add_vif_to_routes __P((vifi_t)); -extern void delete_vif_from_routes __P((vifi_t)); -extern void add_neighbor_to_routes __P((vifi_t, int)); -extern void delete_neighbor_from_routes __P((u_int32, - vifi_t, int)); -extern void dump_routes __P((FILE *fp)); +extern void init_routes(void); +extern void start_route_updates(void); +extern void update_route(u_int32, u_int32, u_int, u_int32, + vifi_t, struct listaddr *); +extern void age_routes(void); +extern void expire_all_routes(void); +extern void free_all_routes(void); +extern void accept_probe(u_int32, u_int32, char *, int, + u_int32); +extern void accept_report(u_int32, u_int32, char *, int, + u_int32); +extern struct rtentry * determine_route(u_int32 src); +extern void report(int, vifi_t, u_int32); +extern void report_to_all_neighbors(int); +extern int report_next_chunk(void); +extern void blaster_alloc(vifi_t); +extern void add_vif_to_routes(vifi_t); +extern void delete_vif_from_routes(vifi_t); +extern void add_neighbor_to_routes(vifi_t, int); +extern void delete_neighbor_from_routes(u_int32, + vifi_t, int); +extern void dump_routes(FILE *fp); /* vif.c */ -extern void init_vifs __P((void)); -extern void zero_vif __P((struct uvif *, int)); -extern void init_installvifs __P((void)); -extern void check_vif_state __P((void)); -extern void send_on_vif __P((struct uvif *, u_int32, int, int)); -extern vifi_t find_vif __P((u_int32, u_int32)); -extern void age_vifs __P((void)); -extern void dump_vifs __P((FILE *)); -extern void stop_all_vifs __P((void)); -extern struct listaddr *neighbor_info __P((vifi_t, u_int32)); -extern void accept_group_report __P((u_int32, u_int32, - u_int32, int)); -extern void query_groups __P((void)); -extern void probe_for_neighbors __P((void)); -extern struct listaddr *update_neighbor __P((vifi_t, u_int32, int, char *, int, - u_int32)); -extern void accept_neighbor_request __P((u_int32, u_int32)); -extern void accept_neighbor_request2 __P((u_int32, u_int32)); -extern void accept_info_request __P((u_int32, u_int32, - u_char *, int)); -extern void accept_info_reply __P((u_int32, u_int32, - u_char *, int)); -extern void accept_neighbors __P((u_int32, u_int32, - u_char *, int, u_int32)); -extern void accept_neighbors2 __P((u_int32, u_int32, - u_char *, int, u_int32)); -extern void accept_leave_message __P((u_int32, u_int32, - u_int32)); -extern void accept_membership_query __P((u_int32, u_int32, - u_int32, int)); +extern void init_vifs(void); +extern void zero_vif(struct uvif *, int); +extern void init_installvifs(void); +extern void check_vif_state(void); +extern void send_on_vif(struct uvif *, u_int32, int, int); +extern vifi_t find_vif(u_int32, u_int32); +extern void age_vifs(void); +extern void dump_vifs(FILE *); +extern void stop_all_vifs(void); +extern struct listaddr *neighbor_info(vifi_t, u_int32); +extern void accept_group_report(u_int32, u_int32, + u_int32, int); +extern void query_groups(void); +extern void probe_for_neighbors(void); +extern struct listaddr *update_neighbor(vifi_t, u_int32, int, char *, int, + u_int32); +extern void accept_neighbor_request(u_int32, u_int32); +extern void accept_neighbor_request2(u_int32, u_int32); +extern void accept_info_request(u_int32, u_int32, + u_char *, int); +extern void accept_info_reply(u_int32, u_int32, + u_char *, int); +extern void accept_neighbors(u_int32, u_int32, + u_char *, int, u_int32); +extern void accept_neighbors2(u_int32, u_int32, + u_char *, int, u_int32); +extern void accept_leave_message(u_int32, u_int32, + u_int32); +extern void accept_membership_query(u_int32, u_int32, + u_int32, int); /* config.c */ -extern void config_vifs_from_kernel __P((void)); +extern void config_vifs_from_kernel(void); /* cfparse.y */ -extern void config_vifs_from_file __P((void)); +extern void config_vifs_from_file(void); /* inet.c */ -extern int inet_valid_host __P((u_int32)); -extern int inet_valid_mask __P((u_int32)); -extern int inet_valid_subnet __P((u_int32, u_int32)); -extern char * inet_fmt __P((u_int32, char *)); -extern char * inet_fmts __P((u_int32, u_int32, char *)); -extern u_int32 inet_parse __P((char *, int)); -extern int inet_cksum __P((u_short *, u_int)); +extern int inet_valid_host(u_int32); +extern int inet_valid_mask(u_int32); +extern int inet_valid_subnet(u_int32, u_int32); +extern char * inet_fmt(u_int32, char *); +extern char * inet_fmts(u_int32, u_int32, char *); +extern u_int32 inet_parse(char *, int); +extern int inet_cksum(u_short *, u_int); /* prune.c */ extern unsigned kroutes; -extern void determine_forwvifs __P((struct gtable *)); -extern void send_prune_or_graft __P((struct gtable *)); -extern void add_table_entry __P((u_int32, u_int32)); -extern void del_table_entry __P((struct rtentry *, - u_int32, u_int)); -extern void update_table_entry __P((struct rtentry *, u_int32)); -extern int find_src_grp __P((u_int32, u_int32, u_int32)); -extern void init_ktable __P((void)); -extern void steal_sources __P((struct rtentry *)); -extern void reset_neighbor_state __P((vifi_t, u_int32)); -extern int grplst_mem __P((vifi_t, u_int32)); -extern void free_all_prunes __P((void)); -extern void age_table_entry __P((void)); -extern void dump_cache __P((FILE *)); -extern void update_lclgrp __P((vifi_t, u_int32)); -extern void delete_lclgrp __P((vifi_t, u_int32)); -extern void chkgrp_graft __P((vifi_t, u_int32)); -extern void accept_prune __P((u_int32, u_int32, char *, int)); -extern void accept_graft __P((u_int32, u_int32, char *, int)); -extern void accept_g_ack __P((u_int32, u_int32, char *, int)); +extern void determine_forwvifs(struct gtable *); +extern void send_prune_or_graft(struct gtable *); +extern void add_table_entry(u_int32, u_int32); +extern void del_table_entry(struct rtentry *, + u_int32, u_int); +extern void update_table_entry(struct rtentry *, u_int32); +extern int find_src_grp(u_int32, u_int32, u_int32); +extern void init_ktable(void); +extern void steal_sources(struct rtentry *); +extern void reset_neighbor_state(vifi_t, u_int32); +extern int grplst_mem(vifi_t, u_int32); +extern void free_all_prunes(void); +extern void age_table_entry(void); +extern void dump_cache(FILE *); +extern void update_lclgrp(vifi_t, u_int32); +extern void delete_lclgrp(vifi_t, u_int32); +extern void chkgrp_graft(vifi_t, u_int32); +extern void accept_prune(u_int32, u_int32, char *, int); +extern void accept_graft(u_int32, u_int32, char *, int); +extern void accept_g_ack(u_int32, u_int32, char *, int); /* u_int is promoted u_char */ -extern void accept_mtrace __P((u_int32, u_int32, - u_int32, char *, u_int, int)); +extern void accept_mtrace(u_int32, u_int32, + u_int32, char *, u_int, int); /* kern.c */ -extern void k_set_rcvbuf __P((int, int)); -extern void k_hdr_include __P((int)); -extern void k_set_ttl __P((int)); -extern void k_set_loop __P((int)); -extern void k_set_if __P((u_int32)); -extern void k_join __P((u_int32, u_int32)); -extern void k_leave __P((u_int32, u_int32)); -extern void k_init_dvmrp __P((void)); -extern void k_stop_dvmrp __P((void)); -extern void k_add_vif __P((vifi_t, struct uvif *)); -extern void k_del_vif __P((vifi_t)); -extern void k_add_rg __P((u_int32, struct gtable *)); -extern int k_del_rg __P((u_int32, struct gtable *)); -extern int k_get_version __P((void)); +extern void k_set_rcvbuf(int, int); +extern void k_hdr_include(int); +extern void k_set_ttl(int); +extern void k_set_loop(int); +extern void k_set_if(u_int32); +extern void k_join(u_int32, u_int32); +extern void k_leave(u_int32, u_int32); +extern void k_init_dvmrp(void); +extern void k_stop_dvmrp(void); +extern void k_add_vif(vifi_t, struct uvif *); +extern void k_del_vif(vifi_t); +extern void k_add_rg(u_int32, struct gtable *); +extern int k_del_rg(u_int32, struct gtable *); +extern int k_get_version(void); #ifdef SNMP /* prune.c */ -extern struct gtable * find_grp __P((u_int32)); -extern struct stable * find_grp_src __P((struct gtable *, u_int32)); -extern int next_grp_src_mask __P((struct gtable **, +extern struct gtable * find_grp(u_int32); +extern struct stable * find_grp_src(struct gtable *, u_int32); +extern int next_grp_src_mask(struct gtable **, struct stable **, u_int32, - u_int32, u_int32)); -extern void refresh_sg __P((struct sioc_sg_req *, struct gtable *, - struct stable *)); -extern int next_child __P((struct gtable **, struct stable **, + u_int32, u_int32); +extern void refresh_sg(struct sioc_sg_req *, struct gtable *, + struct stable *); +extern int next_child(struct gtable **, struct stable **, u_int32, u_int32, u_int32, - vifi_t *)); + vifi_t *); /* route.c */ -extern struct rtentry * snmp_find_route __P((u_int32, u_int32)); -extern int next_route __P((struct rtentry **, u_int32, u_int32)); -extern int next_route_child __P((struct rtentry **, - u_int32, u_int32, vifi_t *)); +extern struct rtentry * snmp_find_route(u_int32, u_int32); +extern int next_route(struct rtentry **, u_int32, u_int32); +extern int next_route_child(struct rtentry **, + u_int32, u_int32, vifi_t *); #endif #ifdef RSRR @@ -407,8 +407,8 @@ extern struct gtable *kernel_table; extern struct gtable *gtp; /* rsrr.c */ -extern void rsrr_init __P((void)); -extern void rsrr_clean __P((void)); -extern void rsrr_cache_send __P((struct gtable *, int)); -extern void rsrr_cache_clean __P((struct gtable *)); +extern void rsrr_init(void); +extern void rsrr_clean(void); +extern void rsrr_cache_send(struct gtable *, int); +extern void rsrr_cache_clean(struct gtable *); #endif /* RSRR */ diff --git a/usr.sbin/mrouted/icmp.c b/usr.sbin/mrouted/icmp.c index ca668facdd..62ff768a2c 100644 --- a/usr.sbin/mrouted/icmp.c +++ b/usr.sbin/mrouted/icmp.c @@ -8,15 +8,15 @@ * * * @(#) $Id icmp.c,v 3.8.4.2 1998/01/06 01:57:42 fenner Exp $ - * $DragonFly: src/usr.sbin/mrouted/icmp.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/icmp.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include "defs.h" static int icmp_socket; -static void icmp_handler __P((int, fd_set *)); -static char * icmp_name __P((struct icmp *)); +static void icmp_handler(int, fd_set *); +static char * icmp_name(struct icmp *); void init_icmp() diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c index d294e6acd1..a708db1cbe 100644 --- a/usr.sbin/mrouted/igmp.c +++ b/usr.sbin/mrouted/igmp.c @@ -10,7 +10,7 @@ * igmp.c,v 3.8.4.19 1998/01/06 01:57:43 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/igmp.c,v 1.16 1999/08/28 01:17:04 peter Exp $ - * $DragonFly: src/usr.sbin/mrouted/igmp.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/igmp.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include "defs.h" @@ -30,7 +30,7 @@ u_int32 dvmrp_genid; /* IGMP generation id */ * Local function definitions. */ /* u_char promoted to u_int */ -static int igmp_log_level __P((u_int type, u_int code)); +static int igmp_log_level(u_int type, u_int code); /* * Open and initialize the igmp socket, and fill in the non-changing diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c index 5ee93c49eb..eaef83f4bd 100644 --- a/usr.sbin/mrouted/main.c +++ b/usr.sbin/mrouted/main.c @@ -10,7 +10,7 @@ * main.c,v 3.8.4.29 1998/03/01 01:49:00 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/main.c,v 1.16.2.4 2002/09/12 16:27:49 nectar Exp $ - * $DragonFly: src/usr.sbin/mrouted/main.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/main.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ /* @@ -106,21 +106,21 @@ static struct debugname { /* * Forward declarations. */ -static void final_init __P((void *)); -static void fasttimer __P((void *)); -static void timer __P((void *)); -static void dump __P((void)); -static void dump_version __P((FILE *)); -static void fdump __P((void)); -static void cdump __P((void)); -static void restart __P((void)); -static void handler __P((int)); -static void cleanup __P((void)); -static void resetlogging __P((void *)); -static void usage __P((void)); +static void final_init(void *); +static void fasttimer(void *); +static void timer(void *); +static void dump(void); +static void dump_version(FILE *); +static void fdump(void); +static void cdump(void); +static void restart(void); +static void handler(int); +static void cleanup(void); +static void resetlogging(void *); +static void usage(void); /* To shut up gcc -Wstrict-prototypes */ -int main __P((int argc, char **argv)); +int main(int argc, char **argv); int register_input_handler(fd, func) diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c index 3128f50481..e2e057601e 100644 --- a/usr.sbin/mrouted/mapper.c +++ b/usr.sbin/mrouted/mapper.c @@ -4,7 +4,7 @@ * mapper.c,v 3.8.4.3 1998/01/06 01:57:47 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/mapper.c,v 1.15.2.1 2002/09/12 16:27:49 nectar Exp $ - * $DragonFly: src/usr.sbin/mrouted/mapper.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/mapper.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ /* @@ -78,23 +78,23 @@ int show_names = TRUE; vifi_t numvifs; /* to keep loader happy */ /* (see COPY_TABLES macro called in kern.c) */ -Node * find_node __P((u_int32 addr, Node **ptr)); -Interface * find_interface __P((u_int32 addr, Node *node)); -Neighbor * find_neighbor __P((u_int32 addr, Node *node)); -int main __P((int argc, char *argv[])); -void ask __P((u_int32 dst)); -void ask2 __P((u_int32 dst)); -int retry_requests __P((Node *node)); -char * inet_name __P((u_int32 addr)); -void print_map __P((Node *node)); -char * graph_name __P((u_int32 addr, char *buf, int len)); -void graph_edges __P((Node *node)); -void elide_aliases __P((Node *node)); -void graph_map __P((void)); -int get_number __P((int *var, int deflt, char ***pargv, - int *pargc)); -u_int32 host_addr __P((char *name)); -static void usage __P((void)); +Node * find_node(u_int32 addr, Node **ptr); +Interface * find_interface(u_int32 addr, Node *node); +Neighbor * find_neighbor(u_int32 addr, Node *node); +int main(int argc, char *argv[]); +void ask(u_int32 dst); +void ask2(u_int32 dst); +int retry_requests(Node *node); +char * inet_name(u_int32 addr); +void print_map(Node *node); +char * graph_name(u_int32 addr, char *buf, int len); +void graph_edges(Node *node); +void elide_aliases(Node *node); +void graph_map(void); +int get_number(int *var, int deflt, char ***pargv, + int *pargc); +u_int32 host_addr(char *name); +static void usage(void); Node *find_node(addr, ptr) diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c index 5ecc50e4ea..8b5ae687c2 100644 --- a/usr.sbin/mrouted/mrinfo.c +++ b/usr.sbin/mrouted/mrinfo.c @@ -60,7 +60,7 @@ * * @(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp * $FreeBSD: src/usr.sbin/mrouted/mrinfo.c,v 1.17.2.1 2002/09/12 16:27:49 nectar Exp $ - * $DragonFly: src/usr.sbin/mrouted/mrinfo.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/mrinfo.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include @@ -86,16 +86,16 @@ int target_level = 0; vifi_t numvifs; /* to keep loader happy */ /* (see COPY_TABLES macro called in kern.c) */ -char * inet_name __P((u_int32 addr)); -void ask __P((u_int32 dst)); -void ask2 __P((u_int32 dst)); -int get_number __P((int *var, int deflt, char ***pargv, - int *pargc)); -u_int32 host_addr __P((char *name)); -static void usage __P((void)); +char * inet_name(u_int32 addr); +void ask(u_int32 dst); +void ask2(u_int32 dst); +int get_number(int *var, int deflt, char ***pargv, + int *pargc); +u_int32 host_addr(char *name); +static void usage(void); /* to shut up -Wstrict-prototypes */ -int main __P((int argc, char *argv[])); +int main(int argc, char *argv[]); char * diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c index 53c1e27baa..07c30e887e 100644 --- a/usr.sbin/mrouted/mtrace.c +++ b/usr.sbin/mrouted/mtrace.c @@ -110,7 +110,7 @@ * The mtrace program is COPYRIGHT 1998 by Xerox Corporation. * * $FreeBSD: src/usr.sbin/mrouted/mtrace.c,v 1.17.2.3 2002/09/12 16:27:49 nectar Exp $ - * $DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include @@ -149,7 +149,7 @@ typedef unsigned int u_int32; /* XXX */ #include "mtrace.h" -const char version[] = "$DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.2 2003/06/17 04:29:57 dillon Exp $"; +const char version[] = "$DragonFly: src/usr.sbin/mrouted/mtrace.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $"; #define DEFAULT_TIMEOUT 3 /* How long to wait before retrying requests */ #define DEFAULT_RETRIES 3 /* How many times to try */ @@ -308,68 +308,68 @@ int ip_addlen = 0; /* Workaround for Option bug #2 */ #endif #endif -typedef int (*callback_t) __P((int, u_char *, int, struct igmp *, int, - struct sockaddr *, int *, struct timeval *)); +typedef int (*callback_t)(int, u_char *, int, struct igmp *, int, + struct sockaddr *, int *, struct timeval *); -void init_igmp __P((void)); -void send_igmp __P((u_int32 src, u_int32 dst, int type, +void init_igmp(void); +void send_igmp(u_int32 src, u_int32 dst, int type, int code, u_int32 group, - int datalen)); -int inet_cksum __P((u_short *addr, u_int len)); -void k_set_rcvbuf __P((int bufsize)); -void k_hdr_include __P((int bool)); -void k_set_ttl __P((int t)); -void k_set_loop __P((int l)); -void k_set_if __P((u_int32 ifa)); -void k_join __P((u_int32 grp, u_int32 ifa)); -void k_leave __P((u_int32 grp, u_int32 ifa)); -char * inet_fmt __P((u_int32 addr, char *s)); -char * inet_fmts __P((u_int32 addr, u_int32 mask, char *s)); -char * inet_name __P((u_int32 addr)); -u_int32 host_addr __P((char *name)); + int datalen); +int inet_cksum(u_short *addr, u_int len); +void k_set_rcvbuf(int bufsize); +void k_hdr_include(int bool); +void k_set_ttl(int t); +void k_set_loop(int l); +void k_set_if(u_int32 ifa); +void k_join(u_int32 grp, u_int32 ifa); +void k_leave(u_int32 grp, u_int32 ifa); +char * inet_fmt(u_int32 addr, char *s); +char * inet_fmts(u_int32 addr, u_int32 mask, char *s); +char * inet_name(u_int32 addr); +u_int32 host_addr(char *name); /* u_int is promoted u_char */ -char * proto_type __P((u_int type)); -char * flag_type __P((u_int type)); - -u_int32 get_netmask __P((int s, u_int32 *dst)); -int get_ttl __P((struct resp_buf *buf)); -int t_diff __P((u_long a, u_long b)); -u_long byteswap __P((u_long v)); -int mtrace_callback __P((int, u_char *, int, struct igmp *, +char * proto_type(u_int type); +char * flag_type(u_int type); + +u_int32 get_netmask(int s, u_int32 *dst); +int get_ttl(struct resp_buf *buf); +int t_diff(u_long a, u_long b); +u_long byteswap(u_long v); +int mtrace_callback(int, u_char *, int, struct igmp *, int, struct sockaddr *, int *, - struct timeval *)); -int send_recv __P((u_int32 dst, int type, int code, + struct timeval *); +int send_recv(u_int32 dst, int type, int code, int tries, struct resp_buf *save, - callback_t callback)); -void passive_mode __P((void)); -char * print_host __P((u_int32 addr)); -char * print_host2 __P((u_int32 addr1, u_int32 addr2)); -void print_trace __P((int idx, struct resp_buf *buf, - char **names)); -int what_kind __P((struct resp_buf *buf, char *why)); -char * scale __P((int *hop)); -void stat_line __P((struct tr_resp *r, struct tr_resp *s, - int have_next, int *res)); -void fixup_stats __P((struct resp_buf *base, + callback_t callback); +void passive_mode(void); +char * print_host(u_int32 addr); +char * print_host2(u_int32 addr1, u_int32 addr2); +void print_trace(int idx, struct resp_buf *buf, + char **names); +int what_kind(struct resp_buf *buf, char *why); +char * scale(int *hop); +void stat_line(struct tr_resp *r, struct tr_resp *s, + int have_next, int *res); +void fixup_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new, - int *bugs)); -int check_thresh __P((int thresh, + int *bugs); +int check_thresh(int thresh, struct resp_buf *base, struct resp_buf *prev, - struct resp_buf *new)); -int print_stats __P((struct resp_buf *base, + struct resp_buf *new); +int print_stats(struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new, int *bugs, - char **names)); -int path_changed __P((struct resp_buf *base, - struct resp_buf *new)); -void check_vif_state __P((void)); - -int main __P((int argc, char *argv[])); -void log __P((int, int, char *, ...)); -static void usage __P((void)); + char **names); +int path_changed(struct resp_buf *base, + struct resp_buf *new); +void check_vif_state(void); + +int main(int argc, char *argv[]); +void log(int, int, char *, ...); +static void usage(void); /* diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c index 82cfa4b4c3..bfee2197d5 100644 --- a/usr.sbin/mrouted/prune.c +++ b/usr.sbin/mrouted/prune.c @@ -10,7 +10,7 @@ * prune.c,v 3.8.4.59 1998/03/01 02:06:32 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/prune.c,v 1.17.2.1 2000/10/29 03:59:57 kris Exp $ - * $DragonFly: src/usr.sbin/mrouted/prune.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/prune.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include "defs.h" @@ -42,20 +42,20 @@ unsigned int kroutes; /* current number of cache entries */ /**************************************************************************** Functions that are local to prune.c ****************************************************************************/ -static int scoped_addr __P((vifi_t vifi, u_int32 addr)); -static void prun_add_ttls __P((struct gtable *gt)); -static int pruning_neighbor __P((vifi_t vifi, u_int32 addr)); -static int can_mtrace __P((vifi_t vifi, u_int32 addr)); -static struct ptable * find_prune_entry __P((u_int32 vr, struct ptable *pt)); -static void remove_sources __P((struct gtable *gt)); -static void rexmit_prune __P((void *arg)); -static void expire_prune __P((vifi_t vifi, struct gtable *gt)); -static void send_prune __P((struct gtable *gt)); -static void send_graft __P((struct gtable *gt)); -static void send_graft_ack __P((u_int32 src, u_int32 dst, +static int scoped_addr(vifi_t vifi, u_int32 addr); +static void prun_add_ttls(struct gtable *gt); +static int pruning_neighbor(vifi_t vifi, u_int32 addr); +static int can_mtrace(vifi_t vifi, u_int32 addr); +static struct ptable * find_prune_entry(u_int32 vr, struct ptable *pt); +static void remove_sources(struct gtable *gt); +static void rexmit_prune(void *arg); +static void expire_prune(vifi_t vifi, struct gtable *gt); +static void send_prune(struct gtable *gt); +static void send_graft(struct gtable *gt); +static void send_graft_ack(u_int32 src, u_int32 dst, u_int32 origin, u_int32 grp, - vifi_t vifi)); -static void update_kernel __P((struct gtable *g)); + vifi_t vifi); +static void update_kernel(struct gtable *g); /* * Updates the ttl values for each vif. diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c index 2bd0e58e38..0f1248c500 100644 --- a/usr.sbin/mrouted/route.c +++ b/usr.sbin/mrouted/route.c @@ -10,7 +10,7 @@ * route.c,v 3.8.4.41 1998/01/15 00:08:34 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/route.c,v 1.12 1999/08/28 01:17:08 peter Exp $ - * $DragonFly: src/usr.sbin/mrouted/route.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/route.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include "defs.h" @@ -42,17 +42,17 @@ unsigned int nroutes; /* current number of route entries */ /* * Private functions. */ -static int init_children_and_leaves __P((struct rtentry *r, - vifi_t parent, int first)); -static int find_route __P((u_int32 origin, u_int32 mask)); -static void create_route __P((u_int32 origin, u_int32 mask)); -static void discard_route __P((struct rtentry *prev_r)); -static int compare_rts __P((const void *rt1, const void *rt2)); -static int report_chunk __P((int, struct rtentry *start_rt, vifi_t vifi, - u_int32 dst)); -static void queue_blaster_report __P((vifi_t, u_int32, u_int32, char *, - int, u_int32)); -static void process_blaster_report __P((void *)); +static int init_children_and_leaves(struct rtentry *r, + vifi_t parent, int first); +static int find_route (u_int32 origin, u_int32 mask); +static void create_route(u_int32 origin, u_int32 mask); +static void discard_route(struct rtentry *prev_r); +static int compare_rts (const void *rt1, const void *rt2); +static int report_chunk (int, struct rtentry *start_rt, vifi_t vifi, + u_int32 dst); +static void queue_blaster_report(vifi_t, u_int32, u_int32, char *, + int, u_int32); +static void process_blaster_report(void *); #ifdef SNMP #include diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c index 7eb1366c2f..ff557206d5 100644 --- a/usr.sbin/mrouted/rsrr.c +++ b/usr.sbin/mrouted/rsrr.c @@ -24,7 +24,7 @@ * noted when applicable. * * $FreeBSD: src/usr.sbin/mrouted/rsrr.c,v 1.8.2.1 2001/05/12 09:48:20 kris Exp $ - * $DragonFly: src/usr.sbin/mrouted/rsrr.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/rsrr.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ /* RSRR code written by Daniel Zappala, USC Information Sciences Institute, @@ -59,14 +59,14 @@ int client_length = sizeof(client_addr); /* * Procedure definitions needed internally. */ -static void rsrr_accept __P((int recvlen)); -static void rsrr_accept_iq __P((void)); -static int rsrr_accept_rq __P((struct rsrr_rq *route_query, int flags, - struct gtable *gt_notify)); -static void rsrr_read __P((int, fd_set *)); -static int rsrr_send __P((int sendlen)); -static void rsrr_cache __P((struct gtable *gt, - struct rsrr_rq *route_query)); +static void rsrr_accept(int recvlen); +static void rsrr_accept_iq(void); +static int rsrr_accept_rq(struct rsrr_rq *route_query, int flags, + struct gtable *gt_notify); +static void rsrr_read(int, fd_set *); +static int rsrr_send(int sendlen); +static void rsrr_cache(struct gtable *gt, + struct rsrr_rq *route_query); /* Initialize RSRR socket */ void diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c index 7ed70841e3..57774fa8bd 100644 --- a/usr.sbin/mrouted/vif.c +++ b/usr.sbin/mrouted/vif.c @@ -10,7 +10,7 @@ * vif.c,v 3.8.4.56.2.1 1999/01/20 05:18:50 fenner Exp * * $FreeBSD: src/usr.sbin/mrouted/vif.c,v 1.15 1999/08/28 01:17:09 peter Exp $ - * $DragonFly: src/usr.sbin/mrouted/vif.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mrouted/vif.c,v 1.3 2003/11/03 19:31:38 eirikn Exp $ */ #include "defs.h" @@ -43,19 +43,19 @@ typedef struct { /* * Forward declarations. */ -static void start_vif __P((vifi_t vifi)); -static void start_vif2 __P((vifi_t vifi)); -static void stop_vif __P((vifi_t vifi)); -static void age_old_hosts __P((void)); -static void send_probe_on_vif __P((struct uvif *v)); -static void send_query __P((struct uvif *v)); -static int info_version __P((char *p, int plen)); -static void DelVif __P((void *arg)); -static int SetTimer __P((int vifi, struct listaddr *g)); -static int DeleteTimer __P((int id)); -static void SendQuery __P((void *arg)); -static int SetQueryTimer __P((struct listaddr *g, vifi_t vifi, int to_expire, - int q_time)); +static void start_vif(vifi_t vifi); +static void start_vif2(vifi_t vifi); +static void stop_vif(vifi_t vifi); +static void age_old_hosts(void); +static void send_probe_on_vif(struct uvif *v); +static void send_query(struct uvif *v); +static int info_version(char *p, int plen); +static void DelVif(void *arg); +static int SetTimer(int vifi, struct listaddr *g); +static int DeleteTimer(int id); +static void SendQuery(void *arg); +static int SetQueryTimer(struct listaddr *g, vifi_t vifi, int to_expire, + int q_time); /* diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c index 73a60b47c5..f7283394ae 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/mtree/compare.c @@ -32,7 +32,7 @@ * * @(#)compare.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/compare.c,v 1.15.2.4 2003/05/07 17:55:17 tobez Exp $ - * $DragonFly: src/usr.sbin/mtree/compare.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/compare.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -59,7 +59,7 @@ extern int uflag; extern int lineno; -static char *ftype __P((u_int)); +static char *ftype(u_int); #define INDENTNAMELEN 8 #define LABEL \ diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index 949f6af49e..357cdc6b94 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -32,7 +32,7 @@ * * @(#)create.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/create.c,v 1.18.2.3 2001/01/12 19:17:18 phk Exp $ - * $DragonFly: src/usr.sbin/mtree/create.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/create.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -75,11 +75,11 @@ static uid_t uid; static mode_t mode; static u_long flags = 0xffffffff; -static int dsort __P((const FTSENT **, const FTSENT **)); -static void output __P((int, int *, const char *, ...)); -static int statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, - u_long *)); -static void statf __P((int, FTSENT *)); +static int dsort(const FTSENT **, const FTSENT **); +static void output(int, int *, const char *, ...); +static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, + u_long *); +static void statf(int, FTSENT *); void cwalk() diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h index c566045a1d..21ff5991dd 100644 --- a/usr.sbin/mtree/extern.h +++ b/usr.sbin/mtree/extern.h @@ -32,20 +32,20 @@ * * @(#)extern.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/extern.h,v 1.3.2.2 2000/06/28 02:33:17 joe Exp $ - * $DragonFly: src/usr.sbin/mtree/extern.h,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/extern.h,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ -int compare __P((char *, NODE *, FTSENT *)); -int crc __P((int, u_long *, u_long *)); -void cwalk __P((void)); -char *flags_to_string __P((u_long)); +int compare(char *, NODE *, FTSENT *); +int crc(int, u_long *, u_long *); +void cwalk(void); +char *flags_to_string(u_long); -char *inotype __P((u_int)); -u_int parsekey __P((char *, int *)); -char *rlink __P((char *)); -NODE *spec __P((void)); -int verify __P((void)); +char *inotype(u_int); +u_int parsekey(char *, int *); +char *rlink(char *); +NODE *spec(void); +int verify(void); -int check_excludes __P((const char *, const char *)); -void init_excludes __P((void)); -void read_excludes_file __P((const char *)); +int check_excludes(const char *, const char *); +void init_excludes(void); +void read_excludes_file(const char *); diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c index 65f8770447..c8aeb56216 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/mtree/misc.c @@ -32,7 +32,7 @@ * * @(#)misc.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/misc.c,v 1.8.2.1 2000/06/28 02:33:17 joe Exp $ - * $DragonFly: src/usr.sbin/mtree/misc.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/misc.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -87,7 +87,7 @@ parsekey(name, needvaluep) int *needvaluep; { KEY *k, tmp; - int keycompare __P((const void *, const void *)); + int keycompare(const void *, const void *); tmp.name = name; k = (KEY *)bsearch(&tmp, keylist, sizeof(keylist) / sizeof(KEY), diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index 8dbf05f741..adf9b78599 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1989, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)mtree.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/mtree.c,v 1.8.2.3 2003/05/07 17:55:17 tobez Exp $ - * $DragonFly: src/usr.sbin/mtree/mtree.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/mtree.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -53,7 +53,7 @@ int cflag, dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, Uflag; u_int keys; char fullpath[MAXPATHLEN]; -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c index 4de9b4f5de..2e96355ad5 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/mtree/spec.c @@ -32,7 +32,7 @@ * * @(#)spec.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/spec.c,v 1.13.2.1 2000/06/28 02:33:17 joe Exp $ - * $DragonFly: src/usr.sbin/mtree/spec.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/spec.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -51,8 +51,8 @@ int lineno; /* Current spec line number. */ -static void set __P((char *, NODE *)); -static void unset __P((char *, NODE *)); +static void set(char *, NODE *); +static void unset(char *, NODE *); NODE * spec() diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c index a7244a4415..85833b5dcf 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/mtree/verify.c @@ -32,7 +32,7 @@ * * @(#)verify.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/mtree/verify.c,v 1.10.2.2 2001/01/12 19:17:18 phk Exp $ - * $DragonFly: src/usr.sbin/mtree/verify.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ + * $DragonFly: src/usr.sbin/mtree/verify.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -56,8 +56,8 @@ extern int lineno; static NODE *root; static char path[MAXPATHLEN]; -static void miss __P((NODE *, char *)); -static int vwalk __P((void)); +static void miss(NODE *, char *); +static int vwalk(void); int verify() diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 5748b2e270..2ecaa186a6 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.2.2.5 2001/08/13 02:58:26 sumikawa Exp $ */ -/* $DragonFly: src/usr.sbin/ndp/ndp.c,v 1.2 2003/06/17 04:29:57 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/ndp/ndp.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ /* $KAME: ndp.c,v 1.65 2001/05/08 04:36:34 itojun Exp $ */ /* @@ -135,33 +135,33 @@ char ntop_buf[INET6_ADDRSTRLEN]; /* inet_ntop() */ char host_buf[NI_MAXHOST]; /* getnameinfo() */ char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ -int main __P((int, char **)); -int file __P((char *)); -void getsocket __P((void)); -int set __P((int, char **)); -void get __P((char *)); -int delete __P((char *)); -void dump __P((struct in6_addr *)); -static struct in6_nbrinfo *getnbrinfo __P((struct in6_addr *addr, - int ifindex, int)); -static char *ether_str __P((struct sockaddr_dl *)); -int ndp_ether_aton __P((char *, u_char *)); -void usage __P((void)); -int rtmsg __P((int)); -void ifinfo __P((int, char **)); -void rtrlist __P((void)); -void plist __P((void)); -void pfx_flush __P((void)); -void rtrlist __P((void)); -void rtr_flush __P((void)); -void harmonize_rtr __P((void)); +int main(int, char **); +int file(char *); +void getsocket(void); +int set(int, char **); +void get(char *); +int delete(char *); +void dump(struct in6_addr *); +static struct in6_nbrinfo *getnbrinfo(struct in6_addr *addr, + int ifindex, int); +static char *ether_str(struct sockaddr_dl *); +int ndp_ether_aton(char *, u_char *); +void usage(void); +int rtmsg(int); +void ifinfo(int, char **); +void rtrlist(void); +void plist(void); +void pfx_flush(void); +void rtrlist(void); +void rtr_flush(void); +void harmonize_rtr(void); #ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */ -static void getdefif __P((void)); -static void setdefif __P((char *)); +static void getdefif(void); +static void setdefif(char *); #endif -static char *sec2str __P((time_t t)); -static char *ether_str __P((struct sockaddr_dl *sdl)); -static void ts_print __P((const struct timeval *)); +static char *sec2str(time_t t); +static char *ether_str(struct sockaddr_dl *sdl); +static void ts_print(const struct timeval *); static char *rtpref_str[] = { "medium", /* 00 */ diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c index 8851a6b017..38170b25c5 100644 --- a/usr.sbin/pccard/pccardc/enabler.c +++ b/usr.sbin/pccard/pccardc/enabler.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/pccard/pccardc/enabler.c,v 1.13 1999/08/28 01:17:32 peter Exp $ - * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/enabler.c,v 1.3 2003/08/08 04:18:46 dillon Exp $ + * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/enabler.c,v 1.4 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -38,7 +38,7 @@ #include #include -static void usage __P((char *)); +static void usage(char *); int enabler_main(argc, argv) diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index e99e86f50d..ca1ff183b0 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -18,7 +18,7 @@ * This is the add module. * * $FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.29.2.20 2002/10/08 05:35:46 bmah Exp $ - * $DragonFly: src/usr.sbin/pkg_install/add/Attic/main.c,v 1.2 2003/06/17 04:29:59 dillon Exp $ + * $DragonFly: src/usr.sbin/pkg_install/add/Attic/main.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -69,7 +69,7 @@ struct { static char *getpackagesite(void); int getosreldate(void); -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index ff8651ce49..8fc93b85df 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -8,7 +8,7 @@ * This is the create module. * * $FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.21.2.7 2002/05/29 18:31:11 obrien Exp $ - * $DragonFly: src/usr.sbin/pkg_install/create/Attic/main.c,v 1.2 2003/06/17 04:29:59 dillon Exp $ + * $DragonFly: src/usr.sbin/pkg_install/create/Attic/main.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -38,7 +38,7 @@ int Dereference = FALSE; int PlistOnly = FALSE; enum zipper Zipper = GZIP; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index 7c09474e8d..e2fa932f80 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -17,7 +17,7 @@ * This is the delete module. * * $FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.17.2.8 2002/08/20 06:35:07 obrien Exp $ - * $DragonFly: src/usr.sbin/pkg_install/delete/Attic/main.c,v 1.2 2003/06/17 04:29:59 dillon Exp $ + * $DragonFly: src/usr.sbin/pkg_install/delete/Attic/main.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include @@ -35,7 +35,7 @@ Boolean NoDeInstall = FALSE; Boolean Recursive = FALSE; match_t MatchType = MATCH_GLOB; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index cdb5c14698..063f6bc50e 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -18,7 +18,7 @@ * This is the info module. * * $FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.22.2.14 2002/08/20 06:35:08 obrien Exp $ - * $DragonFly: src/usr.sbin/pkg_install/info/Attic/main.c,v 1.2 2003/06/17 04:29:59 dillon Exp $ + * $DragonFly: src/usr.sbin/pkg_install/info/Attic/main.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ #include "lib.h" @@ -36,7 +36,7 @@ char *CheckPkg = NULL; char *LookUpOrigin = NULL; struct which_head *whead; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h index 4d3f7d14ae..d2ca2d5644 100644 --- a/usr.sbin/pkg_install/sign/extern.h +++ b/usr.sbin/pkg_install/sign/extern.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/pkg_install/sign/extern.h,v 1.1.2.2 2001/05/17 12:33:39 sobomax Exp $ */ -/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/extern.h,v 1.2 2003/06/17 04:29:59 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/extern.h,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ /* $OpenBSD: extern.h,v 1.3 1999/10/07 16:30:32 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -46,19 +46,19 @@ extern int quiet; extern char *userkey; /* common.c */ -extern int read_header_and_diagnose __P((FILE *file, \ +extern int read_header_and_diagnose(FILE *file, \ /*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \ - const char *filename)); -extern int reap __P((pid_t pid)); + const char *filename); +extern int reap(pid_t pid); /* sign.c */ -extern int sign __P((/*@observer@*/const char *filename, int type, \ - /*@null@*/const char *userid, char *envp[])); +extern int sign(/*@observer@*/const char *filename, int type, \ + /*@null@*/const char *userid, char *envp[]); /* check.c */ -extern int check_signature __P((/*@dependent@*/FILE *file, \ +extern int check_signature(/*@dependent@*/FILE *file, \ /*@null@*/const char *userid, char *envp[], \ - /*@observer@*/const char *filename)); + /*@observer@*/const char *filename); #define PKG_BADSIG 0 #define PKG_GOODSIG 1 @@ -73,29 +73,29 @@ typedef /*@observer@*/char *pchar; /* sha1.c */ #define SHA1_DB_NAME "/var/db/pkg/SHA1" -extern void *new_sha1_checker __P((struct mygzip_header *h, \ +extern void *new_sha1_checker(struct mygzip_header *h, \ struct signature *sign, const char *userid, char *envp[], \ - const char *filename)); + const char *filename); -extern void sha1_add __P((void *arg, const char *buffer, \ - size_t length)); +extern void sha1_add(void *arg, const char *buffer, \ + size_t length); -extern int sha1_sign_ok __P((void *arg)); +extern int sha1_sign_ok(void *arg); -extern int retrieve_sha1_marker __P((const char *filename, \ - struct signature **sign, const char *userid)); +extern int retrieve_sha1_marker(const char *filename, \ + struct signature **sign, const char *userid); /* x509.c */ #define X509_DB_NAME "/var/db/pkg/X509" -extern void *new_x509_checker __P((struct mygzip_header *h, \ +extern void *new_x509_checker(struct mygzip_header *h, \ struct signature *sign, const char *userid, char *envp[], \ - const char *filename)); + const char *filename); -extern void x509_add __P((void *arg, const char *buffer, \ - size_t length)); +extern void x509_add(void *arg, const char *buffer, \ + size_t length); -extern int x509_sign_ok __P((void *arg)); +extern int x509_sign_ok(void *arg); -extern int retrieve_x509_marker __P((const char *filename, \ - struct signature **sign, const char *userid)); +extern int retrieve_x509_marker(const char *filename, \ + struct signature **sign, const char *userid); diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h index 9335c152a0..488943c2a9 100644 --- a/usr.sbin/pkg_install/sign/gzip.h +++ b/usr.sbin/pkg_install/sign/gzip.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/pkg_install/sign/gzip.h,v 1.1.2.2 2001/05/17 12:33:39 sobomax Exp $ */ -/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/gzip.h,v 1.2 2003/06/17 04:29:59 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/gzip.h,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ /* $OpenBSD: gzip.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */ /*- * Copyright (c) 1999 Marc Espie. @@ -69,21 +69,21 @@ struct signature { #define GZIP_SIGNED 1 /* gzip file, signature parsed ok */ #define GZIP_NOT_GZIP 2 /* not a proper gzip file */ #define GZIP_NOT_PGPSIGNED 3 /* gzip file, unknown extension */ -extern int gzip_read_header __P((FILE *f, /*@out@*/struct mygzip_header *h, \ - /*@null@*/struct signature **sign)); +extern int gzip_read_header(FILE *f, /*@out@*/struct mygzip_header *h, \ + /*@null@*/struct signature **sign); /* gzip_write_header returns 1 for success */ -extern int gzip_write_header __P((FILE *f, const struct mygzip_header *h, \ - /*@null@*/struct signature *sign)); +extern int gzip_write_header(FILE *f, const struct mygzip_header *h, \ + /*@null@*/struct signature *sign); /* * Writing header to memory. Returns size needed, or 0 if buffer too small * buffer must be at least 14 characters */ -extern int gzip_copy_header __P((const struct mygzip_header *h, \ +extern int gzip_copy_header(const struct mygzip_header *h, \ /*@null@*/struct signature *sign, \ - void (*add)(void *, const char *, size_t), void *data)); + void (*add)(void *, const char *, size_t), void *data); -extern void free_signature __P((/*@null@*/struct signature *sign)); -extern void sign_fill_tag __P((struct signature *sign)); +extern void free_signature(/*@null@*/struct signature *sign); +extern void sign_fill_tag(struct signature *sign); #define KNOWN_TAGS 4 #define TAG_PGP 0 #define TAG_SHA1 1 diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h index 7663f7f47d..46328695d6 100644 --- a/usr.sbin/pkg_install/sign/pgp.h +++ b/usr.sbin/pkg_install/sign/pgp.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/pkg_install/sign/pgp.h,v 1.1.2.1 2001/03/05 03:43:53 wes Exp $ */ -/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/pgp.h,v 1.2 2003/06/17 04:29:59 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/pgp.h,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ /* $OpenBSD: pgp.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */ /* Estimate size of pgp signature */ #define MAXPGPSIGNSIZE 1024 @@ -11,16 +11,16 @@ struct mygzip_header; struct signature; -extern void *new_pgp_checker __P((struct mygzip_header *h, \ +extern void *new_pgp_checker(struct mygzip_header *h, \ struct signature *sign, const char *userid, char *envp[], \ - const char *filename)); + const char *filename); -extern void pgp_add __P((void *arg, const char *buffer, \ - size_t length)); +extern void pgp_add(void *arg, const char *buffer, \ + size_t length); -extern int pgp_sign_ok __P((void *arg)); +extern int pgp_sign_ok(void *arg); -extern void handle_pgp_passphrase __P((void)); +extern void handle_pgp_passphrase(void); -extern int retrieve_pgp_signature __P((const char *filename, \ -struct signature **sign, const char *userid, char *envp[])); +extern int retrieve_pgp_signature(const char *filename, \ +struct signature **sign, const char *userid, char *envp[]); diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h index 0ec0821644..6969faced3 100644 --- a/usr.sbin/pkg_install/sign/stand.h +++ b/usr.sbin/pkg_install/sign/stand.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/pkg_install/sign/stand.h,v 1.1.2.1 2001/03/05 03:43:53 wes Exp $ */ -/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/stand.h,v 1.2 2003/06/17 04:29:59 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/pkg_install/sign/Attic/stand.h,v 1.3 2003/11/03 19:31:39 eirikn Exp $ */ /* $OpenBSD: stand.h,v 1.2 1999/10/04 21:46:30 espie Exp $ */ /* provided to cater for BSD idiosyncrasies */ @@ -19,9 +19,9 @@ #if defined(BSD4_4) #include #else -extern void set_program_name __P((const char * name)); -extern void warn __P((const char *fmt, ...)); -extern void warnx __P((const char *fmt, ...)); +extern void set_program_name(const char * name); +extern void warn(const char *fmt, ...); +extern void warnx(const char *fmt, ...); #endif #ifndef __GNUC__ diff --git a/usr.sbin/portmap/pmap_check.c b/usr.sbin/portmap/pmap_check.c index f7bfa41081..c8558f07ac 100644 --- a/usr.sbin/portmap/pmap_check.c +++ b/usr.sbin/portmap/pmap_check.c @@ -34,7 +34,7 @@ /* * @(#) pmap_check.c 1.6 93/11/21 20:58:59 * $FreeBSD: src/usr.sbin/portmap/pmap_check.c,v 1.6 2000/01/15 23:08:28 brian Exp $ - * $DragonFly: src/usr.sbin/portmap/pmap_check.c,v 1.2 2003/06/17 04:30:00 dillon Exp $ + * $DragonFly: src/usr.sbin/portmap/pmap_check.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include #include @@ -60,8 +60,8 @@ #define YPPROC_DOMAIN_NONACK ((u_long) 2) #define MOUNTPROC_MNT ((u_long) 1) -static void logit __P((int, struct sockaddr_in *, u_long, u_long, const char *)); -static void toggle_verboselog __P((int)); +static void logit(int, struct sockaddr_in *, u_long, u_long, const char *); +static void toggle_verboselog(int); int verboselog = 0; int allow_severity = LOG_INFO; diff --git a/usr.sbin/portmap/pmap_check.h b/usr.sbin/portmap/pmap_check.h index bef1235df0..ae912ee47b 100644 --- a/usr.sbin/portmap/pmap_check.h +++ b/usr.sbin/portmap/pmap_check.h @@ -26,16 +26,16 @@ * @(#) pmap_check.h 1.3 93/11/21 16:18:53 * * $FreeBSD: src/usr.sbin/portmap/pmap_check.h,v 1.3 2000/01/15 23:08:28 brian Exp $ - * $DragonFly: src/usr.sbin/portmap/pmap_check.h,v 1.2 2003/06/17 04:30:00 dillon Exp $ + * $DragonFly: src/usr.sbin/portmap/pmap_check.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ -extern int from_local __P((struct sockaddr_in *)); -extern void check_startup __P((void)); -extern int check_default __P((struct sockaddr_in *, u_long, u_long)); -extern int check_setunset __P((struct sockaddr_in *, u_long, u_long, u_long)); -extern int check_privileged_port __P((struct sockaddr_in *, u_long, u_long, - u_long)); -extern int check_callit __P((struct sockaddr_in *, u_long, u_long, u_long)); +extern int from_local(struct sockaddr_in *); +extern void check_startup(void); +extern int check_default(struct sockaddr_in *, u_long, u_long); +extern int check_setunset(struct sockaddr_in *, u_long, u_long, u_long); +extern int check_privileged_port(struct sockaddr_in *, u_long, u_long, + u_long); +extern int check_callit(struct sockaddr_in *, u_long, u_long, u_long); extern int verboselog; extern int allow_severity; diff --git a/usr.sbin/portmap/pmap_dump/pmap_dump.c b/usr.sbin/portmap/pmap_dump/pmap_dump.c index 95a3d6be35..ff68a53e2b 100644 --- a/usr.sbin/portmap/pmap_dump/pmap_dump.c +++ b/usr.sbin/portmap/pmap_dump/pmap_dump.c @@ -8,7 +8,7 @@ /* * @(#) pmap_dump.c 1.1 92/06/11 22:53:15 * $FreeBSD: src/usr.sbin/portmap/pmap_dump/pmap_dump.c,v 1.6 2000/01/15 23:08:30 brian Exp $ - * $DragonFly: src/usr.sbin/portmap/pmap_dump/pmap_dump.c,v 1.2 2003/06/17 04:30:00 dillon Exp $ + * $DragonFly: src/usr.sbin/portmap/pmap_dump/pmap_dump.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include #include @@ -22,7 +22,7 @@ #include #include -static const char *protoname __P((u_long)); +static const char *protoname(u_long); int main(argc, argv) diff --git a/usr.sbin/portmap/pmap_set/pmap_set.c b/usr.sbin/portmap/pmap_set/pmap_set.c index e7e8250d37..d3e6bebc5b 100644 --- a/usr.sbin/portmap/pmap_set/pmap_set.c +++ b/usr.sbin/portmap/pmap_set/pmap_set.c @@ -8,7 +8,7 @@ /* * @(#) pmap_set.c 1.1 92/06/11 22:53:16 * $FreeBSD: src/usr.sbin/portmap/pmap_set/pmap_set.c,v 1.6 2000/01/15 23:08:30 brian Exp $ - * $DragonFly: src/usr.sbin/portmap/pmap_set/pmap_set.c,v 1.2 2003/06/17 04:30:00 dillon Exp $ + * $DragonFly: src/usr.sbin/portmap/pmap_set/pmap_set.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include #include @@ -19,7 +19,7 @@ #include #include -static int parse_line __P((char *, u_long *, u_long *, int *, unsigned *)); +static int parse_line(char *, u_long *, u_long *, int *, unsigned *); int main(argc, argv) diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c index 6b53184577..1a8aa4f5d9 100644 --- a/usr.sbin/portmap/portmap.c +++ b/usr.sbin/portmap/portmap.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)portmap.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/portmap/portmap.c,v 1.10.2.3 2002/05/06 18:18:21 dwmalone Exp $ - * $DragonFly: src/usr.sbin/portmap/portmap.c,v 1.2 2003/06/17 04:30:00 dillon Exp $ + * $DragonFly: src/usr.sbin/portmap/portmap.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -93,10 +93,10 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro"; #include "pmap_check.h" -static void reg_service __P((struct svc_req *, SVCXPRT *)); -static void reap __P((int)); -static void callit __P((struct svc_req *, SVCXPRT *)); -static void usage __P((void)); +static void reg_service(struct svc_req *, SVCXPRT *); +static void reap(int); +static void callit(struct svc_req *, SVCXPRT *); +static void usage(void); struct pmaplist *pmaplist; int debugging = 0; diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c index 74233a232a..45ab854932 100644 --- a/usr.sbin/pppd/auth.c +++ b/usr.sbin/pppd/auth.c @@ -32,7 +32,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/auth.c,v 1.24.2.2 2002/03/12 08:55:22 maxim Exp $ - * $DragonFly: src/usr.sbin/pppd/auth.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/auth.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -128,26 +128,26 @@ static int passwd_from_file; #define CHAP_WITHPEER 4 #define CHAP_PEER 8 -extern char *crypt __P((const char *, const char *)); +extern char *crypt(const char *, const char *); /* Prototypes for procedures local to this file. */ -static void network_phase __P((int)); -static void check_idle __P((void *)); -static void connect_time_expired __P((void *)); -static int plogin __P((char *, char *, char **, int *)); -static void plogout __P((void)); -static int null_login __P((int)); -static int get_pap_passwd __P((char *)); -static int have_pap_secret __P((void)); -static int have_chap_secret __P((char *, char *, u_int32_t)); -static int ip_addr_check __P((u_int32_t, struct wordlist *)); -static int scan_authfile __P((FILE *, char *, char *, u_int32_t, char *, - struct wordlist **, char *)); -static void free_wordlist __P((struct wordlist *)); -static void auth_set_ip_addr __P((int)); -static void auth_script __P((char *)); -static void set_allowed_addrs __P((int, struct wordlist *)); +static void network_phase(int); +static void check_idle(void *); +static void connect_time_expired(void *); +static int plogin(char *, char *, char **, int *); +static void plogout(void); +static int null_login(int); +static int get_pap_passwd(char *); +static int have_pap_secret(void); +static int have_chap_secret(char *, char *, u_int32_t); +static int ip_addr_check(u_int32_t, struct wordlist *); +static int scan_authfile(FILE *, char *, char *, u_int32_t, char *, + struct wordlist **, char *); +static void free_wordlist(struct wordlist *); +static void auth_set_ip_addr(int); +static void auth_script(char *); +static void set_allowed_addrs(int, struct wordlist *); /* * An Open on LCP has requested a change from Dead to Establish phase. diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c index dd874d0151..4ff549ff0c 100644 --- a/usr.sbin/pppd/cbcp.c +++ b/usr.sbin/pppd/cbcp.c @@ -18,7 +18,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/cbcp.c,v 1.4 1999/08/28 01:19:00 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/cbcp.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/cbcp.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -36,14 +36,14 @@ /* * Protocol entry points. */ -static void cbcp_init __P((int unit)); -static void cbcp_open __P((int unit)); -static void cbcp_lowerup __P((int unit)); -static void cbcp_input __P((int unit, u_char *pkt, int len)); -static void cbcp_protrej __P((int unit)); -static int cbcp_printpkt __P((u_char *pkt, int len, - void (*printer) __P((void *, char *, ...)), - void *arg)); +static void cbcp_init (int unit); +static void cbcp_open (int unit); +static void cbcp_lowerup (int unit); +static void cbcp_input (int unit, u_char *pkt, int len); +static void cbcp_protrej (int unit); +static int cbcp_printpkt (u_char *pkt, int len, + void (*printer)(void *, char *, ...), + void *arg); struct protent cbcp_protent = { PPP_CBCP, @@ -67,11 +67,11 @@ cbcp_state cbcp[NUM_PPP]; /* internal prototypes */ -static void cbcp_recvreq __P((cbcp_state *us, char *pckt, int len)); -static void cbcp_resp __P((cbcp_state *us)); -static void cbcp_up __P((cbcp_state *us)); -static void cbcp_recvack __P((cbcp_state *us, char *pckt, int len)); -static void cbcp_send __P((cbcp_state *us, u_char code, u_char *buf, int len)); +static void cbcp_recvreq(cbcp_state *us, char *pckt, int len); +static void cbcp_resp(cbcp_state *us); +static void cbcp_up(cbcp_state *us); +static void cbcp_recvack(cbcp_state *us, char *pckt, int len); +static void cbcp_send(cbcp_state *us, u_char code, u_char *buf, int len); /* init state */ static void @@ -184,7 +184,7 @@ static int cbcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, opt, id, len, olen, delay; diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c index 6910e684c6..75325d4943 100644 --- a/usr.sbin/pppd/ccp.c +++ b/usr.sbin/pppd/ccp.c @@ -25,7 +25,7 @@ * OR MODIFICATIONS. * * $FreeBSD: src/usr.sbin/pppd/ccp.c,v 1.10 1999/08/28 01:19:00 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/ccp.c,v 1.3 2003/08/08 04:18:47 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/ccp.c,v 1.4 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -41,17 +41,17 @@ /* * Protocol entry points from main code. */ -static void ccp_init __P((int unit)); -static void ccp_open __P((int unit)); -static void ccp_close __P((int unit, char *)); -static void ccp_lowerup __P((int unit)); -static void ccp_lowerdown __P((int)); -static void ccp_input __P((int unit, u_char *pkt, int len)); -static void ccp_protrej __P((int unit)); -static int ccp_printpkt __P((u_char *pkt, int len, - void (*printer) __P((void *, char *, ...)), - void *arg)); -static void ccp_datainput __P((int unit, u_char *pkt, int len)); +static void ccp_init(int unit); +static void ccp_open(int unit); +static void ccp_close(int unit, char *); +static void ccp_lowerup(int unit); +static void ccp_lowerdown(int); +static void ccp_input(int unit, u_char *pkt, int len); +static void ccp_protrej(int unit); +static int ccp_printpkt(u_char *pkt, int len, + void (*printer)(void *, char *, ...), + void *arg); +static void ccp_datainput(int unit, u_char *pkt, int len); struct protent ccp_protent = { PPP_CCP, @@ -80,18 +80,18 @@ ccp_options ccp_hisoptions[NUM_PPP]; /* what we agreed to do */ /* * Callbacks for fsm code. */ -static void ccp_resetci __P((fsm *)); -static int ccp_cilen __P((fsm *)); -static void ccp_addci __P((fsm *, u_char *, int *)); -static int ccp_ackci __P((fsm *, u_char *, int)); -static int ccp_nakci __P((fsm *, u_char *, int)); -static int ccp_rejci __P((fsm *, u_char *, int)); -static int ccp_reqci __P((fsm *, u_char *, int *, int)); -static void ccp_up __P((fsm *)); -static void ccp_down __P((fsm *)); -static int ccp_extcode __P((fsm *, int, int, u_char *, int)); -static void ccp_rack_timeout __P((void *)); -static char *method_name __P((ccp_options *, ccp_options *)); +static void ccp_resetci(fsm *); +static int ccp_cilen(fsm *); +static void ccp_addci(fsm *, u_char *, int *); +static int ccp_ackci(fsm *, u_char *, int); +static int ccp_nakci(fsm *, u_char *, int); +static int ccp_rejci(fsm *, u_char *, int); +static int ccp_reqci(fsm *, u_char *, int *, int); +static void ccp_up(fsm *); +static void ccp_down(fsm *); +static int ccp_extcode(fsm *, int, int, u_char *, int); +static void ccp_rack_timeout(void *); +static char *method_name(ccp_options *, ccp_options *); static fsm_callbacks ccp_callbacks = { ccp_resetci, @@ -953,7 +953,7 @@ static int ccp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { u_char *p0, *optend; diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c index f56f2f8f11..5b59c32215 100644 --- a/usr.sbin/pppd/chap.c +++ b/usr.sbin/pppd/chap.c @@ -33,7 +33,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/chap.c,v 1.10 1999/08/28 01:19:01 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/chap.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/chap.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -57,13 +57,13 @@ /* * Protocol entry points. */ -static void ChapInit __P((int)); -static void ChapLowerUp __P((int)); -static void ChapLowerDown __P((int)); -static void ChapInput __P((int, u_char *, int)); -static void ChapProtocolReject __P((int)); -static int ChapPrintPkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); +static void ChapInit(int); +static void ChapLowerUp(int); +static void ChapLowerDown(int); +static void ChapInput(int, u_char *, int); +static void ChapProtocolReject(int); +static int ChapPrintPkt(u_char *, int, + void (*)(void *, char *, ...), void *); struct protent chap_protent = { PPP_CHAP, @@ -85,20 +85,20 @@ struct protent chap_protent = { chap_state chap[NUM_PPP]; /* CHAP state; one for each unit */ -static void ChapChallengeTimeout __P((void *)); -static void ChapResponseTimeout __P((void *)); -static void ChapReceiveChallenge __P((chap_state *, u_char *, int, int)); -static void ChapRechallenge __P((void *)); -static void ChapReceiveResponse __P((chap_state *, u_char *, int, int)); -static void ChapReceiveSuccess __P((chap_state *, u_char *, int, int)); -static void ChapReceiveFailure __P((chap_state *, u_char *, int, int)); -static void ChapSendStatus __P((chap_state *, int)); -static void ChapSendChallenge __P((chap_state *)); -static void ChapSendResponse __P((chap_state *)); -static void ChapGenChallenge __P((chap_state *)); - -extern double drand48 __P((void)); -extern void srand48 __P((long)); +static void ChapChallengeTimeout(void *); +static void ChapResponseTimeout(void *); +static void ChapReceiveChallenge(chap_state *, u_char *, int, int); +static void ChapRechallenge(void *); +static void ChapReceiveResponse(chap_state *, u_char *, int, int); +static void ChapReceiveSuccess(chap_state *, u_char *, int, int); +static void ChapReceiveFailure(chap_state *, u_char *, int, int); +static void ChapSendStatus(chap_state *, int); +static void ChapSendChallenge(chap_state *); +static void ChapSendResponse(chap_state *); +static void ChapGenChallenge(chap_state *); + +extern double drand48(void); +extern void srand48(long); /* * ChapInit - Initialize a CHAP unit. @@ -814,7 +814,7 @@ static int ChapPrintPkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len; diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h index 90fa159f2f..4c9fa60b62 100644 --- a/usr.sbin/pppd/chap.h +++ b/usr.sbin/pppd/chap.h @@ -31,7 +31,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/chap.h,v 1.7 1999/08/28 01:19:01 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/chap.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/chap.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #ifndef __CHAP_INCLUDE__ @@ -116,8 +116,8 @@ typedef struct chap_state { extern chap_state chap[]; -void ChapAuthWithPeer __P((int, char *, int)); -void ChapAuthPeer __P((int, char *, int)); +void ChapAuthWithPeer(int, char *, int); +void ChapAuthPeer(int, char *, int); extern struct protent chap_protent; diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c index 7ad1e742f5..ad0cd7630a 100644 --- a/usr.sbin/pppd/chap_ms.c +++ b/usr.sbin/pppd/chap_ms.c @@ -20,7 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/chap_ms.c,v 1.8 2000/02/24 21:10:28 markm Exp $ - * $DragonFly: src/usr.sbin/pppd/chap_ms.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/chap_ms.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -65,18 +65,18 @@ typedef struct { in case this struct gets padded. */ -static void ChallengeResponse __P((u_char *, u_char *, u_char *)); -static void DesEncrypt __P((u_char *, u_char *, u_char *)); -static void MakeKey __P((u_char *, u_char *)); -static u_char Get7Bits __P((u_char *, int)); -static void ChapMS_NT __P((char *, int, char *, int, MS_ChapResponse *)); +static void ChallengeResponse(u_char *, u_char *, u_char *); +static void DesEncrypt(u_char *, u_char *, u_char *); +static void MakeKey(u_char *, u_char *); +static u_char Get7Bits(u_char *, int); +static void ChapMS_NT(char *, int, char *, int, MS_ChapResponse *); #ifdef MSLANMAN -static void ChapMS_LANMan __P((char *, int, char *, int, MS_ChapResponse *)); +static void ChapMS_LANMan(char *, int, char *, int, MS_ChapResponse *); #endif #ifdef USE_CRYPT -static void Expand __P((u_char *, u_char *)); -static void Collapse __P((u_char *, u_char *)); +static void Expand(u_char *, u_char *); +static void Collapse(u_char *, u_char *); #endif static void diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h index 0fd7a3b7de..d06ae5ca37 100644 --- a/usr.sbin/pppd/chap_ms.h +++ b/usr.sbin/pppd/chap_ms.h @@ -20,7 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/chap_ms.h,v 1.5 1999/08/28 01:19:02 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/chap_ms.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/chap_ms.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #ifndef __CHAPMS_INCLUDE__ @@ -28,7 +28,7 @@ #define MD4_SIGNATURE_SIZE 16 /* 16 bytes in a MD4 message digest */ #define MAX_NT_PASSWORD 256 /* Maximum number of (Unicode) chars in an NT password */ -void ChapMS __P((chap_state *, char *, int, char *, int)); +void ChapMS(chap_state *, char *, int, char *, int); #define __CHAPMS_INCLUDE__ #endif /* __CHAPMS_INCLUDE__ */ diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c index 2b02da36f6..d39f31c563 100644 --- a/usr.sbin/pppd/demand.c +++ b/usr.sbin/pppd/demand.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/demand.c,v 1.5 1999/08/28 01:19:02 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/demand.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/demand.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -61,7 +61,7 @@ struct packet { struct packet *pend_q; struct packet *pend_qtail; -static int active_packet __P((unsigned char *, int)); +static int active_packet(unsigned char *, int); /* * demand_conf - configure the interface for doing dial-on-demand. diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c index 80f1239e78..227480c5c5 100644 --- a/usr.sbin/pppd/fsm.c +++ b/usr.sbin/pppd/fsm.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/fsm.c,v 1.8 1999/08/28 01:19:02 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/fsm.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/fsm.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -34,14 +34,14 @@ #include "pppd.h" #include "fsm.h" -static void fsm_timeout __P((void *)); -static void fsm_rconfreq __P((fsm *, int, u_char *, int)); -static void fsm_rconfack __P((fsm *, int, u_char *, int)); -static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int)); -static void fsm_rtermreq __P((fsm *, int, u_char *, int)); -static void fsm_rtermack __P((fsm *)); -static void fsm_rcoderej __P((fsm *, u_char *, int)); -static void fsm_sconfreq __P((fsm *, int)); +static void fsm_timeout(void *); +static void fsm_rconfreq(fsm *, int, u_char *, int); +static void fsm_rconfack(fsm *, int, u_char *, int); +static void fsm_rconfnakrej(fsm *, int, int, u_char *, int); +static void fsm_rtermreq(fsm *, int, u_char *, int); +static void fsm_rtermack(fsm *); +static void fsm_rcoderej(fsm *, u_char *, int); +static void fsm_sconfreq(fsm *, int); #define PROTO_NAME(f) ((f)->callbacks->proto_name) @@ -507,7 +507,7 @@ fsm_rconfnakrej(f, code, id, inp, len) u_char *inp; int len; { - int (*proc) __P((fsm *, u_char *, int)); + int (*proc)(fsm *, u_char *, int); int ret; FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.", diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h index d5f88de82e..f04dbf4acf 100644 --- a/usr.sbin/pppd/fsm.h +++ b/usr.sbin/pppd/fsm.h @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/fsm.h,v 1.7 1999/08/28 01:19:03 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/fsm.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/fsm.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -63,33 +63,33 @@ typedef struct fsm { typedef struct fsm_callbacks { void (*resetci) /* Reset our Configuration Information */ - __P((fsm *)); + (fsm *); int (*cilen) /* Length of our Configuration Information */ - __P((fsm *)); + (fsm *); void (*addci) /* Add our Configuration Information */ - __P((fsm *, u_char *, int *)); + (fsm *, u_char *, int *); int (*ackci) /* ACK our Configuration Information */ - __P((fsm *, u_char *, int)); + (fsm *, u_char *, int); int (*nakci) /* NAK our Configuration Information */ - __P((fsm *, u_char *, int)); + (fsm *, u_char *, int); int (*rejci) /* Reject our Configuration Information */ - __P((fsm *, u_char *, int)); + (fsm *, u_char *, int); int (*reqci) /* Request peer's Configuration Information */ - __P((fsm *, u_char *, int *, int)); + (fsm *, u_char *, int *, int); void (*up) /* Called when fsm reaches OPENED state */ - __P((fsm *)); + (fsm *); void (*down) /* Called when fsm leaves OPENED state */ - __P((fsm *)); + (fsm *); void (*starting) /* Called when we want the lower layer */ - __P((fsm *)); + (fsm *); void (*finished) /* Called when we don't want the lower layer */ - __P((fsm *)); + (fsm *); void (*protreject) /* Called when Protocol-Reject received */ - __P((int)); + (int); void (*retransmit) /* Retransmission is necessary */ - __P((fsm *)); + (fsm *); int (*extcode) /* Called when unknown code received */ - __P((fsm *, int, int, u_char *, int)); + (fsm *, int, int, u_char *, int); char *proto_name; /* String name for protocol (for messages) */ } fsm_callbacks; @@ -129,14 +129,14 @@ typedef struct fsm_callbacks { /* * Prototypes */ -void fsm_init __P((fsm *)); -void fsm_lowerup __P((fsm *)); -void fsm_lowerdown __P((fsm *)); -void fsm_open __P((fsm *)); -void fsm_close __P((fsm *, char *)); -void fsm_input __P((fsm *, u_char *, int)); -void fsm_protreject __P((fsm *)); -void fsm_sdata __P((fsm *, int, int, u_char *, int)); +void fsm_init(fsm *); +void fsm_lowerup(fsm *); +void fsm_lowerdown(fsm *); +void fsm_open(fsm *); +void fsm_close(fsm *, char *); +void fsm_input(fsm *, u_char *, int); +void fsm_protreject(fsm *); +void fsm_sdata(fsm *, int, int, u_char *, int); /* diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c index fc72ff9a58..b4c48ddc92 100644 --- a/usr.sbin/pppd/ipcp.c +++ b/usr.sbin/pppd/ipcp.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/ipcp.c,v 1.12 1999/08/28 01:19:03 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/ipcp.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/ipcp.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -52,17 +52,17 @@ static int proxy_arp_set[NUM_PPP]; /* Have created proxy arp entry */ /* * Callbacks for fsm code. (CI = Configuration Information) */ -static void ipcp_resetci __P((fsm *)); /* Reset our CI */ -static int ipcp_cilen __P((fsm *)); /* Return length of our CI */ -static void ipcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */ -static int ipcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -static int ipcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -static int ipcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -static int ipcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */ -static void ipcp_up __P((fsm *)); /* We're UP */ -static void ipcp_down __P((fsm *)); /* We're DOWN */ -static void ipcp_script __P((fsm *, char *)); /* Run an up/down script */ -static void ipcp_finished __P((fsm *)); /* Don't need lower layer */ +static void ipcp_resetci(fsm *); /* Reset our CI */ +static int ipcp_cilen(fsm *); /* Return length of our CI */ +static void ipcp_addci(fsm *, u_char *, int *); /* Add our CI */ +static int ipcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */ +static int ipcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */ +static int ipcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */ +static int ipcp_reqci(fsm *, u_char *, int *, int); /* Rcv CI */ +static void ipcp_up(fsm *); /* We're UP */ +static void ipcp_down(fsm *); /* We're DOWN */ +static void ipcp_script(fsm *, char *); /* Run an up/down script */ +static void ipcp_finished(fsm *); /* Don't need lower layer */ fsm ipcp_fsm[NUM_PPP]; /* IPCP fsm structure */ @@ -87,18 +87,18 @@ static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */ /* * Protocol entry points from main code. */ -static void ipcp_init __P((int)); -static void ipcp_open __P((int)); -static void ipcp_close __P((int, char *)); -static void ipcp_lowerup __P((int)); -static void ipcp_lowerdown __P((int)); -static void ipcp_input __P((int, u_char *, int)); -static void ipcp_protrej __P((int)); -static int ipcp_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); -static void ip_check_options __P((void)); -static int ip_demand_conf __P((int)); -static int ip_active_pkt __P((u_char *, int)); +static void ipcp_init(int); +static void ipcp_open(int); +static void ipcp_close(int, char *); +static void ipcp_lowerup(int); +static void ipcp_lowerdown(int); +static void ipcp_input(int, u_char *, int); +static void ipcp_protrej(int); +static int ipcp_printpkt(u_char *, int, + void (*)(void *, char *, ...), void *); +static void ip_check_options(void); +static int ip_demand_conf(int); +static int ip_active_pkt(u_char *, int); struct protent ipcp_protent = { PPP_IPCP, @@ -118,7 +118,7 @@ struct protent ipcp_protent = { ip_active_pkt }; -static void ipcp_clear_addrs __P((int)); +static void ipcp_clear_addrs(int); /* * Lengths of configuration options. @@ -1366,7 +1366,7 @@ static int ipcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len, olen; diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h index 0f3da05489..62f75b8e98 100644 --- a/usr.sbin/pppd/ipcp.h +++ b/usr.sbin/pppd/ipcp.h @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/ipcp.h,v 1.10 1999/08/28 01:19:03 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/ipcp.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/ipcp.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -66,6 +66,6 @@ extern ipcp_options ipcp_gotoptions[]; extern ipcp_options ipcp_allowoptions[]; extern ipcp_options ipcp_hisoptions[]; -char *ip_ntoa __P((u_int32_t)); +char *ip_ntoa(u_int32_t); extern struct protent ipcp_protent; diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c index 0e2ad89f86..755c8db4a3 100644 --- a/usr.sbin/pppd/ipxcp.c +++ b/usr.sbin/pppd/ipxcp.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/ipxcp.c,v 1.5 1999/08/28 01:19:03 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/ipxcp.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/ipxcp.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #ifdef IPX_CHANGE @@ -52,16 +52,16 @@ ipxcp_options ipxcp_hisoptions[NUM_PPP]; /* Options that we ack'd */ /* * Callbacks for fsm code. (CI = Configuration Information) */ -static void ipxcp_resetci __P((fsm *)); /* Reset our CI */ -static int ipxcp_cilen __P((fsm *)); /* Return length of our CI */ -static void ipxcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */ -static int ipxcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -static int ipxcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -static int ipxcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -static int ipxcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */ -static void ipxcp_up __P((fsm *)); /* We're UP */ -static void ipxcp_down __P((fsm *)); /* We're DOWN */ -static void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */ +static void ipxcp_resetci(fsm *); /* Reset our CI */ +static int ipxcp_cilen(fsm *); /* Return length of our CI */ +static void ipxcp_addci(fsm *, u_char *, int *); /* Add our CI */ +static int ipxcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */ +static int ipxcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */ +static int ipxcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */ +static int ipxcp_reqci(fsm *, u_char *, int *, int); /* Rcv CI */ +static void ipxcp_up(fsm *); /* We're UP */ +static void ipxcp_down(fsm *); /* We're DOWN */ +static void ipxcp_script(fsm *, char *); /* Run an up/down script */ fsm ipxcp_fsm[NUM_PPP]; /* IPXCP fsm structure */ @@ -87,15 +87,15 @@ static fsm_callbacks ipxcp_callbacks = { /* IPXCP callback routines */ * Protocol entry points. */ -static void ipxcp_init __P((int)); -static void ipxcp_open __P((int)); -static void ipxcp_close __P((int, char *)); -static void ipxcp_lowerup __P((int)); -static void ipxcp_lowerdown __P((int)); -static void ipxcp_input __P((int, u_char *, int)); -static void ipxcp_protrej __P((int)); -static int ipxcp_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); +static void ipxcp_init(int); +static void ipxcp_open(int); +static void ipxcp_close(int, char *); +static void ipxcp_lowerup(int); +static void ipxcp_lowerdown(int); +static void ipxcp_input(int, u_char *, int); +static void ipxcp_protrej(int); +static int ipxcp_printpkt(u_char *, int, + void (*)(void *, char *, ...), void *); struct protent ipxcp_protent = { PPP_IPXCP, @@ -1274,7 +1274,7 @@ static int ipxcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len, olen; diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c index 659cb7387b..a0255b89b0 100644 --- a/usr.sbin/pppd/lcp.c +++ b/usr.sbin/pppd/lcp.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/lcp.c,v 1.9.2.1 2003/04/22 10:27:44 fjoe Exp $ - * $DragonFly: src/usr.sbin/pppd/lcp.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/lcp.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -57,31 +57,31 @@ static u_char nak_buffer[PPP_MRU]; /* where we construct a nak packet */ /* * Callbacks for fsm code. (CI = Configuration Information) */ -static void lcp_resetci __P((fsm *)); /* Reset our CI */ -static int lcp_cilen __P((fsm *)); /* Return length of our CI */ -static void lcp_addci __P((fsm *, u_char *, int *)); /* Add our CI to pkt */ -static int lcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -static int lcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -static int lcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -static int lcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv peer CI */ -static void lcp_up __P((fsm *)); /* We're UP */ -static void lcp_down __P((fsm *)); /* We're DOWN */ -static void lcp_starting __P((fsm *)); /* We need lower layer up */ -static void lcp_finished __P((fsm *)); /* We need lower layer down */ -static int lcp_extcode __P((fsm *, int, int, u_char *, int)); -static void lcp_rprotrej __P((fsm *, u_char *, int)); +static void lcp_resetci(fsm *); /* Reset our CI */ +static int lcp_cilen(fsm *); /* Return length of our CI */ +static void lcp_addci(fsm *, u_char *, int *); /* Add our CI to pkt */ +static int lcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */ +static int lcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */ +static int lcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */ +static int lcp_reqci(fsm *, u_char *, int *, int); /* Rcv peer CI */ +static void lcp_up(fsm *); /* We're UP */ +static void lcp_down(fsm *); /* We're DOWN */ +static void lcp_starting(fsm *); /* We need lower layer up */ +static void lcp_finished(fsm *); /* We need lower layer down */ +static int lcp_extcode(fsm *, int, int, u_char *, int); +static void lcp_rprotrej(fsm *, u_char *, int); /* * routines to send LCP echos to peer */ -static void lcp_echo_lowerup __P((int)); -static void lcp_echo_lowerdown __P((int)); -static void LcpEchoTimeout __P((void *)); -static void lcp_received_echo_reply __P((fsm *, int, u_char *, int)); -static void LcpSendEchoRequest __P((fsm *)); -static void LcpLinkFailure __P((fsm *)); -static void LcpEchoCheck __P((fsm *)); +static void lcp_echo_lowerup(int); +static void lcp_echo_lowerdown(int); +static void LcpEchoTimeout(void *); +static void lcp_received_echo_reply(fsm *, int, u_char *, int); +static void LcpSendEchoRequest(fsm *); +static void LcpLinkFailure(fsm *); +static void LcpEchoCheck(fsm *); static fsm_callbacks lcp_callbacks = { /* LCP callback routines */ lcp_resetci, /* Reset our Configuration Information */ @@ -106,11 +106,11 @@ static fsm_callbacks lcp_callbacks = { /* LCP callback routines */ * Some of these are called directly. */ -static void lcp_init __P((int)); -static void lcp_input __P((int, u_char *, int)); -static void lcp_protrej __P((int)); -static int lcp_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); +static void lcp_init(int); +static void lcp_input(int, u_char *, int); +static void lcp_protrej(int); +static int lcp_printpkt(u_char *, int, + void (*)(void *, char *, ...), void *); struct protent lcp_protent = { PPP_LCP, @@ -1554,7 +1554,7 @@ static int lcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len, olen; diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h index 0b03b57952..170ae3379e 100644 --- a/usr.sbin/pppd/lcp.h +++ b/usr.sbin/pppd/lcp.h @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/lcp.h,v 1.7 1999/08/28 01:19:05 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/lcp.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/lcp.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -76,11 +76,11 @@ extern u_int32_t xmit_accm[][8]; #define MINMRU 128 /* No MRUs below this */ #define MAXMRU 16384 /* Normally limit MRU to this */ -void lcp_open __P((int)); -void lcp_close __P((int, char *)); -void lcp_lowerup __P((int)); -void lcp_lowerdown __P((int)); -void lcp_sprotrej __P((int, u_char *, int)); /* send protocol reject */ +void lcp_open(int); +void lcp_close(int, char *); +void lcp_lowerup(int); +void lcp_lowerdown(int); +void lcp_sprotrej(int, u_char *, int); /* send protocol reject */ extern struct protent lcp_protent; diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c index f37be4f7d2..723d9d3852 100644 --- a/usr.sbin/pppd/magic.c +++ b/usr.sbin/pppd/magic.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/magic.c,v 1.8 1999/08/28 01:19:05 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/magic.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/magic.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -28,8 +28,8 @@ #include "pppd.h" #include "magic.h" -extern long mrand48 __P((void)); -extern void srand48 __P((long)); +extern long mrand48(void); +extern void srand48(long); /* * magic_init - Initialize the magic number generator. diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h index ca650ff387..3162c81105 100644 --- a/usr.sbin/pppd/magic.h +++ b/usr.sbin/pppd/magic.h @@ -17,8 +17,8 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/magic.h,v 1.7 1999/08/28 01:19:05 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/magic.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/magic.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ -void magic_init __P((void)); /* Initialize the magic number generator */ -u_int32_t magic __P((void)); /* Returns the next magic number */ +void magic_init(void); /* Initialize the magic number generator */ +u_int32_t magic(void); /* Returns the next magic number */ diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index 944b723182..3f82e63cfc 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/main.c,v 1.19.2.1 2002/07/30 03:50:40 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/main.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/main.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -107,27 +107,27 @@ char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n"; /* Prototypes for procedures local to this file. */ -static void create_pidfile __P((void)); -static void cleanup __P((void)); -static void close_tty __P((void)); -static void get_input __P((void)); -static void calltimeout __P((void)); -static struct timeval *timeleft __P((struct timeval *)); -static void kill_my_pg __P((int)); -static void hup __P((int)); -static void term __P((int)); -static void chld __P((int)); -static void toggle_debug __P((int)); -static void open_ccp __P((int)); -static void bad_signal __P((int)); -static void holdoff_end __P((void *)); -static int device_script __P((char *, int, int)); -static void reap_kids __P((void)); -static void pr_log __P((void *, char *, ...)); - -extern char *ttyname __P((int)); -extern char *getlogin __P((void)); -int main __P((int, char *[])); +static void create_pidfile(void); +static void cleanup(void); +static void close_tty(void); +static void get_input(void); +static void calltimeout(void); +static struct timeval *timeleft(struct timeval *); +static void kill_my_pg(int); +static void hup(int); +static void term(int); +static void chld(int); +static void toggle_debug(int); +static void open_ccp(int); +static void bad_signal(int); +static void holdoff_end(void *); +static int device_script(char *, int, int); +static void reap_kids(void); +static void pr_log(void *, char *, ...); + +extern char *ttyname(int); +extern char *getlogin(void); +int main(int, char *[]); #ifdef ultrix #undef O_NONBLOCK @@ -842,7 +842,7 @@ close_tty() struct callout { struct timeval c_time; /* time at which to call routine */ void *c_arg; /* argument to routine */ - void (*c_func) __P((void *)); /* routine */ + void (*c_func)(void *); /* routine */ struct callout *c_next; }; @@ -857,7 +857,7 @@ static struct timeval timenow; /* Current time */ */ void timeout(func, arg, time) - void (*func) __P((void *)); + void (*func)(void *); void *arg; int time; { @@ -897,7 +897,7 @@ timeout(func, arg, time) */ void untimeout(func, arg) - void (*func) __P((void *)); + void (*func)(void *); void *arg; { struct callout **copp, *freep; @@ -1281,7 +1281,7 @@ void format_packet(p, len, printer, arg) u_char *p; int len; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int i, n; @@ -1349,7 +1349,7 @@ void print_string(p, len, printer, arg) char *p; int len; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int c; diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c index 7ba8fc14b9..285cdf40f7 100644 --- a/usr.sbin/pppd/options.c +++ b/usr.sbin/pppd/options.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/options.c,v 1.20.2.2 2002/08/31 18:16:01 dwmalone Exp $ - * $DragonFly: src/usr.sbin/pppd/options.c,v 1.3 2003/08/08 04:18:47 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/options.c,v 1.4 2003/11/03 19:31:40 eirikn Exp $ */ #include @@ -64,7 +64,7 @@ #define TRUE 1 #if defined(ultrix) || defined(NeXT) -char *strdup __P((char *)); +char *strdup(char *); #endif #ifndef GIDSET_TYPE @@ -133,132 +133,132 @@ pcap_t pc; /* Fake struct pcap so we can compile expr */ /* * Prototypes */ -static int setdevname __P((char *, int)); -static int setspeed __P((char *)); -static int setdebug __P((char **)); -static int setkdebug __P((char **)); -static int setpassive __P((char **)); -static int setsilent __P((char **)); -static int noopt __P((char **)); -static int setnovj __P((char **)); -static int setnovjccomp __P((char **)); -static int setvjslots __P((char **)); -static int reqpap __P((char **)); -static int nopap __P((char **)); +static int setdevname(char *, int); +static int setspeed(char *); +static int setdebug(char **); +static int setkdebug(char **); +static int setpassive(char **); +static int setsilent(char **); +static int noopt(char **); +static int setnovj(char **); +static int setnovjccomp(char **); +static int setvjslots(char **); +static int reqpap(char **); +static int nopap(char **); #ifdef OLD_OPTIONS -static int setupapfile __P((char **)); +static int setupapfile(char **); #endif -static int nochap __P((char **)); -static int reqchap __P((char **)); -static int noaccomp __P((char **)); -static int noasyncmap __P((char **)); -static int noip __P((char **)); -static int nomagicnumber __P((char **)); -static int setasyncmap __P((char **)); -static int setescape __P((char **)); -static int setmru __P((char **)); -static int setmtu __P((char **)); +static int nochap(char **); +static int reqchap(char **); +static int noaccomp(char **); +static int noasyncmap(char **); +static int noip(char **); +static int nomagicnumber(char **); +static int setasyncmap(char **); +static int setescape(char **); +static int setmru(char **); +static int setmtu(char **); #ifdef CBCP_SUPPORT -static int setcbcp __P((char **)); +static int setcbcp(char **); #endif -static int nomru __P((char **)); -static int nopcomp __P((char **)); -static int setconnector __P((char **)); -static int setdisconnector __P((char **)); -static int setwelcomer __P((char **)); -static int setmaxcon __P((char **)); -static int setmaxconnect __P((char **)); -static int setdomain __P((char **)); -static int setnetmask __P((char **)); -static int setcrtscts __P((char **)); -static int setnocrtscts __P((char **)); -static int setxonxoff __P((char **)); -static int setnodetach __P((char **)); -static int setupdetach __P((char **)); -static int setmodem __P((char **)); -static int setlocal __P((char **)); -static int setlock __P((char **)); -static int setname __P((char **)); -static int setuser __P((char **)); -static int setremote __P((char **)); -static int setauth __P((char **)); -static int setnoauth __P((char **)); -static int readfile __P((char **)); -static int callfile __P((char **)); -static int setdefaultroute __P((char **)); -static int setnodefaultroute __P((char **)); -static int setproxyarp __P((char **)); -static int setnoproxyarp __P((char **)); -static int setpersist __P((char **)); -static int setnopersist __P((char **)); -static int setdologin __P((char **)); -static int setusehostname __P((char **)); -static int setnoipdflt __P((char **)); -static int setlcptimeout __P((char **)); -static int setlcpterm __P((char **)); -static int setlcpconf __P((char **)); -static int setlcpfails __P((char **)); -static int setipcptimeout __P((char **)); -static int setipcpterm __P((char **)); -static int setipcpconf __P((char **)); -static int setipcpfails __P((char **)); -static int setpaptimeout __P((char **)); -static int setpapreqs __P((char **)); -static int setpapreqtime __P((char **)); -static int setchaptimeout __P((char **)); -static int setchapchal __P((char **)); -static int setchapintv __P((char **)); -static int setipcpaccl __P((char **)); -static int setipcpaccr __P((char **)); -static int setlcpechointv __P((char **)); -static int setlcpechofails __P((char **)); -static int noccp __P((char **)); -static int setbsdcomp __P((char **)); -static int setnobsdcomp __P((char **)); -static int setdeflate __P((char **)); -static int setnodeflate __P((char **)); -static int setnodeflatedraft __P((char **)); -static int setdemand __P((char **)); -static int setpred1comp __P((char **)); -static int setnopred1comp __P((char **)); -static int setipparam __P((char **)); -static int setpapcrypt __P((char **)); -static int setidle __P((char **)); -static int setholdoff __P((char **)); -static int setdnsaddr __P((char **)); -static int resetipxproto __P((char **)); -static int setwinsaddr __P((char **)); -static int showversion __P((char **)); -static int showhelp __P((char **)); +static int nomru(char **); +static int nopcomp(char **); +static int setconnector(char **); +static int setdisconnector(char **); +static int setwelcomer(char **); +static int setmaxcon(char **); +static int setmaxconnect(char **); +static int setdomain(char **); +static int setnetmask(char **); +static int setcrtscts(char **); +static int setnocrtscts(char **); +static int setxonxoff(char **); +static int setnodetach(char **); +static int setupdetach(char **); +static int setmodem(char **); +static int setlocal(char **); +static int setlock(char **); +static int setname(char **); +static int setuser(char **); +static int setremote(char **); +static int setauth(char **); +static int setnoauth(char **); +static int readfile(char **); +static int callfile(char **); +static int setdefaultroute(char **); +static int setnodefaultroute(char **); +static int setproxyarp(char **); +static int setnoproxyarp(char **); +static int setpersist(char **); +static int setnopersist(char **); +static int setdologin(char **); +static int setusehostname(char **); +static int setnoipdflt(char **); +static int setlcptimeout(char **); +static int setlcpterm(char **); +static int setlcpconf(char **); +static int setlcpfails(char **); +static int setipcptimeout(char **); +static int setipcpterm(char **); +static int setipcpconf(char **); +static int setipcpfails(char **); +static int setpaptimeout(char **); +static int setpapreqs(char **); +static int setpapreqtime(char **); +static int setchaptimeout(char **); +static int setchapchal(char **); +static int setchapintv(char **); +static int setipcpaccl(char **); +static int setipcpaccr(char **); +static int setlcpechointv(char **); +static int setlcpechofails(char **); +static int noccp(char **); +static int setbsdcomp(char **); +static int setnobsdcomp(char **); +static int setdeflate(char **); +static int setnodeflate(char **); +static int setnodeflatedraft(char **); +static int setdemand(char **); +static int setpred1comp(char **); +static int setnopred1comp(char **); +static int setipparam(char **); +static int setpapcrypt(char **); +static int setidle(char **); +static int setholdoff(char **); +static int setdnsaddr(char **); +static int resetipxproto(char **); +static int setwinsaddr(char **); +static int showversion(char **); +static int showhelp(char **); #ifdef PPP_FILTER -static int setpdebug __P((char **)); -static int setpassfilter __P((char **)); -static int setactivefilter __P((char **)); +static int setpdebug(char **); +static int setpassfilter(char **); +static int setactivefilter(char **); #endif #ifdef IPX_CHANGE -static int setipxproto __P((char **)); -static int setipxanet __P((char **)); -static int setipxalcl __P((char **)); -static int setipxarmt __P((char **)); -static int setipxnetwork __P((char **)); -static int setipxnode __P((char **)); -static int setipxrouter __P((char **)); -static int setipxname __P((char **)); -static int setipxcptimeout __P((char **)); -static int setipxcpterm __P((char **)); -static int setipxcpconf __P((char **)); -static int setipxcpfails __P((char **)); +static int setipxproto(char **); +static int setipxanet(char **); +static int setipxalcl(char **); +static int setipxarmt(char **); +static int setipxnetwork(char **); +static int setipxnode(char **); +static int setipxrouter(char **); +static int setipxname(char **); +static int setipxcptimeout(char **); +static int setipxcpterm(char **); +static int setipxcpconf(char **); +static int setipxcpfails(char **); #endif /* IPX_CHANGE */ #ifdef MSLANMAN -static int setmslanman __P((char **)); +static int setmslanman(char **); #endif -static int number_option __P((char *, u_int32_t *, int)); -static int int_option __P((char *, int *)); -static int readable __P((int fd)); +static int number_option(char *, u_int32_t *, int); +static int int_option(char *, int *); +static int readable(int fd); /* * Valid arguments. @@ -266,7 +266,7 @@ static int readable __P((int fd)); static struct cmd { char *cmd_name; int num_args; - int (*cmd_func) __P((char **)); + int (*cmd_func)(char **); } cmds[] = { {"-all", 0, noopt}, /* Don't request/allow any options (useless) */ {"noaccomp", 0, noaccomp}, /* Disable Address/Control compression */ diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h index 91f8cc1274..6764df7e82 100644 --- a/usr.sbin/pppd/pppd.h +++ b/usr.sbin/pppd/pppd.h @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/pppd.h,v 1.13 1999/08/28 01:19:08 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/pppd.h,v 1.3 2003/08/08 04:18:47 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/pppd.h,v 1.4 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -142,33 +142,33 @@ extern int ms_lanman; /* Nonzero if use LanMan password instead of NT */ struct protent { u_short protocol; /* PPP protocol number */ /* Initialization procedure */ - void (*init) __P((int unit)); + void (*init)(int unit); /* Process a received packet */ - void (*input) __P((int unit, u_char *pkt, int len)); + void (*input)(int unit, u_char *pkt, int len); /* Process a received protocol-reject */ - void (*protrej) __P((int unit)); + void (*protrej)(int unit); /* Lower layer has come up */ - void (*lowerup) __P((int unit)); + void (*lowerup)(int unit); /* Lower layer has gone down */ - void (*lowerdown) __P((int unit)); + void (*lowerdown)(int unit); /* Open the protocol */ - void (*open) __P((int unit)); + void (*open)(int unit); /* Close the protocol */ - void (*close) __P((int unit, char *reason)); + void (*close)(int unit, char *reason); /* Print a packet in readable form */ - int (*printpkt) __P((u_char *pkt, int len, - void (*printer) __P((void *, char *, ...)), - void *arg)); + int (*printpkt)(u_char *pkt, int len, + void (*printer)(void *, char *, ...), + void *arg); /* Process a received data packet */ - void (*datainput) __P((int unit, u_char *pkt, int len)); + void (*datainput)(int unit, u_char *pkt, int len); int enabled_flag; /* 0 iff protocol is disabled */ char *name; /* Text name of protocol */ /* Check requested options, assign defaults */ - void (*check_options) __P((void)); + void (*check_options)(void); /* Configure interface for demand-dial */ - int (*demand_conf) __P((int unit)); + int (*demand_conf)(int unit); /* Say whether to bring up link for this pkt */ - int (*active_pkt) __P((u_char *pkt, int len)); + int (*active_pkt)(u_char *pkt, int len); }; /* Table of pointers to supported protocols */ @@ -179,149 +179,149 @@ extern struct protent *protocols[]; */ /* Procedures exported from main.c. */ -void detach __P((void)); /* Detach from controlling tty */ -void die __P((int)); /* Cleanup and exit */ -void quit __P((void)); /* like die(1) */ -void novm __P((char *)); /* Say we ran out of memory, and die */ -void timeout __P((void (*func)(void *), void *arg, int t)); +void detach(void); /* Detach from controlling tty */ +void die(int); /* Cleanup and exit */ +void quit(void); /* like die(1) */ +void novm(char *); /* Say we ran out of memory, and die */ +void timeout(void (*func)(void *), void *arg, int t); /* Call func(arg) after t seconds */ -void untimeout __P((void (*func)(void *), void *arg)); +void untimeout(void (*func)(void *), void *arg); /* Cancel call to func(arg) */ -int run_program __P((char *prog, char **args, int must_exist)); +int run_program(char *prog, char **args, int must_exist); /* Run program prog with args in child */ -void demuxprotrej __P((int, int)); +void demuxprotrej(int, int); /* Demultiplex a Protocol-Reject */ -void format_packet __P((u_char *, int, void (*) (void *, char *, ...), - void *)); /* Format a packet in human-readable form */ -void log_packet __P((u_char *, int, char *, int)); +void format_packet(u_char *, int, void (*) (void *, char *, ...), + void *); /* Format a packet in human-readable form */ +void log_packet(u_char *, int, char *, int); /* Format a packet and log it with syslog */ -void print_string __P((char *, int, void (*) (void *, char *, ...), - void *)); /* Format a string for output */ -int fmtmsg __P((char *, int, char *, ...)); /* sprintf++ */ -int vfmtmsg __P((char *, int, char *, va_list)); /* vsprintf++ */ -void script_setenv __P((char *, char *)); /* set script env var */ -void script_unsetenv __P((char *)); /* unset script env var */ +void print_string(char *, int, void (*) (void *, char *, ...), + void *); /* Format a string for output */ +int fmtmsg(char *, int, char *, ...); /* sprintf++ */ +int vfmtmsg(char *, int, char *, va_list); /* vsprintf++ */ +void script_setenv(char *, char *); /* set script env var */ +void script_unsetenv(char *); /* unset script env var */ /* Procedures exported from auth.c */ -void link_required __P((int)); /* we are starting to use the link */ -void link_terminated __P((int)); /* we are finished with the link */ -void link_down __P((int)); /* the LCP layer has left the Opened state */ -void link_established __P((int)); /* the link is up; authenticate now */ -void np_up __P((int, int)); /* a network protocol has come up */ -void np_down __P((int, int)); /* a network protocol has gone down */ -void np_finished __P((int, int)); /* a network protocol no longer needs link */ -void auth_peer_fail __P((int, int)); +void link_required(int); /* we are starting to use the link */ +void link_terminated(int); /* we are finished with the link */ +void link_down(int); /* the LCP layer has left the Opened state */ +void link_established(int); /* the link is up; authenticate now */ +void np_up(int, int); /* a network protocol has come up */ +void np_down(int, int); /* a network protocol has gone down */ +void np_finished(int, int); /* a network protocol no longer needs link */ +void auth_peer_fail(int, int); /* peer failed to authenticate itself */ -void auth_peer_success __P((int, int, char *, int)); +void auth_peer_success(int, int, char *, int); /* peer successfully authenticated itself */ -void auth_withpeer_fail __P((int, int)); +void auth_withpeer_fail(int, int); /* we failed to authenticate ourselves */ -void auth_withpeer_success __P((int, int)); +void auth_withpeer_success(int, int); /* we successfully authenticated ourselves */ -void auth_check_options __P((void)); +void auth_check_options(void); /* check authentication options supplied */ -void auth_reset __P((int)); /* check what secrets we have */ -int check_passwd __P((int, char *, int, char *, int, char **, int *)); +void auth_reset(int); /* check what secrets we have */ +int check_passwd(int, char *, int, char *, int, char **, int *); /* Check peer-supplied username/password */ -int get_secret __P((int, char *, char *, char *, int *, int)); +int get_secret(int, char *, char *, char *, int *, int); /* get "secret" for chap */ -int auth_ip_addr __P((int, u_int32_t)); +int auth_ip_addr(int, u_int32_t); /* check if IP address is authorized */ -int bad_ip_adrs __P((u_int32_t)); +int bad_ip_adrs(u_int32_t); /* check if IP address is unreasonable */ -void check_access __P((FILE *, char *)); +void check_access(FILE *, char *); /* check permissions on secrets file */ /* Procedures exported from demand.c */ -void demand_conf __P((void)); /* config interface(s) for demand-dial */ -void demand_block __P((void)); /* set all NPs to queue up packets */ -void demand_unblock __P((void)); /* set all NPs to pass packets */ -void demand_discard __P((void)); /* set all NPs to discard packets */ -void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ -int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ -int loop_frame __P((unsigned char *, int)); /* process frame from loopback */ +void demand_conf(void); /* config interface(s for demand-dial */ +void demand_block(void); /* set all NPs to queue up packets */ +void demand_unblock(void); /* set all NPs to pass packets */ +void demand_discard(void); /* set all NPs to discard packets */ +void demand_rexmit(int); /* retransmit saved frames for an NP */ +int loop_chars(unsigned char *, int); /* process chars from loopback */ +int loop_frame(unsigned char *, int); /* process frame from loopback */ /* Procedures exported from sys-*.c */ -void sys_init __P((void)); /* Do system-dependent initialization */ -void sys_cleanup __P((void)); /* Restore system state before exiting */ -void sys_check_options __P((void)); /* Check options specified */ -void sys_close __P((void)); /* Clean up in a child before execing */ -int ppp_available __P((void)); /* Test whether ppp kernel support exists */ -void open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ -void establish_ppp __P((int)); /* Turn serial port into a ppp interface */ -void restore_loop __P((void)); /* Transfer ppp unit back to loopback */ -void disestablish_ppp __P((int)); /* Restore port to normal operation */ -void clean_check __P((void)); /* Check if line was 8-bit clean */ -void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ -void restore_tty __P((int)); /* Restore port's original parameters */ -void setdtr __P((int, int)); /* Raise or lower port's DTR line */ -void output __P((int, u_char *, int)); /* Output a PPP packet */ -void wait_input __P((struct timeval *)); +void sys_init(void); /* Do system-dependent initialization */ +void sys_cleanup(void); /* Restore system state before exiting */ +void sys_check_options(void); /* Check options specified */ +void sys_close(void); /* Clean up in a child before execing */ +int ppp_available(void); /* Test whether ppp kernel support exists */ +void open_ppp_loopback(void); /* Open loopback for demand-dialling */ +void establish_ppp(int); /* Turn serial port into a ppp interface */ +void restore_loop(void); /* Transfer ppp unit back to loopback */ +void disestablish_ppp(int); /* Restore port to normal operation */ +void clean_check(void); /* Check if line was 8-bit clean */ +void set_up_tty(int, int); /* Set up port's speed, parameters, etc. */ +void restore_tty(int); /* Restore port's original parameters */ +void setdtr(int, int); /* Raise or lower port's DTR line */ +void output(int, u_char *, int); /* Output a PPP packet */ +void wait_input(struct timeval *); /* Wait for input, with timeout */ -void wait_loop_output __P((struct timeval *)); +void wait_loop_output(struct timeval *); /* Wait for pkt from loopback, with timeout */ -void wait_time __P((struct timeval *)); /* Wait for given length of time */ -int read_packet __P((u_char *)); /* Read PPP packet */ -int get_loop_output __P((void)); /* Read pkts from loopback */ -void ppp_send_config __P((int, int, u_int32_t, int, int)); +void wait_time(struct timeval *); /* Wait for given length of time */ +int read_packet(u_char *); /* Read PPP packet */ +int get_loop_output(void); /* Read pkts from loopback */ +void ppp_send_config(int, int, u_int32_t, int, int); /* Configure i/f transmit parameters */ -void ppp_set_xaccm __P((int, ext_accm)); +void ppp_set_xaccm(int, ext_accm); /* Set extended transmit ACCM */ -void ppp_recv_config __P((int, int, u_int32_t, int, int)); +void ppp_recv_config(int, int, u_int32_t, int, int); /* Configure i/f receive parameters */ -int ccp_test __P((int, u_char *, int, int)); +int ccp_test(int, u_char *, int, int); /* Test support for compression scheme */ -void ccp_flags_set __P((int, int, int)); +void ccp_flags_set(int, int, int); /* Set kernel CCP state */ -int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ -int get_idle_time __P((int, struct ppp_idle *)); +int ccp_fatal_error(int); /* Test for fatal decomp error in kernel */ +int get_idle_time(int, struct ppp_idle *); /* Find out how long link has been idle */ -int sifvjcomp __P((int, int, int, int)); +int sifvjcomp(int, int, int, int); /* Configure VJ TCP header compression */ -int sifup __P((int)); /* Configure i/f up (for IP) */ -int sifnpmode __P((int u, int proto, enum NPmode mode)); +int sifup(int); /* Configure i/f up (for IP) */ +int sifnpmode(int u, int proto, enum NPmode mode); /* Set mode for handling packets for proto */ -int sifdown __P((int)); /* Configure i/f down (for IP) */ -int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); +int sifdown(int); /* Configure i/f down (for IP) */ +int sifaddr(int, u_int32_t, u_int32_t, u_int32_t); /* Configure IP addresses for i/f */ -int cifaddr __P((int, u_int32_t, u_int32_t)); +int cifaddr(int, u_int32_t, u_int32_t); /* Reset i/f IP addresses */ -int sifdefaultroute __P((int, u_int32_t, u_int32_t)); +int sifdefaultroute(int, u_int32_t, u_int32_t); /* Create default route through i/f */ -int cifdefaultroute __P((int, u_int32_t, u_int32_t)); +int cifdefaultroute(int, u_int32_t, u_int32_t); /* Delete default route through i/f */ -int sifproxyarp __P((int, u_int32_t)); +int sifproxyarp(int, u_int32_t); /* Add proxy ARP entry for peer */ -int cifproxyarp __P((int, u_int32_t)); +int cifproxyarp(int, u_int32_t); /* Delete proxy ARP entry for peer */ -u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ -int lock __P((char *)); /* Create lock file for device */ -void unlock __P((void)); /* Delete previously-created lock file */ -int daemon __P((int, int)); /* Detach us from terminal session */ -void logwtmp __P((const char *, const char *, const char *)); +u_int32_t GetMask(u_int32_t); /* Get appropriate netmask for address */ +int lock(char *); /* Create lock file for device */ +void unlock(void); /* Delete previously-created lock file */ +int daemon(int, int); /* Detach us from terminal session */ +void logwtmp(const char *, const char *, const char *); /* Write entry to wtmp file */ -int get_host_seed __P((void)); /* Get host-dependent random number seed */ +int get_host_seed(void); /* Get host-dependent random number seed */ #ifdef PPP_FILTER -int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); +int set_filters(struct bpf_program *pass, struct bpf_program *active); /* Set filter programs in kernel */ #endif /* Procedures exported from options.c */ -int parse_args __P((int argc, char **argv)); +int parse_args(int argc, char **argv); /* Parse options from arguments given */ -void usage __P((void)); /* Print a usage message */ -int options_from_file __P((char *filename, int must_exist, int check_prot, - int privileged)); +void usage(void); /* Print a usage message */ +int options_from_file(char *filename, int must_exist, int check_prot, + int privileged); /* Parse options from an options file */ -int options_from_user __P((void)); /* Parse options from user's .ppprc */ -int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ -void scan_args __P((int argc, char **argv)); +int options_from_user(void); /* Parse options from user's .ppprc */ +int options_for_tty(void); /* Parse options from /etc/ppp/options.tty */ +void scan_args(int argc, char **argv); /* Look for tty name in command-line args */ -int getword __P((FILE *f, char *word, int *newlinep, char *filename)); +int getword(FILE *f, char *word, int *newlinep, char *filename); /* Read a word from a file */ -void option_error __P((char *fmt, ...)); +void option_error(char *fmt, ...); /* Print an error message about an option */ -int setipaddr __P((char *)); /* set IP addresses */ +int setipaddr(char *); /* set IP addresses */ /* diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index 349886b44d..a823bdf5c7 100644 --- a/usr.sbin/pppd/sys-bsd.c +++ b/usr.sbin/pppd/sys-bsd.c @@ -20,7 +20,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/sys-bsd.c,v 1.17.2.1 2002/09/17 16:53:55 nectar Exp $ - * $DragonFly: src/usr.sbin/pppd/sys-bsd.c,v 1.3 2003/08/08 04:18:47 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/sys-bsd.c,v 1.4 2003/11/03 19:31:40 eirikn Exp $ */ /* $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */ @@ -104,8 +104,8 @@ static u_int32_t default_route_gateway; /* gateway addr for default route */ static u_int32_t proxy_arp_addr; /* remote addr for proxy arp */ /* Prototypes for procedures local to this file. */ -static int dodefaultroute __P((u_int32_t, int)); -static int get_ether_addr __P((u_int32_t, struct sockaddr_dl *)); +static int dodefaultroute(u_int32_t, int); +static int get_ether_addr(u_int32_t, struct sockaddr_dl *); /* diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c index c6c48f5fe0..e0f3a3a95a 100644 --- a/usr.sbin/pppd/upap.c +++ b/usr.sbin/pppd/upap.c @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/upap.c,v 1.8 1999/08/28 01:19:08 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/upap.c,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/upap.c,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -36,13 +36,13 @@ /* * Protocol entry points. */ -static void upap_init __P((int)); -static void upap_lowerup __P((int)); -static void upap_lowerdown __P((int)); -static void upap_input __P((int, u_char *, int)); -static void upap_protrej __P((int)); -static int upap_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); +static void upap_init(int); +static void upap_lowerup(int); +static void upap_lowerdown(int); +static void upap_input(int, u_char *, int); +static void upap_protrej(int); +static int upap_printpkt(u_char *, int, + void (*)(void *, char *, ...), void *); struct protent pap_protent = { PPP_PAP, @@ -64,13 +64,13 @@ struct protent pap_protent = { upap_state upap[NUM_PPP]; /* UPAP state; one for each unit */ -static void upap_timeout __P((void *)); -static void upap_reqtimeout __P((void *)); -static void upap_rauthreq __P((upap_state *, u_char *, int, int)); -static void upap_rauthack __P((upap_state *, u_char *, int, int)); -static void upap_rauthnak __P((upap_state *, u_char *, int, int)); -static void upap_sauthreq __P((upap_state *)); -static void upap_sresp __P((upap_state *, int, int, char *, int)); +static void upap_timeout(void *); +static void upap_reqtimeout(void *); +static void upap_rauthreq(upap_state *, u_char *, int, int); +static void upap_rauthack(upap_state *, u_char *, int, int); +static void upap_rauthnak(upap_state *, u_char *, int, int); +static void upap_sauthreq(upap_state *); +static void upap_sresp(upap_state *, int, int, char *, int); /* @@ -550,7 +550,7 @@ static int upap_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len; diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h index 91a10fd9fe..c304ecf072 100644 --- a/usr.sbin/pppd/upap.h +++ b/usr.sbin/pppd/upap.h @@ -17,7 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppd/upap.h,v 1.7 1999/08/28 01:19:09 peter Exp $ - * $DragonFly: src/usr.sbin/pppd/upap.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pppd/upap.h,v 1.3 2003/11/03 19:31:40 eirikn Exp $ */ /* @@ -82,7 +82,7 @@ typedef struct upap_state { extern upap_state upap[]; -void upap_authwithpeer __P((int, char *, char *)); -void upap_authpeer __P((int)); +void upap_authwithpeer(int, char *, char *); +void upap_authpeer(int); extern struct protent pap_protent; diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c index bd21f135a8..9d89e28706 100644 --- a/usr.sbin/pppstats/pppstats.c +++ b/usr.sbin/pppstats/pppstats.c @@ -31,7 +31,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/usr.sbin/pppstats/pppstats.c,v 1.13 1999/08/28 01:19:11 peter Exp $ - * $DragonFly: src/usr.sbin/pppstats/pppstats.c,v 1.3 2003/08/08 04:18:47 dillon Exp $ + * $DragonFly: src/usr.sbin/pppstats/pppstats.c,v 1.4 2003/11/03 19:31:41 eirikn Exp $ */ #include @@ -76,13 +76,13 @@ extern int optind; extern char *optarg; #endif -static void usage __P((void)); -static void catchalarm __P((int)); -static void get_ppp_stats __P((struct ppp_stats *)); -static void get_ppp_cstats __P((struct ppp_comp_stats *)); -static void intpr __P((void)); +static void usage(void); +static void catchalarm(int); +static void get_ppp_stats(struct ppp_stats *); +static void get_ppp_cstats(struct ppp_comp_stats *); +static void intpr(void); -int main __P((int, char *argv[])); +int main(int, char *argv[]); static void usage() diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index f370bf172d..428297f1dc 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)pstat.c 8.16 (Berkeley) 5/9/95 * $FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.49.2.5 2002/07/12 09:12:49 des Exp $ - * $DragonFly: src/usr.sbin/pstat/pstat.c,v 1.4 2003/08/27 03:21:50 dillon Exp $ + * $DragonFly: src/usr.sbin/pstat/pstat.c,v 1.5 2003/11/03 19:31:41 eirikn Exp $ */ #define _KERNEL_STRUCTURES @@ -183,29 +183,29 @@ struct { return (0); \ } -void filemode __P((void)); -int getfiles __P((char **, int *)); +void filemode(void); +int getfiles(char **, int *); struct mount * - getmnt __P((struct mount *)); + getmnt(struct mount *); struct e_vnode * - kinfo_vnodes __P((int *)); + kinfo_vnodes(int *); struct e_vnode * - loadvnodes __P((int *)); -void mount_print __P((struct mount *)); -void nfs_header __P((void)); -int nfs_print __P((struct vnode *)); -void swapmode __P((void)); -void ttymode __P((void)); -void ttyprt __P((struct tty *, int)); -void ttytype __P((struct tty *, char *, int, int, int)); -void ufs_header __P((void)); -int ufs_print __P((struct vnode *)); -void union_header __P((void)); -int union_print __P((struct vnode *)); -static void usage __P((void)); -void vnode_header __P((void)); -void vnode_print __P((struct vnode *, struct vnode *)); -void vnodemode __P((void)); + loadvnodes(int *); +void mount_print(struct mount *); +void nfs_header(void); +int nfs_print(struct vnode *); +void swapmode(void); +void ttymode(void); +void ttyprt(struct tty *, int); +void ttytype(struct tty *, char *, int, int, int); +void ufs_header(void); +int ufs_print(struct vnode *); +void union_header(void); +int union_print(struct vnode *); +static void usage(void); +void vnode_header(void); +void vnode_print(struct vnode *, struct vnode *); +void vnodemode(void); int main(argc, argv) diff --git a/usr.sbin/pw/bitmap.h b/usr.sbin/pw/bitmap.h index 7a4078f440..ad07486ce4 100644 --- a/usr.sbin/pw/bitmap.h +++ b/usr.sbin/pw/bitmap.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/pw/bitmap.h,v 1.4 1999/08/28 01:19:16 peter Exp $ - * $DragonFly: src/usr.sbin/pw/bitmap.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pw/bitmap.h,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ #ifndef _BITMAP_H_ @@ -39,13 +39,13 @@ struct bitmap }; __BEGIN_DECLS -struct bitmap bm_alloc __P((int size)); -void bm_dealloc __P((struct bitmap * bm)); -void bm_setbit __P((struct bitmap * bm, int pos)); -void bm_clrbit __P((struct bitmap * bm, int pos)); -int bm_isset __P((struct bitmap * bm, int pos)); -int bm_firstunset __P((struct bitmap * bm)); -int bm_lastset __P((struct bitmap * bm)); +struct bitmap bm_alloc(int size); +void bm_dealloc(struct bitmap * bm); +void bm_setbit(struct bitmap * bm, int pos); +void bm_clrbit(struct bitmap * bm, int pos); +int bm_isset(struct bitmap * bm, int pos); +int bm_firstunset(struct bitmap * bm); +int bm_lastset(struct bitmap * bm); __END_DECLS #endif /* !_BITMAP_H */ diff --git a/usr.sbin/pw/psdate.h b/usr.sbin/pw/psdate.h index 45be42a456..f234cadaf6 100644 --- a/usr.sbin/pw/psdate.h +++ b/usr.sbin/pw/psdate.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/pw/psdate.h,v 1.4 1999/08/28 01:19:17 peter Exp $ - * $DragonFly: src/usr.sbin/pw/psdate.h,v 1.2 2003/06/17 04:30:01 dillon Exp $ + * $DragonFly: src/usr.sbin/pw/psdate.h,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ #ifndef _PSDATE_H_ @@ -34,8 +34,8 @@ #include __BEGIN_DECLS -time_t parse_date __P((time_t dt, char const * str)); -void print_date __P((char *buf, time_t t, int dotime)); +time_t parse_date(time_t dt, char const * str); +void print_date(char *buf, time_t t, int dotime); __END_DECLS #endif /* !_PSDATE_H_ */ diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h index 78f0a117d7..1d8b08bd8c 100644 --- a/usr.sbin/pw/pwupd.h +++ b/usr.sbin/pw/pwupd.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/pw/pwupd.h,v 1.7 2000/01/15 00:20:22 davidn Exp $ - * $DragonFly: src/usr.sbin/pw/pwupd.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/pw/pwupd.h,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ #ifndef _PWUPD_H_ @@ -50,7 +50,7 @@ enum updtype }; __BEGIN_DECLS -int fileupdate __P((char const * fname, mode_t fm, char const * nline, char const * pfx, int pfxlen, int updmode)); +int fileupdate(char const * fname, mode_t fm, char const * nline, char const * pfx, int pfxlen, int updmode); __END_DECLS enum pwdfmttype @@ -113,47 +113,47 @@ extern struct pwf VPWF; #endif __BEGIN_DECLS -int addpwent __P((struct passwd * pwd)); -int delpwent __P((struct passwd * pwd)); -int chgpwent __P((char const * login, struct passwd * pwd)); -int fmtpwent __P((char *buf, struct passwd * pwd)); -int fmtpwentry __P((char *buf, struct passwd * pwd, int type)); - -int setpwdir __P((const char * dir)); -char * getpwpath __P((char const * file)); -int pwdb __P((char *arg, ...)); - -int addgrent __P((struct group * grp)); -int delgrent __P((struct group * grp)); -int chggrent __P((char const * name, struct group * grp)); -int fmtgrent __P((char **buf, int * buflen, struct group * grp)); -int fmtgrentry __P((char **buf, int * buflen, struct group * grp, int type)); -int editgroups __P((char *name, char **groups)); - -int setgrdir __P((const char * dir)); -char * getgrpath __P((const char *file)); -int grdb __P((char *arg, ...)); - -void vsetpwent __P((void)); -void vendpwent __P((void)); -struct passwd * vgetpwent __P((void)); -struct passwd * vgetpwuid __P((uid_t uid)); -struct passwd * vgetpwnam __P((const char * nam)); -struct passwd * vgetpwent __P((void)); -int vpwdb __P((char *arg, ...)); - -struct group * vgetgrent __P((void)); -struct group * vgetgrgid __P((gid_t gid)); -struct group * vgetgrnam __P((const char * nam)); -struct group * vgetgrent __P((void)); -int vgrdb __P((char *arg, ...)); -RET_SETGRENT vsetgrent __P((void)); -void vendgrent __P((void)); - -void copymkdir __P((char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid)); -void rm_r __P((char const * dir, uid_t uid)); -int extendline __P((char **buf, int *buflen, int needed)); -int extendarray __P((char ***buf, int *buflen, int needed)); +int addpwent(struct passwd * pwd); +int delpwent(struct passwd * pwd); +int chgpwent(char const * login, struct passwd * pwd); +int fmtpwent(char *buf, struct passwd * pwd); +int fmtpwentry(char *buf, struct passwd * pwd, int type); + +int setpwdir(const char * dir); +char * getpwpath(char const * file); +int pwdb(char *arg, ...); + +int addgrent(struct group * grp); +int delgrent(struct group * grp); +int chggrent(char const * name, struct group * grp); +int fmtgrent(char **buf, int * buflen, struct group * grp); +int fmtgrentry(char **buf, int * buflen, struct group * grp, int type); +int editgroups(char *name, char **groups); + +int setgrdir(const char * dir); +char * getgrpath(const char *file); +int grdb(char *arg, ...); + +void vsetpwent(void); +void vendpwent(void); +struct passwd * vgetpwent(void); +struct passwd * vgetpwuid(uid_t uid); +struct passwd * vgetpwnam(const char * nam); +struct passwd * vgetpwent(void); +int vpwdb(char *arg, ...); + +struct group * vgetgrent(void); +struct group * vgetgrgid(gid_t gid); +struct group * vgetgrnam(const char * nam); +struct group * vgetgrent(void); +int vgrdb(char *arg, ...); +RET_SETGRENT vsetgrent(void); +void vendgrent(void); + +void copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid); +void rm_r(char const * dir, uid_t uid); +int extendline(char **buf, int *buflen, int needed); +int extendarray(char ***buf, int *buflen, int needed); __END_DECLS #define PWBUFSZ 1024 diff --git a/usr.sbin/pwd_mkdb/pw_scan.h b/usr.sbin/pwd_mkdb/pw_scan.h index 96ccc8d81d..8c2374f065 100644 --- a/usr.sbin/pwd_mkdb/pw_scan.h +++ b/usr.sbin/pwd_mkdb/pw_scan.h @@ -33,9 +33,9 @@ * @(#)pw_scan.h 8.1 (Berkeley) 4/1/94 * * $FreeBSD: src/usr.sbin/pwd_mkdb/pw_scan.h,v 1.2 1999/11/15 16:45:37 sheldonh Exp $ - * $DragonFly: src/usr.sbin/pwd_mkdb/pw_scan.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/pwd_mkdb/pw_scan.h,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ extern int pw_big_ids_warning; -extern int pw_scan __P((char *, struct passwd *)); +extern int pw_scan(char *, struct passwd *); diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index 83b0b2aa54..05f423d86a 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.c +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94 * $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.35 2000/03/09 18:11:16 paul Exp $ - * $DragonFly: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ #include @@ -75,12 +75,12 @@ static char prefix[MAXPATHLEN]; static int is_comment; /* flag for comments */ static char line[LINE_MAX]; -void cleanup __P((void)); -void error __P((char *)); -void cp __P((char *, char *, mode_t mode)); -void mv __P((char *, char *)); -int scan __P((FILE *, struct passwd *)); -static void usage __P((void)); +void cleanup(void); +void error(char *); +void cp(char *, char *, mode_t mode); +void mv(char *, char *); +int scan(FILE *, struct passwd *); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c index 3c99c3d611..343fe1fef8 100644 --- a/usr.sbin/quotaon/quotaon.c +++ b/usr.sbin/quotaon/quotaon.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)quotaon.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.4.2.1 2001/07/19 05:17:06 kris Exp $ - * $DragonFly: src/usr.sbin/quotaon/quotaon.c,v 1.3 2003/08/08 04:18:48 dillon Exp $ + * $DragonFly: src/usr.sbin/quotaon/quotaon.c,v 1.4 2003/11/03 19:31:41 eirikn Exp $ */ /* @@ -61,11 +61,11 @@ int gflag; /* operate on group quotas */ int uflag; /* operate on user quotas */ int vflag; /* verbose */ -int hasquota __P((struct fstab *, int, char **)); -int oneof __P((char *, char *[], int)); -int quotaonoff __P((struct fstab *fs, int, int, char *)); -int readonly __P((struct fstab *)); -static void usage __P((void)); +int hasquota(struct fstab *, int, char **); +int oneof(char *, char *[], int); +int quotaonoff(struct fstab *fs, int, int, char *); +int readonly(struct fstab *); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c index bbbb7b81a6..55ceb2f665 100644 --- a/usr.sbin/repquota/repquota.c +++ b/usr.sbin/repquota/repquota.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)repquota.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.9.2.2 2002/03/15 22:18:25 mikeh Exp $ - * $DragonFly: src/usr.sbin/repquota/repquota.c,v 1.3 2003/08/08 04:18:48 dillon Exp $ + * $DragonFly: src/usr.sbin/repquota/repquota.c,v 1.4 2003/11/03 19:31:41 eirikn Exp $ */ /* @@ -88,11 +88,11 @@ u_long highid[MAXQUOTAS]; /* highest addid()'ed identifier per type */ int vflag; /* verbose */ int aflag; /* all file systems */ -int hasquota __P((struct fstab *, int, char **)); -int oneof __P((char *, char *[], int)); -int repquota __P((struct fstab *, int, char *)); -char *timeprt __P((time_t)); -static void usage __P((void)); +int hasquota(struct fstab *, int, char **); +int oneof(char *, char *[], int); +int repquota(struct fstab *, int, char *); +char *timeprt(time_t); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c index fa90213f4d..bf39433a3d 100644 --- a/usr.sbin/rip6query/rip6query.c +++ b/usr.sbin/rip6query/rip6query.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rip6query/rip6query.c,v 1.3.2.2 2001/07/03 11:02:08 ume Exp $ - * $DragonFly: src/usr.sbin/rip6query/rip6query.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rip6query/rip6query.c,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ #include @@ -68,10 +68,10 @@ struct rip6 *ripbuf; #define RIPSIZE(n) (sizeof(struct rip6) + (n-1) * sizeof(struct netinfo6)) -int main __P((int, char **)); -static void usage __P((void)); -static const char *sa_n2a __P((struct sockaddr *)); -static const char *inet6_n2a __P((struct in6_addr *)); +int main(int, char **); +static void usage(void); +static const char *sa_n2a(struct sockaddr *); +static const char *inet6_n2a(struct in6_addr *); int main(argc, argv) diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c index 004dccdb3a..3fb0825ed3 100644 --- a/usr.sbin/rmt/rmt.c +++ b/usr.sbin/rmt/rmt.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)rmt.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/rmt/rmt.c,v 1.7 2000/02/12 01:14:33 mjacob Exp $ - * $DragonFly: src/usr.sbin/rmt/rmt.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rmt/rmt.c,v 1.3 2003/11/03 19:31:41 eirikn Exp $ */ /* @@ -66,9 +66,9 @@ FILE *debug; #define DEBUG1(f,a) if (debug) fprintf(debug, f, a) #define DEBUG2(f,a1,a2) if (debug) fprintf(debug, f, a1, a2) -char *checkbuf __P((char *, int)); -void error __P((int)); -void getstring __P((char *)); +char *checkbuf(char *, int); +void error(int); +void getstring(char *); int main(argc, argv) diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index ae568d0899..e2600a8b19 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/route6d/route6d.c,v 1.2.2.5 2001/07/03 11:02:09 ume Exp $ */ -/* $DragonFly: src/usr.sbin/route6d/route6d.c,v 1.3 2003/08/27 03:21:50 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/route6d/route6d.c,v 1.4 2003/11/03 19:31:42 eirikn Exp $ */ /* $KAME: route6d.c,v 1.64 2001/05/08 04:36:37 itojun Exp $ */ /* @@ -208,66 +208,66 @@ volatile sig_atomic_t seenusr1; #define RRTF_SENDANYWAY 0x40000000 #define RRTF_CHANGED 0x80000000 -int main __P((int, char **)); -void sighandler __P((int)); -void ripalarm __P((void)); -void riprecv __P((void)); -void ripsend __P((struct ifc *, struct sockaddr_in6 *, int)); -int out_filter __P((struct riprt *, struct ifc *)); -void init __P((void)); -void sockopt __P((struct ifc *)); -void ifconfig __P((void)); -void ifconfig1 __P((const char *, const struct sockaddr *, struct ifc *, int)); -void rtrecv __P((void)); -int rt_del __P((const struct sockaddr_in6 *, const struct sockaddr_in6 *, - const struct sockaddr_in6 *)); -int rt_deladdr __P((struct ifc *, const struct sockaddr_in6 *, - const struct sockaddr_in6 *)); -void filterconfig __P((void)); -int getifmtu __P((int)); -const char *rttypes __P((struct rt_msghdr *)); -const char *rtflags __P((struct rt_msghdr *)); -const char *ifflags __P((int)); -int ifrt __P((struct ifc *, int)); -void ifrt_p2p __P((struct ifc *, int)); -void applymask __P((struct in6_addr *, struct in6_addr *)); -void applyplen __P((struct in6_addr *, int)); -void ifrtdump __P((int)); -void ifdump __P((int)); -void ifdump0 __P((FILE *, const struct ifc *)); -void rtdump __P((int)); -void rt_entry __P((struct rt_msghdr *, int)); -void rtdexit __P((void)); -void riprequest __P((struct ifc *, struct netinfo6 *, int, - struct sockaddr_in6 *)); -void ripflush __P((struct ifc *, struct sockaddr_in6 *)); -void sendrequest __P((struct ifc *)); -int sin6mask2len __P((const struct sockaddr_in6 *)); -int mask2len __P((const struct in6_addr *, int)); -int sendpacket __P((struct sockaddr_in6 *, int)); -int addroute __P((struct riprt *, const struct in6_addr *, struct ifc *)); -int delroute __P((struct netinfo6 *, struct in6_addr *)); -struct in6_addr *getroute __P((struct netinfo6 *, struct in6_addr *)); -void krtread __P((int)); -int tobeadv __P((struct riprt *, struct ifc *)); -char *allocopy __P((char *)); -char *hms __P((void)); -const char *inet6_n2p __P((const struct in6_addr *)); -struct ifac *ifa_match __P((const struct ifc *, const struct in6_addr *, int)); -struct in6_addr *plen2mask __P((int)); -struct riprt *rtsearch __P((struct netinfo6 *, struct riprt **)); -int ripinterval __P((int)); -time_t ripsuptrig __P((void)); -void fatal __P((const char *, ...)) +int main(int, char **); +void sighandler(int); +void ripalarm(void); +void riprecv(void); +void ripsend(struct ifc *, struct sockaddr_in6 *, int); +int out_filter(struct riprt *, struct ifc *); +void init(void); +void sockopt(struct ifc *); +void ifconfig(void); +void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int); +void rtrecv(void); +int rt_del(const struct sockaddr_in6 *, const struct sockaddr_in6 *, + const struct sockaddr_in6 *); +int rt_deladdr(struct ifc *, const struct sockaddr_in6 *, + const struct sockaddr_in6 *); +void filterconfig(void); +int getifmtu(int); +const char *rttypes(struct rt_msghdr *); +const char *rtflags(struct rt_msghdr *); +const char *ifflags(int); +int ifrt(struct ifc *, int); +void ifrt_p2p(struct ifc *, int); +void applymask(struct in6_addr *, struct in6_addr *); +void applyplen(struct in6_addr *, int); +void ifrtdump(int); +void ifdump(int); +void ifdump0(FILE *, const struct ifc *); +void rtdump(int); +void rt_entry(struct rt_msghdr *, int); +void rtdexit(void); +void riprequest(struct ifc *, struct netinfo6 *, int, + struct sockaddr_in6 *); +void ripflush(struct ifc *, struct sockaddr_in6 *); +void sendrequest(struct ifc *); +int sin6mask2len(const struct sockaddr_in6 *); +int mask2len(const struct in6_addr *, int); +int sendpacket(struct sockaddr_in6 *, int); +int addroute(struct riprt *, const struct in6_addr *, struct ifc *); +int delroute(struct netinfo6 *, struct in6_addr *); +struct in6_addr *getroute(struct netinfo6 *, struct in6_addr *); +void krtread(int); +int tobeadv(struct riprt *, struct ifc *); +char *allocopy(char *); +char *hms(void); +const char *inet6_n2p(const struct in6_addr *); +struct ifac *ifa_match(const struct ifc *, const struct in6_addr *, int); +struct in6_addr *plen2mask(int); +struct riprt *rtsearch(struct netinfo6 *, struct riprt **); +int ripinterval(int); +time_t ripsuptrig(void); +void fatal(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -void trace __P((int, const char *, ...)) +void trace(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3))); -void tracet __P((int, const char *, ...)) +void tracet(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3))); -unsigned int if_maxindex __P((void)); -struct ifc *ifc_find __P((char *)); -struct iff *iff_find __P((struct ifc *, int)); -void setindex2ifc __P((int, struct ifc *)); +unsigned int if_maxindex(void); +struct ifc *ifc_find(char *); +struct iff *iff_find(struct ifc *, int); +void setindex2ifc(int, struct ifc *); #define MALLOC(type) ((type *)malloc(sizeof(type))) diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c index f43d63ff7e..a0e1ad96cf 100644 --- a/usr.sbin/rpc.lockd/lockd.c +++ b/usr.sbin/rpc.lockd/lockd.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.5.2.1 2001/08/01 06:39:36 alfred Exp $ - * $DragonFly: src/usr.sbin/rpc.lockd/lockd.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rpc.lockd/lockd.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ /* main() function for NFS lock daemon. Most of the code in this */ @@ -44,10 +44,10 @@ #include #include "lockd.h" -void nlm_prog_1 __P((struct svc_req *, SVCXPRT *)); -void nlm_prog_3 __P((struct svc_req *, SVCXPRT *)); -void nlm_prog_4 __P((struct svc_req *, SVCXPRT *)); -static void usage __P((void)); +void nlm_prog_1(struct svc_req *, SVCXPRT *); +void nlm_prog_3(struct svc_req *, SVCXPRT *); +void nlm_prog_4(struct svc_req *, SVCXPRT *); +static void usage(void); int debug_level = 0; /* Zero means no debugging syslog() calls */ diff --git a/usr.sbin/rpc.statd/statd.c b/usr.sbin/rpc.statd/statd.c index c6edbdf76e..ee5e3d5210 100644 --- a/usr.sbin/rpc.statd/statd.c +++ b/usr.sbin/rpc.statd/statd.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rpc.statd/statd.c,v 1.6 1999/10/05 14:40:38 marcel Exp $ - * $DragonFly: src/usr.sbin/rpc.statd/statd.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rpc.statd/statd.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ /* main() function for status monitor daemon. Some of the code in this */ @@ -52,7 +52,7 @@ int debug = 0; /* Controls syslog() calls for debug messages */ extern void sm_prog_1(struct svc_req *rqstp, SVCXPRT *transp); static void handle_sigchld(); -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h index 3185149349..4aa45217da 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h +++ b/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.9.2.1 2002/02/15 00:46:57 des Exp $ - * $DragonFly: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -59,8 +59,8 @@ extern char *yp_dir; extern char *progname; extern void do_master(void); extern void yppasswdprog_1(struct svc_req *, register SVCXPRT *); -extern void master_yppasswdprog_1 __P((struct svc_req *, - register SVCXPRT *)); +extern void master_yppasswdprog_1(struct svc_req *, + register SVCXPRT *); extern void reaper(int); extern void install_reaper(int); extern int pw_copy(int, int, struct passwd *); @@ -68,7 +68,7 @@ extern int pw_lock(void); extern int pw_mkdb(char *); extern int pw_tmp(void); extern void pw_init(void); -extern char *ok_shell __P ((char *)); +extern char *ok_shell(char *); extern char *passfile; extern char *passfile_default; extern char *tempname; diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l index 3ab53422d9..77152e4168 100644 --- a/usr.sbin/rrenumd/lexer.l +++ b/usr.sbin/rrenumd/lexer.l @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rrenumd/lexer.l,v 1.1.2.2 2001/07/03 11:02:10 ume Exp $ - * $DragonFly: src/usr.sbin/rrenumd/lexer.l,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rrenumd/lexer.l,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ %{ @@ -60,9 +60,9 @@ int lineno = 1; #define LINEBUF_SIZE 1000 char linebuf[LINEBUF_SIZE]; -int parse __P((FILE **)); -void yyerror __P((const char *)); -int yylex __P((void)); +int parse(FILE **); +void yyerror(const char *); +int yylex(void); %} /* common section */ @@ -256,7 +256,7 @@ off { int parse(FILE **fp) { - extern int yyparse __P((void)); + extern int yyparse(void); yyin = *fp; diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y index 50ada4a3d1..05e2375325 100644 --- a/usr.sbin/rrenumd/parser.y +++ b/usr.sbin/rrenumd/parser.y @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rrenumd/parser.y,v 1.1.2.2 2001/07/03 11:02:10 ume Exp $ - * $DragonFly: src/usr.sbin/rrenumd/parser.y,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rrenumd/parser.y,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ %{ @@ -64,10 +64,10 @@ u_int retry; char errbuf[LINE_MAX]; extern int lineno; -extern void yyerror __P((const char *s)); -extern int yylex __P((void)); -static struct payload_list * pllist_lookup __P((int seqnum)); -static void pllist_enqueue __P((struct payload_list *pl_entry)); +extern void yyerror(const char *s); +extern int yylex(void); +static struct payload_list * pllist_lookup(int seqnum); +static void pllist_enqueue(struct payload_list *pl_entry); #define MAX_RETRYNUM 10 /* upper limit of retry in this rrenumd program */ #define MAX_SEQNUM 256 /* upper limit of seqnum in this rrenumd program */ diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c index 44faae2580..8fed75e21c 100644 --- a/usr.sbin/rrenumd/rrenumd.c +++ b/usr.sbin/rrenumd/rrenumd.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rrenumd/rrenumd.c,v 1.1.2.4 2001/07/09 09:49:49 ume Exp $ - * $DragonFly: src/usr.sbin/rrenumd/rrenumd.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rrenumd/rrenumd.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -96,29 +96,29 @@ int with_v4dest, with_v6dest; struct in6_addr prefix; /* ADHOC */ int prefixlen = 64; /* ADHOC */ -extern int parse __P((FILE **)); +extern int parse(FILE **); -static void show_usage __P((void)); -static void init_sin6 __P((struct sockaddr_in6 *, const char *)); +static void show_usage(void); +static void init_sin6(struct sockaddr_in6 *, const char *); #if 0 -static void join_multi __P((const char *)); +static void join_multi(const char *); #endif -static void init_globals __P((void)); -static void config __P((FILE **)); +static void init_globals(void); +static void config(FILE **); #ifdef IPSEC_POLICY_IPSEC -static void sock6_open __P((struct flags *, char *)); -static void sock4_open __P((struct flags *, char *)); +static void sock6_open(struct flags *, char *); +static void sock4_open(struct flags *, char *); #else -static void sock6_open __P((struct flags *)); -static void sock4_open __P((struct flags *)); +static void sock6_open(struct flags *); +static void sock4_open(struct flags *); #endif -static void rrenum_output __P((struct payload_list *, struct dst_list *)); -static void rrenum_snd_eachdst __P((struct payload_list *)); +static void rrenum_output(struct payload_list *, struct dst_list *); +static void rrenum_snd_eachdst(struct payload_list *); #if 0 -static void rrenum_snd_fullsequence __P((void)); +static void rrenum_snd_fullsequence(void); #endif -static void rrenum_input __P((int)); -int main __P((int, char *[])); +static void rrenum_input(int); +int main(int, char *[]); /* Print usage. Don't call this after daemonized. */ diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c index 006a64e5b0..b6e060c119 100644 --- a/usr.sbin/rtadvd/advcap.c +++ b/usr.sbin/rtadvd/advcap.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/advcap.c,v 1.1.2.2 2001/07/03 11:02:13 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/advcap.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/advcap.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ /* @@ -93,15 +93,15 @@ static char *remotefile; extern char *conffile; -int tgetent __P((char *, char *)); -int getent __P((char *, char *, char *)); -int tnchktc __P((void)); -int tnamatch __P((char *)); -static char *tskip __P((char *)); -long long tgetnum __P((char *)); -int tgetflag __P((char *)); -char *tgetstr __P((char *, char **)); -static char *tdecode __P((char *, char **)); +int tgetent(char *, char *); +int getent(char *, char *, char *); +int tnchktc(void); +int tnamatch(char *); +static char *tskip(char *); +long long tgetnum(char *); +int tgetflag(char *); +char *tgetstr(char *, char **); +static char *tdecode(char *, char **); /* * Get an entry for terminal name in buffer bp, diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h index 3f5942418b..82deed1701 100644 --- a/usr.sbin/rtadvd/advcap.h +++ b/usr.sbin/rtadvd/advcap.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/advcap.h,v 1.1.2.2 2001/07/03 11:02:14 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/advcap.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/advcap.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ /* Based on Id: termcap.h,v 1.8 1996/09/10 12:42:10 peter Exp */ @@ -38,10 +38,10 @@ __BEGIN_DECLS -extern int agetent __P((char *, const char *)); -extern int agetflag __P((const char *)); -extern long long agetnum __P((const char *)); -extern char *agetstr __P((const char *, char **)); +extern int agetent(char *, const char *); +extern int agetflag(const char *); +extern long long agetnum(const char *); +extern char *agetstr(const char *, char **); __END_DECLS diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 6ccccf9b57..90d3cd0fce 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/config.c,v 1.3.2.5 2003/04/22 09:40:57 suz Exp $ - * $DragonFly: src/usr.sbin/rtadvd/config.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/config.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -77,10 +77,10 @@ static time_t prefix_timo = (60 * 120); /* 2 hours. * XXX: should be configurable. */ extern struct rainfo *ralist; -static struct rtadvd_timer *prefix_timeout __P((void *)); -static void makeentry __P((char *, size_t, int, char *, int)); -static void get_prefix __P((struct rainfo *)); -static int getinet6sysctl __P((int)); +static struct rtadvd_timer *prefix_timeout(void *); +static void makeentry(char *, size_t, int, char *, int); +static void get_prefix(struct rainfo *); +static int getinet6sysctl(int); void getconfig(intface) diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h index bc6a24b5a0..9d03c88274 100644 --- a/usr.sbin/rtadvd/config.h +++ b/usr.sbin/rtadvd/config.h @@ -29,12 +29,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/config.h,v 1.1.2.3 2002/06/29 18:59:53 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/config.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/config.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ -extern void getconfig __P((char *)); -extern void delete_prefix __P((struct prefix *)); -extern void invalidate_prefix __P((struct prefix *)); -extern void update_prefix __P((struct prefix *)); -extern void make_prefix __P((struct rainfo *, int, struct in6_addr *, int)); -extern void make_packet __P((struct rainfo *)); +extern void getconfig(char *); +extern void delete_prefix(struct prefix *); +extern void invalidate_prefix(struct prefix *); +extern void update_prefix(struct prefix *); +extern void make_prefix(struct rainfo *, int, struct in6_addr *, int); +extern void make_packet(struct rainfo *); diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c index 52d9dfd23b..3348fd39ec 100644 --- a/usr.sbin/rtadvd/dump.c +++ b/usr.sbin/rtadvd/dump.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/dump.c,v 1.1.2.3 2002/06/29 18:59:53 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/dump.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/dump.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include #include @@ -65,8 +65,8 @@ static FILE *fp; extern struct rainfo *ralist; -static char *ether_str __P((struct sockaddr_dl *)); -static void if_dump __P((void)); +static char *ether_str(struct sockaddr_dl *); +static void if_dump(void); #ifdef __FreeBSD__ /* XXX: see PORTABILITY */ #define LONGLONG "%qu" diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h index f6f6fb7d57..e30182985e 100644 --- a/usr.sbin/rtadvd/dump.h +++ b/usr.sbin/rtadvd/dump.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/dump.h,v 1.1.2.2 2001/07/03 11:02:14 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/dump.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/dump.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ -extern void rtadvd_dump_file __P((char *)); +extern void rtadvd_dump_file(char *); diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index f8ceb36746..273bd08e2c 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/if.c,v 1.2.2.3 2001/07/03 11:02:14 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/if.c,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/if.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -76,9 +76,9 @@ int iflist_init_ok; size_t ifblock_size; char *ifblock; -static void get_iflist __P((char **buf, size_t *size)); -static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf, - size_t bufsize)); +static void get_iflist(char **buf, size_t *size); +static void parse_iflist(struct if_msghdr ***ifmlist_p, char *buf, + size_t bufsize); static void get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info) diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h index d6c64bcddd..bf282ecfb0 100644 --- a/usr.sbin/rtadvd/if.h +++ b/usr.sbin/rtadvd/if.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/if.h,v 1.1.2.2 2001/07/03 11:02:14 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/if.h,v 1.2 2003/06/17 04:30:02 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/if.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #define RTADV_TYPE2BITMASK(type) (0x1 << type) @@ -39,22 +39,22 @@ extern size_t ifblock_size; extern char *ifblock; struct nd_opt_hdr; -struct sockaddr_dl *if_nametosdl __P((char *)); -int if_getmtu __P((char *)); -int if_getflags __P((int, int)); -int lladdropt_length __P((struct sockaddr_dl *)); -void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *)); -int rtbuf_len __P((void)); -char *get_next_msg __P((char *, char *, int, size_t *, int)); -struct in6_addr *get_addr __P((char *)); -int get_rtm_ifindex __P((char *)); -int get_ifm_ifindex __P((char *)); -int get_ifam_ifindex __P((char *)); -int get_ifm_flags __P((char *)); -int get_prefixlen __P((char *)); -int prefixlen __P((u_char *, u_char *)); -int rtmsg_type __P((char *)); -int ifmsg_type __P((char *)); -int rtmsg_len __P((char *)); -int ifmsg_len __P((char *)); -void init_iflist __P((void)); +struct sockaddr_dl *if_nametosdl(char *); +int if_getmtu(char *); +int if_getflags(int, int); +int lladdropt_length(struct sockaddr_dl *); +void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *); +int rtbuf_len(void); +char *get_next_msg(char *, char *, int, size_t *, int); +struct in6_addr *get_addr(char *); +int get_rtm_ifindex(char *); +int get_ifm_ifindex(char *); +int get_ifam_ifindex(char *); +int get_ifm_flags(char *); +int get_prefixlen(char *); +int prefixlen(u_char *, u_char *); +int rtmsg_type(char *); +int ifmsg_type(char *); +int rtmsg_len(char *); +int ifmsg_len(char *); +void init_iflist(void); diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h index ab483ae627..39aebb451a 100644 --- a/usr.sbin/rtadvd/rrenum.h +++ b/usr.sbin/rtadvd/rrenum.h @@ -29,8 +29,8 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/rrenum.h,v 1.1.2.2 2001/07/03 11:02:14 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/rrenum.h,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/rrenum.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ -void rr_input __P((int, struct icmp6_router_renum *, struct in6_pktinfo *, - struct sockaddr_in6 *, struct in6_addr *)); +void rr_input(int, struct icmp6_router_renum *, struct in6_pktinfo *, + struct sockaddr_in6 *, struct in6_addr *); diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index d62bcf21d2..8b28eeaae9 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/rtadvd.c,v 1.3.2.4 2003/04/05 10:31:58 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/rtadvd.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/rtadvd.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -126,24 +126,24 @@ u_int32_t ndopt_flags[] = { NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU }; -int main __P((int, char *[])); -static void set_die __P((int)); -static void die __P((void)); -static void sock_open __P((void)); -static void rtsock_open __P((void)); -static void rtadvd_input __P((void)); -static void rs_input __P((int, struct nd_router_solicit *, - struct in6_pktinfo *, struct sockaddr_in6 *)); -static void ra_input __P((int, struct nd_router_advert *, - struct in6_pktinfo *, struct sockaddr_in6 *)); -static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *, - struct sockaddr_in6 *)); -static int nd6_options __P((struct nd_opt_hdr *, int, - union nd_opts *, u_int32_t)); -static void free_ndopts __P((union nd_opts *)); -static void ra_output __P((struct rainfo *)); -static void rtmsg_input __P((void)); -static void rtadvd_set_dump_file __P((void)); +int main(int, char *[]); +static void set_die(int); +static void die(void); +static void sock_open(void); +static void rtsock_open(void); +static void rtadvd_input(void); +static void rs_input(int, struct nd_router_solicit *, + struct in6_pktinfo *, struct sockaddr_in6 *); +static void ra_input(int, struct nd_router_advert *, + struct in6_pktinfo *, struct sockaddr_in6 *); +static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *, + struct sockaddr_in6 *); +static int nd6_options(struct nd_opt_hdr *, int, + union nd_opts *, u_int32_t); +static void free_ndopts(union nd_opts *); +static void ra_output(struct rainfo *); +static void rtmsg_input(void); +static void rtadvd_set_dump_file(void); int main(argc, argv) diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h index ff1e8eb057..64c56b6a1e 100644 --- a/usr.sbin/rtadvd/rtadvd.h +++ b/usr.sbin/rtadvd/rtadvd.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/rtadvd.h,v 1.1.2.3 2002/06/29 18:59:53 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/rtadvd.h,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/rtadvd.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #define ALLNODES "ff02::1" @@ -167,12 +167,12 @@ struct rainfo { struct soliciter *soliciter; /* recent solication source */ }; -struct rtadvd_timer *ra_timeout __P((void *)); -void ra_timer_update __P((void *, struct timeval *)); +struct rtadvd_timer *ra_timeout(void *); +void ra_timer_update(void *, struct timeval *); -int prefix_match __P((struct in6_addr *, int, struct in6_addr *, int)); -struct rainfo *if_indextorainfo __P((int)); -struct prefix *find_prefix __P((struct rainfo *, struct in6_addr *, int)); +int prefix_match(struct in6_addr *, int, struct in6_addr *, int); +struct rainfo *if_indextorainfo(int); +struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int); extern struct in6_addr in6a_site_allrouters; #ifdef MIP6 diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c index 06f13eda25..d0335b34db 100644 --- a/usr.sbin/rtadvd/timer.c +++ b/usr.sbin/rtadvd/timer.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/timer.c,v 1.1.2.3 2002/06/29 18:59:53 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/timer.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/timer.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -61,8 +61,8 @@ rtadvd_timer_init() } struct rtadvd_timer * -rtadvd_add_timer(struct rtadvd_timer *(*timeout) __P((void *)), - void (*update) __P((void *, struct timeval *)), +rtadvd_add_timer(struct rtadvd_timer *(*timeout)(void *), + void (*update)(void *, struct timeval *), void *timeodata, void *updatedata) { struct rtadvd_timer *newtimer; diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h index eca043c207..6543e464fc 100644 --- a/usr.sbin/rtadvd/timer.h +++ b/usr.sbin/rtadvd/timer.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtadvd/timer.h,v 1.1.2.3 2002/06/29 18:59:53 ume Exp $ - * $DragonFly: src/usr.sbin/rtadvd/timer.h,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtadvd/timer.h,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ /* a < b */ @@ -48,20 +48,20 @@ struct rtadvd_timer { struct rainfo *rai; struct timeval tm; - struct rtadvd_timer *(*expire) __P((void *)); /* expiration function */ + struct rtadvd_timer *(*expire)(void *); /* expiration function */ void *expire_data; - void (*update) __P((void *, struct timeval *)); /* update function */ + void (*update)(void *, struct timeval *); /* update function */ void *update_data; }; -void rtadvd_timer_init __P((void)); -struct rtadvd_timer *rtadvd_add_timer __P((struct rtadvd_timer *(*) __P((void *)), - void (*) __P((void *, struct timeval *)), void *, void *)); -void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *)); -void rtadvd_remove_timer __P((struct rtadvd_timer **)); -struct timeval * rtadvd_check_timer __P((void)); -struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *)); -void TIMEVAL_ADD __P((struct timeval *, struct timeval *, - struct timeval *)); -void TIMEVAL_SUB __P((struct timeval *, struct timeval *, - struct timeval *)); +void rtadvd_timer_init(void); +struct rtadvd_timer *rtadvd_add_timer(struct rtadvd_timer *(*)(void *), + void (*)(void *, struct timeval *), void *, void *); +void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *); +void rtadvd_remove_timer(struct rtadvd_timer **); +struct timeval * rtadvd_check_timer(void); +struct timeval * rtadvd_timer_rest(struct rtadvd_timer *); +void TIMEVAL_ADD(struct timeval *, struct timeval *, + struct timeval *); +void TIMEVAL_SUB(struct timeval *, struct timeval *, + struct timeval *); diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c index b8794172a3..c3c35149b3 100644 --- a/usr.sbin/rtsold/dump.c +++ b/usr.sbin/rtsold/dump.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtsold/dump.c,v 1.1.2.3 2001/07/03 11:02:16 ume Exp $ - * $DragonFly: src/usr.sbin/rtsold/dump.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtsold/dump.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $ */ #include @@ -52,8 +52,8 @@ static FILE *fp; extern struct ifinfo *iflist; -static void dump_interface_status __P((void)); -static char *sec2str __P((time_t)); +static void dump_interface_status(void); +static char *sec2str(time_t); char *ifstatstr[] = {"IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"}; static void diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c index 9922ec5442..a6e3050546 100644 --- a/usr.sbin/rtsold/if.c +++ b/usr.sbin/rtsold/if.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtsold/if.c,v 1.2.2.3 2001/07/03 11:02:16 ume Exp $ - * $DragonFly: src/usr.sbin/rtsold/if.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtsold/if.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -78,12 +78,12 @@ extern int rssock; static int ifsock; -static int get_llflag __P((const char *name)); +static int get_llflag(const char *name); #ifndef HAVE_GETIFADDRS -static unsigned int if_maxindex __P((void)); +static unsigned int if_maxindex(void); #endif -static void get_rtaddrs __P((int addrs, struct sockaddr *sa, - struct sockaddr **rti_info)); +static void get_rtaddrs(int addrs, struct sockaddr *sa, + struct sockaddr **rti_info); int ifinit() diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c index 49574680b5..c526fa6bc9 100644 --- a/usr.sbin/rtsold/probe.c +++ b/usr.sbin/rtsold/probe.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtsold/probe.c,v 1.2.2.3 2001/07/03 11:02:16 ume Exp $ - * $DragonFly: src/usr.sbin/rtsold/probe.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtsold/probe.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -62,7 +62,7 @@ static struct msghdr sndmhdr; static struct iovec sndiov[2]; static int probesock; -static void sendprobe __P((struct in6_addr *addr, int ifindex)); +static void sendprobe(struct in6_addr *addr, int ifindex); int diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c index 9f3bfacfe1..0e08c78802 100644 --- a/usr.sbin/rtsold/rtsock.c +++ b/usr.sbin/rtsold/rtsock.c @@ -1,6 +1,6 @@ /* $KAME: rtsock.c,v 1.3 2000/10/10 08:46:45 itojun Exp $ */ /* $FreeBSD: src/usr.sbin/rtsold/rtsock.c,v 1.1.2.1 2001/07/03 11:02:16 ume Exp $ */ -/* $DragonFly: src/usr.sbin/rtsold/rtsock.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/rtsold/rtsock.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ /* * Copyright (C) 2000 WIDE Project. @@ -65,13 +65,13 @@ : sizeof(u_long))) #ifdef RTM_IFANNOUNCE /*NetBSD 1.5 or later*/ -static int rtsock_input_ifannounce __P((int, struct rt_msghdr *, char *)); +static int rtsock_input_ifannounce(int, struct rt_msghdr *, char *); #endif static struct { u_char type; size_t minlen; - int (*func) __P((int, struct rt_msghdr *, char *)); + int (*func)(int, struct rt_msghdr *, char *); } rtsock_dispatch[] = { #ifdef RTM_IFANNOUNCE /*NetBSD 1.5 or later*/ { RTM_IFANNOUNCE, sizeof(struct if_announcemsghdr), diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c index 5349570a75..ca5b07646d 100644 --- a/usr.sbin/rtsold/rtsold.c +++ b/usr.sbin/rtsold/rtsold.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtsold/rtsold.c,v 1.1.2.4 2002/04/04 11:07:19 ume Exp $ - * $DragonFly: src/usr.sbin/rtsold/rtsold.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtsold/rtsold.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -83,7 +83,7 @@ static int fflag = 0; /* a == b */ #define TIMEVAL_EQ(a, b) (((a).tv_sec==(b).tv_sec) && ((a).tv_usec==(b).tv_usec)) -int main __P((int argc, char *argv[])); +int main(int argc, char *argv[]); /* static variables and functions */ static int mobile_node = 0; @@ -91,20 +91,20 @@ static int do_dump; static char *dumpfilename = "/var/run/rtsold.dump"; /* XXX: should be configurable */ static char *pidfilename = "/var/run/rtsold.pid"; /* should be configurable */ -static int ifconfig __P((char *ifname)); +static int ifconfig(char *ifname); #if 0 -static int ifreconfig __P((char *ifname)); +static int ifreconfig(char *ifname); #endif -static int make_packet __P((struct ifinfo *ifinfo)); -static struct timeval *rtsol_check_timer __P((void)); -static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b, - struct timeval *result)); -static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b, - struct timeval *result)); - -static void rtsold_set_dump_file __P((void)); -static void usage __P((char *progname)); -static char **autoifprobe __P((void)); +static int make_packet(struct ifinfo *ifinfo); +static struct timeval *rtsol_check_timer(void); +static void TIMEVAL_ADD(struct timeval *a, struct timeval *b, + struct timeval *result); +static void TIMEVAL_SUB(struct timeval *a, struct timeval *b, + struct timeval *result); + +static void rtsold_set_dump_file(void); +static void usage(char *progname); +static char **autoifprobe(void); int main(argc, argv) diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h index 522977720a..28ecaaaeb4 100644 --- a/usr.sbin/rtsold/rtsold.h +++ b/usr.sbin/rtsold/rtsold.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/rtsold/rtsold.h,v 1.1.2.3 2001/07/03 11:02:16 ume Exp $ - * $DragonFly: src/usr.sbin/rtsold/rtsold.h,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rtsold/rtsold.h,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ struct ifinfo { @@ -64,33 +64,33 @@ struct ifinfo { /* rtsold.c */ extern struct timeval tm_max; extern int dflag; -struct ifinfo *find_ifinfo __P((int ifindex)); -void rtsol_timer_update __P((struct ifinfo *ifinfo)); -extern void warnmsg __P((int, const char *, const char *, ...)) +struct ifinfo *find_ifinfo(int ifindex); +void rtsol_timer_update(struct ifinfo *ifinfo); +extern void warnmsg(int, const char *, const char *, ...) __attribute__((__format__(__printf__, 3, 4))); /* if.c */ -extern int ifinit __P((void)); -extern int interface_up __P((char *name)); -extern int interface_status __P((struct ifinfo*)); -extern int lladdropt_length __P((struct sockaddr_dl *sdl)); -extern void lladdropt_fill __P((struct sockaddr_dl *sdl, - struct nd_opt_hdr *ndopt)); -extern struct sockaddr_dl *if_nametosdl __P((char *name)); -extern int getinet6sysctl __P((int code)); +extern int ifinit(void); +extern int interface_up(char *name); +extern int interface_status(struct ifinfo*); +extern int lladdropt_length(struct sockaddr_dl *sdl); +extern void lladdropt_fill(struct sockaddr_dl *sdl, + struct nd_opt_hdr *ndopt); +extern struct sockaddr_dl *if_nametosdl(char *name); +extern int getinet6sysctl(int code); /* rtsol.c */ -extern int sockopen __P((void)); -extern void sendpacket __P((struct ifinfo *ifinfo)); -extern void rtsol_input __P((int s)); +extern int sockopen(void); +extern void sendpacket(struct ifinfo *ifinfo); +extern void rtsol_input(int s); /* probe.c */ -extern int probe_init __P((void)); -extern void defrouter_probe __P((int ifindex)); +extern int probe_init(void); +extern void defrouter_probe(int ifindex); /* dump.c */ -extern void rtsold_dump_file __P((char *)); +extern void rtsold_dump_file(char *); /* rtsock.c */ -extern int rtsock_open __P((void)); -extern int rtsock_input __P((int)); +extern int rtsock_open(void); +extern int rtsock_input(int); diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 7a141790f4..d7c48d27da 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)rwhod.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/rwhod/rwhod.c,v 1.13.2.2 2000/12/23 15:28:12 iedowse Exp $ - * $DragonFly: src/usr.sbin/rwhod/rwhod.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/rwhod/rwhod.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -142,18 +142,18 @@ int s, utmpf; #define WHDRSIZE (sizeof(mywd) - sizeof(mywd.wd_we)) -void run_as __P((uid_t *, gid_t *)); -int configure __P((int)); -void getboottime __P((int)); -void onalrm __P((int)); -void quit __P((char *)); -void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); -int verify __P((char *, int)); -static void usage __P((void)); +void run_as(uid_t *, gid_t *); +int configure(int); +void getboottime(int); +void onalrm(int); +void quit(char *); +void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); +int verify(char *, int); +static void usage(void); #ifdef DEBUG -char *interval __P((int, char *)); -void Sendto __P((int, const void *, size_t, int, - const struct sockaddr *, int)); +char *interval(int, char *); +void Sendto(int, const void *, size_t, int, + const struct sockaddr *, int); #define sendto Sendto #endif diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h index d1e97f12af..a51a3419c2 100644 --- a/usr.sbin/sa/extern.h +++ b/usr.sbin/sa/extern.h @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/sa/extern.h,v 1.4 1999/08/28 01:19:52 peter Exp $ - * $DragonFly: src/usr.sbin/sa/extern.h,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/sa/extern.h,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -61,24 +61,24 @@ struct userinfo { /* typedefs */ -typedef int (*cmpf_t) __P((const DBT *, const DBT *)); +typedef int (*cmpf_t)(const DBT *, const DBT *); /* external functions in sa.c */ -int main __P((int, char **)); +int main (int, char **); /* external functions in pdb.c */ -int pacct_init __P((void)); -void pacct_destroy __P((void)); -int pacct_add __P((const struct cmdinfo *)); -int pacct_update __P((void)); -void pacct_print __P((void)); +int pacct_init(void); +void pacct_destroy(void); +int pacct_add(const struct cmdinfo *); +int pacct_update(void); +void pacct_print(void); /* external functions in usrdb.c */ -int usracct_init __P((void)); -void usracct_destroy __P((void)); -int usracct_add __P((const struct cmdinfo *)); -int usracct_update __P((void)); -void usracct_print __P((void)); +int usracct_init(void); +void usracct_destroy(void); +int usracct_add(const struct cmdinfo *); +int usracct_update(void); +void usracct_print(void); /* variables */ diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index 86efd64944..f18a42772c 100644 --- a/usr.sbin/sa/main.c +++ b/usr.sbin/sa/main.c @@ -29,7 +29,7 @@ * * @(#) Copyright (c) 1994 Christopher G. Demetriou All rights reserved. * $FreeBSD: src/usr.sbin/sa/main.c,v 1.8.2.2 2001/07/19 05:20:49 kris Exp $ - * $DragonFly: src/usr.sbin/sa/main.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/sa/main.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ /* @@ -49,17 +49,17 @@ #include "extern.h" #include "pathnames.h" -static int acct_load __P((char *, int)); -static u_quad_t decode_comp_t __P((comp_t)); -static int cmp_comm __P((const char *, const char *)); -static int cmp_usrsys __P((const DBT *, const DBT *)); -static int cmp_avgusrsys __P((const DBT *, const DBT *)); -static int cmp_dkio __P((const DBT *, const DBT *)); -static int cmp_avgdkio __P((const DBT *, const DBT *)); -static int cmp_cpumem __P((const DBT *, const DBT *)); -static int cmp_avgcpumem __P((const DBT *, const DBT *)); -static int cmp_calls __P((const DBT *, const DBT *)); -static void usage __P((void)); +static int acct_load(char *, int); +static u_quad_t decode_comp_t(comp_t); +static int cmp_comm(const char *, const char *); +static int cmp_usrsys(const DBT *, const DBT *); +static int cmp_avgusrsys(const DBT *, const DBT *); +static int cmp_dkio(const DBT *, const DBT *); +static int cmp_avgdkio(const DBT *, const DBT *); +static int cmp_cpumem(const DBT *, const DBT *); +static int cmp_avgcpumem(const DBT *, const DBT *); +static int cmp_calls(const DBT *, const DBT *); +static void usage (void); int aflag, bflag, cflag, dflag, Dflag, fflag, iflag, jflag, kflag; int Kflag, lflag, mflag, qflag, rflag, sflag, tflag, uflag, vflag; diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c index e80710f14c..c1301b90c6 100644 --- a/usr.sbin/sa/pdb.c +++ b/usr.sbin/sa/pdb.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/sa/pdb.c,v 1.7 1999/08/28 01:19:53 peter Exp $ - * $DragonFly: src/usr.sbin/sa/pdb.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/sa/pdb.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -41,9 +41,9 @@ #include "extern.h" #include "pathnames.h" -static int check_junk __P((struct cmdinfo *)); -static void add_ci __P((const struct cmdinfo *, struct cmdinfo *)); -static void print_ci __P((const struct cmdinfo *, const struct cmdinfo *)); +static int check_junk(struct cmdinfo *); +static void add_ci(const struct cmdinfo *, struct cmdinfo *); +static void print_ci(const struct cmdinfo *, const struct cmdinfo *); static DB *pacct_db; diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c index 42697ef1e6..eda17ce933 100644 --- a/usr.sbin/sa/usrdb.c +++ b/usr.sbin/sa/usrdb.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/sa/usrdb.c,v 1.8.2.2 2000/10/28 02:28:20 gallatin Exp $ - * $DragonFly: src/usr.sbin/sa/usrdb.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/sa/usrdb.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -43,7 +43,7 @@ #include "extern.h" #include "pathnames.h" -static int uid_compare __P((const DBT *, const DBT *)); +static int uid_compare(const DBT *, const DBT *); static DB *usracct_db; diff --git a/usr.sbin/setkey/parse.y b/usr.sbin/setkey/parse.y index 07c2db9587..11f7a0457d 100644 --- a/usr.sbin/setkey/parse.y +++ b/usr.sbin/setkey/parse.y @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/setkey/parse.y,v 1.1.2.2 2001/07/03 11:02:17 ume Exp $ */ -/* $DragonFly: src/usr.sbin/setkey/parse.y,v 1.2 2003/06/17 04:30:03 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/setkey/parse.y,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ /* $KAME: kame/kame/kame/setkey/parse.y,v 1.36 2001/06/07 15:53:12 sakane Exp $ */ /* @@ -81,17 +81,17 @@ extern int m_len; extern char cmdarg[8192]; extern int f_debug; -static struct addrinfo *parse_addr __P((char *, char *, int)); -static int setvarbuf __P((int *, struct sadb_ext *, int, caddr_t, int)); -void parse_init __P((void)); -void free_buffer __P((void)); +static struct addrinfo *parse_addr(char *, char *, int); +static int setvarbuf(int *, struct sadb_ext *, int, caddr_t, int); +void parse_init(void); +void free_buffer(void); -extern int setkeymsg __P((void)); -extern int sendkeymsg __P((void)); +extern int setkeymsg(void); +extern int sendkeymsg(void); -extern int yylex __P((void)); -extern void yyfatal __P((const char *)); -extern void yyerror __P((const char *)); +extern int yylex(void); +extern void yyfatal(const char *); +extern void yyerror(const char *); %} %union { diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c index f89ddef982..fcdccc51de 100644 --- a/usr.sbin/setkey/setkey.c +++ b/usr.sbin/setkey/setkey.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/setkey/setkey.c,v 1.1.2.3 2003/04/26 23:53:54 sumikawa Exp $ */ -/* $DragonFly: src/usr.sbin/setkey/setkey.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/setkey/setkey.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ /* $KAME: setkey.c,v 1.18 2001/05/08 04:36:39 itojun Exp $ */ /* @@ -54,18 +54,18 @@ #include "libpfkey.h" -void Usage __P((void)); -int main __P((int, char **)); -int get_supported __P((void)); -void sendkeyshort __P((u_int)); -void promisc __P((void)); -int sendkeymsg __P((void)); -int postproc __P((struct sadb_msg *, int)); -const char *numstr __P((int)); -void shortdump_hdr __P((void)); -void shortdump __P((struct sadb_msg *)); -static void printdate __P((void)); -static int32_t gmt2local __P((time_t)); +void Usage(void); +int main(int, char **); +int get_supported(void); +void sendkeyshort(u_int); +void promisc(void); +int sendkeymsg(void); +int postproc(struct sadb_msg *, int); +const char *numstr(int); +void shortdump_hdr(void); +void shortdump(struct sadb_msg *); +static void printdate(void); +static int32_t gmt2local(time_t); #define MODE_SCRIPT 1 #define MODE_CMDDUMP 2 @@ -92,7 +92,7 @@ static time_t thiszone; extern int lineno; -extern int parse __P((FILE **)); +extern int parse(FILE **); void Usage() diff --git a/usr.sbin/setkey/test-pfkey.c b/usr.sbin/setkey/test-pfkey.c index 92a98ecc8f..20c34949fe 100644 --- a/usr.sbin/setkey/test-pfkey.c +++ b/usr.sbin/setkey/test-pfkey.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/setkey/test-pfkey.c,v 1.1.2.1 2000/07/15 07:37:04 kris Exp $ */ -/* $DragonFly: src/usr.sbin/setkey/test-pfkey.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/setkey/test-pfkey.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ /* $KAME: test-pfkey.c,v 1.4 2000/06/07 00:29:14 itojun Exp $ */ /* @@ -54,18 +54,18 @@ u_char m_buf[BUFSIZ]; u_int m_len; char *pname; -void Usage __P((void)); -int sendkeymsg __P((void)); -void key_setsadbmsg __P((u_int)); -void key_setsadbsens __P((void)); -void key_setsadbprop __P((void)); -void key_setsadbid __P((u_int, caddr_t)); -void key_setsadblft __P((u_int, u_int)); -void key_setspirange __P((void)); -void key_setsadbkey __P((u_int, caddr_t)); -void key_setsadbsa __P((void)); -void key_setsadbaddr __P((u_int, u_int, caddr_t)); -void key_setsadbextbuf __P((caddr_t, int, caddr_t, int, caddr_t, int)); +void Usage(void); +int sendkeymsg(void); +void key_setsadbmsg(u_int); +void key_setsadbsens(void); +void key_setsadbprop(void); +void key_setsadbid(u_int, caddr_t); +void key_setsadblft(u_int, u_int); +void key_setspirange(void); +void key_setsadbkey(u_int, caddr_t); +void key_setsadbsa(void); +void key_setsadbaddr(u_int, u_int, caddr_t); +void key_setsadbextbuf(caddr_t, int, caddr_t, int, caddr_t, int); void Usage() diff --git a/usr.sbin/setkey/token.l b/usr.sbin/setkey/token.l index a912b83c8c..7df76d9856 100644 --- a/usr.sbin/setkey/token.l +++ b/usr.sbin/setkey/token.l @@ -1,5 +1,5 @@ /* $FreeBSD: src/usr.sbin/setkey/token.l,v 1.2.2.3 2001/07/03 11:02:17 ume Exp $ */ -/* $DragonFly: src/usr.sbin/setkey/token.l,v 1.2 2003/06/17 04:30:03 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/setkey/token.l,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ /* $KAME: token.l,v 1.21 2001/05/18 05:35:01 sakane Exp $ */ /* @@ -76,12 +76,12 @@ extern u_char m_buf[BUFSIZ]; extern u_int m_len; extern int f_debug; -int yylex __P((void)); -void yyfatal __P((const char *s)); -void yyerror __P((const char *s)); -extern void parse_init __P((void)); -int parse __P((FILE **)); -int yyparse __P((void)); +int yylex(void); +void yyfatal(const char *s); +void yyerror(const char *s); +extern void parse_init(void); +int parse(FILE **); +int yyparse(void); %} diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c index 2f16a100dc..2b22ba09b0 100644 --- a/usr.sbin/slstat/slstat.c +++ b/usr.sbin/slstat/slstat.c @@ -21,7 +21,7 @@ * - Initial distribution. * * $FreeBSD: src/usr.sbin/slstat/slstat.c,v 1.14 1999/08/28 01:20:00 peter Exp $ - * $DragonFly: src/usr.sbin/slstat/slstat.c,v 1.3 2003/08/08 04:18:48 dillon Exp $ + * $DragonFly: src/usr.sbin/slstat/slstat.c,v 1.4 2003/11/03 19:31:43 eirikn Exp $ */ #include @@ -49,9 +49,9 @@ #include #include -static void usage __P((void)); -static void intpr __P((void)); -static void catchalarm __P((int)); +static void usage(void); +static void intpr(void); +static void catchalarm(int); #define INTERFACE_PREFIX "sl%d" char interface[IFNAMSIZ]; diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c index c702e35a1b..b2b251d5a9 100644 --- a/usr.sbin/timed/timed/correct.c +++ b/usr.sbin/timed/timed/correct.c @@ -32,7 +32,7 @@ * * @(#)correct.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/timed/timed/correct.c,v 1.4 1999/08/28 01:20:17 peter Exp $ - * $DragonFly: src/usr.sbin/timed/timed/correct.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/timed/timed/correct.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include "globals.h" @@ -43,7 +43,7 @@ #include #endif /* sgi */ -static void adjclock __P((struct timeval *)); +static void adjclock(struct timeval *); /* * sends to the slaves the corrections for their clocks after fixing our diff --git a/usr.sbin/timed/timed/extern.h b/usr.sbin/timed/timed/extern.h index 5fbb2994b6..dc416c5d26 100644 --- a/usr.sbin/timed/timed/extern.h +++ b/usr.sbin/timed/timed/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.sbin/timed/timed/extern.h,v 1.2 2003/11/03 19:14:37 eirikn Exp $ + * $DragonFly: src/usr.sbin/timed/timed/extern.h,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ struct hosttbl; @@ -40,51 +40,51 @@ struct sockaddr_in; struct timeval; struct tsp; -struct hosttbl *addmach __P((char *, struct sockaddr_in *, struct netinfo *)); -struct hosttbl *findhost __P((char *)); -struct hosttbl *remmach __P((struct hosttbl *)); +struct hosttbl *addmach(char *, struct sockaddr_in *, struct netinfo *); +struct hosttbl *findhost(char *); +struct hosttbl *remmach(struct hosttbl *); -struct tsp *readmsg __P((int, - char *, struct timeval *, struct netinfo *)); -struct tsp *acksend __P((struct tsp *, - struct sockaddr_in *, char *, int, struct netinfo *, int)); +struct tsp *readmsg(int, + char *, struct timeval *, struct netinfo *); +struct tsp *acksend(struct tsp *, + struct sockaddr_in *, char *, int, struct netinfo *, int); -void addnetname __P((char *)); -void adj_msg_time __P((struct tsp *, struct timeval *)); -void bytehostorder __P((struct tsp *)); -void bytenetorder __P((struct tsp *)); -void byteorder __P((struct tsp *)); -long casual __P((long, long)); -int cksum __P((u_short *, int)); -void correct __P((long)); -char *date __P((void)); -void doquit __P((struct tsp *)); -int election __P((struct netinfo *)); -void get_goodgroup __P((int)); -int good_host_name __P((char *)); -void ignoreack __P((void)); -int in_cksum __P((u_short *, int)); -void lookformaster __P((struct netinfo *)); -void makeslave __P((struct netinfo *)); -int master __P((void)); -void masterack __P((void)); -void masterup __P((struct netinfo *)); -int measure __P((u_long, u_long, char *, struct sockaddr_in *, int)); -void msterup __P((struct netinfo *)); -void mstotvround __P((struct timeval *, long)); -long networkdelta __P((void)); -void newslave __P((struct tsp *)); -void print __P((struct tsp *, struct sockaddr_in *)); -void prthp __P((clock_t)); -void rmnetmachs __P((struct netinfo *)); -void setstatus __P((void)); -int slave __P((void)); -void slaveack __P((void)); -void spreadtime __P((void)); -void suppress __P((struct sockaddr_in *, char *, struct netinfo *)); -void synch __P((long)); -void timevaladd __P((struct timeval *, struct timeval *)); -void timevalsub __P((struct timeval *, struct timeval *, struct timeval *)); -void traceoff __P((char *)); -void traceon __P((void)); -void xmit __P((int, u_int, struct sockaddr_in *)); +void addnetname(char *); +void adj_msg_time(struct tsp *, struct timeval *); +void bytehostorder(struct tsp *); +void bytenetorder(struct tsp *); +void byteorder(struct tsp *); +long casual(long, long); +int cksum(u_short *, int); +void correct(long); +char *date(void); +void doquit(struct tsp *); +int election(struct netinfo *); +void get_goodgroup(int); +int good_host_name(char *); +void ignoreack(void); +int in_cksum(u_short *, int); +void lookformaster(struct netinfo *); +void makeslave(struct netinfo *); +int master(void); +void masterack(void); +void masterup(struct netinfo *); +int measure(u_long, u_long, char *, struct sockaddr_in *, int); +void msterup(struct netinfo *); +void mstotvround(struct timeval *, long); +long networkdelta(void); +void newslave(struct tsp *); +void print(struct tsp *, struct sockaddr_in *); +void prthp(clock_t); +void rmnetmachs(struct netinfo *); +void setstatus(void); +int slave(void); +void slaveack(void); +void spreadtime(void); +void suppress(struct sockaddr_in *, char *, struct netinfo *); +void synch(long); +void timevaladd(struct timeval *, struct timeval *); +void timevalsub(struct timeval *, struct timeval *, struct timeval *); +void traceoff(char *); +void traceon(void); +void xmit(int, u_int, struct sockaddr_in *); diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c index e42387bfe0..d7f93c0e74 100644 --- a/usr.sbin/timed/timed/master.c +++ b/usr.sbin/timed/timed/master.c @@ -32,7 +32,7 @@ * * @(#)master.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/timed/timed/master.c,v 1.6 1999/08/28 01:20:17 peter Exp $ - * $DragonFly: src/usr.sbin/timed/timed/master.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/timed/timed/master.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include "globals.h" @@ -54,12 +54,12 @@ extern int justquit; static int dictate; static int slvcount; /* slaves listening to our clock */ -static void mchgdate __P((struct tsp *)); +static void mchgdate(struct tsp *); #ifdef sgi -extern void logwtmp __P((struct timeval *, struct timeval *)); +extern void logwtmp(struct timeval *, struct timeval *); #else -extern void logwtmp __P((char *, char *, char *)); +extern void logwtmp(char *, char *, char *); #endif /* sgi */ /* diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c index 343baec473..3c49300e39 100644 --- a/usr.sbin/timed/timed/networkdelta.c +++ b/usr.sbin/timed/timed/networkdelta.c @@ -32,12 +32,12 @@ * * @(#)networkdelta.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/timed/timed/networkdelta.c,v 1.3.2.1 2000/07/01 01:28:10 ps Exp $ - * $DragonFly: src/usr.sbin/timed/timed/networkdelta.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/timed/timed/networkdelta.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include "globals.h" -static long median __P((float, float *, long *, long *, unsigned int)); +static long median(float, float *, long *, long *, unsigned int); /* * Compute a corrected date. diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c index 355b596a99..d9b184804a 100644 --- a/usr.sbin/timed/timed/slave.c +++ b/usr.sbin/timed/timed/slave.c @@ -32,7 +32,7 @@ * * @(#)slave.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/timed/timed/slave.c,v 1.7 1999/08/28 01:20:18 peter Exp $ - * $DragonFly: src/usr.sbin/timed/timed/slave.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/timed/timed/slave.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #include "globals.h" @@ -49,14 +49,14 @@ static char master_name[MAXHOSTNAMELEN]; static struct netinfo *old_slavenet; static int old_status; -static void schgdate __P((struct tsp *, char *)); -static void setmaster __P((struct tsp *)); -static void answerdelay __P((void)); +static void schgdate(struct tsp *, char *); +static void setmaster(struct tsp *); +static void answerdelay(void); #ifdef sgi -extern void logwtmp __P((struct timeval *, struct timeval *)); +extern void logwtmp(struct timeval *, struct timeval *); #else -extern void logwtmp __P((char *, char *, char *)); +extern void logwtmp(char *, char *, char *); #endif /* sgi */ int diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c index 3cbeb1fcf6..ad80fc5100 100644 --- a/usr.sbin/timed/timed/timed.c +++ b/usr.sbin/timed/timed/timed.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1985, 1993 The Regents of the University of California. All rights reserved. * @(#)timed.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/timed/timed/timed.c,v 1.9 1999/08/28 01:20:19 peter Exp $ - * $DragonFly: src/usr.sbin/timed/timed/timed.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/timed/timed/timed.c,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #define TSPTYPES @@ -89,9 +89,9 @@ static struct goodhost { /* hosts that we trust */ } *goodhosts; static char *goodgroup; /* net group of trusted hosts */ -static void checkignorednets __P((void)); -static void pickslavenet __P((struct netinfo *)); -static void add_good_host __P((char *, int)); +static void checkignorednets(void); +static void pickslavenet(struct netinfo *); +static void add_good_host(char *, int); #ifdef sgi char *timetrim_fn; @@ -104,7 +104,7 @@ double tot_ticks, hr_ticks; int bufspace = 60*1024; #endif -static void usage __P((void)); +static void usage(void); /* * The timedaemons synchronize the clocks of hosts in a local area network. diff --git a/usr.sbin/timed/timedc/extern.h b/usr.sbin/timed/timedc/extern.h index 30c365e54a..7c5579a0c6 100644 --- a/usr.sbin/timed/timedc/extern.h +++ b/usr.sbin/timed/timedc/extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $DragonFly: src/usr.sbin/timed/timedc/extern.h,v 1.2 2003/11/03 19:14:37 eirikn Exp $ + * $DragonFly: src/usr.sbin/timed/timedc/extern.h,v 1.3 2003/11/03 19:31:43 eirikn Exp $ */ #if __STDC__ @@ -40,14 +40,14 @@ struct tsp; extern struct cmd cmdtab[]; -void bytehostorder __P((struct tsp *)); -void bytenetorder __P((struct tsp *)); -void clockdiff __P((int, char *[])); -void help __P((int, char *[])); -void intr __P((int)); -void makeargv __P((void)); -void msite __P((int, char *[])); -int priv_resources __P((void)); -void quit __P((void)); -void testing __P((int, char *[])); -void tracing __P((int, char *[])); +void bytehostorder(struct tsp *); +void bytenetorder(struct tsp *); +void clockdiff(int, char *[]); +void help(int, char *[]); +void intr(int); +void makeargv(void); +void msite(int, char *[]); +int priv_resources(void); +void quit(void); +void testing(int, char *[]); +void tracing(int, char *[]); diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c index d6a4a33fb7..3810e59a72 100644 --- a/usr.sbin/timed/timedc/timedc.c +++ b/usr.sbin/timed/timedc/timedc.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1985, 1993 The Regents of the University of California. All rights reserved. * @(#)timedc.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/timed/timedc/timedc.c,v 1.3 1999/08/28 01:20:21 peter Exp $ - * $DragonFly: src/usr.sbin/timed/timedc/timedc.c,v 1.3 2003/10/11 09:56:48 hmp Exp $ + * $DragonFly: src/usr.sbin/timed/timedc/timedc.c,v 1.4 2003/11/03 19:31:43 eirikn Exp $ */ #include "timedc.h" @@ -54,7 +54,7 @@ int fromatty; char *margv[MAX_MARGV]; char cmdline[200]; jmp_buf toplevel; -static struct cmd *getcmd __P((char *)); +static struct cmd *getcmd(char *); int main(argc, argv) diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index c525228903..b614fcb4f8 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -31,7 +31,7 @@ * @(#) Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)traceroute.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/traceroute6/traceroute6.c,v 1.4.2.4 2001/07/03 11:02:18 ume Exp $ - * $DragonFly: src/usr.sbin/traceroute6/traceroute6.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/traceroute6/traceroute6.c,v 1.3 2003/11/03 19:31:44 eirikn Exp $ */ /*- @@ -309,23 +309,23 @@ struct opacket { u_char packet[512]; /* last inbound (icmp) packet */ struct opacket *outpacket; /* last output (udp) packet */ -int main __P((int, char *[])); -int wait_for_reply __P((int, struct msghdr *)); +int main(int, char *[]); +int wait_for_reply(int, struct msghdr *); #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC -int setpolicy __P((int so, char *policy)); +int setpolicy(int so, char *policy); #endif #endif -void send_probe __P((int, int)); -struct udphdr *get_udphdr __P((struct ip6_hdr *, u_char *)); -int get_hoplim __P((struct msghdr *)); -double deltaT __P((struct timeval *, struct timeval *)); -char *pr_type __P((int)); -int packet_ok __P((struct msghdr *, int, int)); -void print __P((struct msghdr *, int)); -void tvsub __P((struct timeval *, struct timeval *)); -const char *inetname __P((struct sockaddr *)); -void usage __P((void)); +void send_probe(int, int); +struct udphdr *get_udphdr(struct ip6_hdr *, u_char *); +int get_hoplim(struct msghdr *); +double deltaT(struct timeval *, struct timeval *); +char *pr_type(int); +int packet_ok(struct msghdr *, int, int); +void print(struct msghdr *, int); +void tvsub(struct timeval *, struct timeval *); +const char *inetname(struct sockaddr *); +void usage(void); int rcvsock; /* receive (icmp) socket file descriptor */ int sndsock; /* send (udp) socket file descriptor */ diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index 24143e12e1..fae2484eac 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1988, 1993 The Regents of the University of California. All rights reserved. * @(#)trpt.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/trpt/trpt.c,v 1.12 2000/01/29 11:49:07 shin Exp $ - * $DragonFly: src/usr.sbin/trpt/trpt.c,v 1.2 2003/06/17 04:30:03 dillon Exp $ + * $DragonFly: src/usr.sbin/trpt/trpt.c,v 1.3 2003/11/03 19:31:44 eirikn Exp $ */ #include @@ -87,12 +87,12 @@ static caddr_t tcp_pcbs[TCP_NDEBUG]; static n_time ntime; static int aflag, kflag, memf, follow, sflag, tflag; -void dotrace __P((caddr_t)); -void klseek __P((int, off_t, int)); -int numeric __P((caddr_t *, caddr_t *)); -void tcp_trace __P((short, short, struct tcpcb *, struct tcpcb *, - int, void *, struct tcphdr *, int)); -static void usage __P((void)); +void dotrace(caddr_t); +void klseek(int, off_t, int); +int numeric(caddr_t *, caddr_t *); +void tcp_trace(short, short, struct tcpcb *, struct tcpcb *, + int, void *, struct tcphdr *, int); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c index a3dc7de088..892bdfa268 100644 --- a/usr.sbin/usbd/usbd.c +++ b/usr.sbin/usbd/usbd.c @@ -1,6 +1,6 @@ /* $NetBSD: usbd.c,v 1.4 1998/12/09 00:57:19 augustss Exp $ */ /* $FreeBSD: src/usr.sbin/usbd/usbd.c,v 1.10.2.6 2002/12/31 09:05:27 maxim Exp $ */ -/* $DragonFly: src/usr.sbin/usbd/usbd.c,v 1.3 2003/08/08 04:18:48 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/usbd/usbd.c,v 1.4 2003/11/03 19:31:44 eirikn Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -162,8 +162,8 @@ typedef struct action_match_s { /* the function returns 0 for failure, 1 for all arguments found and 2 for * arguments left over in trail. */ -typedef int (*config_field_fn) __P((action_t *action, char *args, - char **trail)); +typedef int (*config_field_fn)(action_t *action, char *args, + char **trail); int set_device_field(action_t *action, char *args, char **trail); int set_vendor_field(action_t *action, char *args, char **trail); @@ -202,11 +202,11 @@ config_field_t config_fields[] = { /* prototypes for some functions */ -void print_event __P((struct usb_event *event)); -void print_action __P((action_t *action, int i)); -void print_actions __P((void)); -int find_action __P((struct usb_device_info *devinfo, - action_match_t *action_match)); +void print_event(struct usb_event *event); +void print_action(action_t *action, int i); +void print_actions(void); +int find_action(struct usb_device_info *devinfo, + action_match_t *action_match); void diff --git a/usr.sbin/vipw/pw_util.h b/usr.sbin/vipw/pw_util.h index 6b708f0468..7b51979e95 100644 --- a/usr.sbin/vipw/pw_util.h +++ b/usr.sbin/vipw/pw_util.h @@ -31,13 +31,13 @@ * SUCH DAMAGE. * * @(#)pw_util.h 8.2 (Berkeley) 4/1/94 - * $DragonFly: src/usr.sbin/vipw/pw_util.h,v 1.2 2003/11/03 19:14:37 eirikn Exp $ + * $DragonFly: src/usr.sbin/vipw/pw_util.h,v 1.3 2003/11/03 19:31:44 eirikn Exp $ */ -void pw_edit __P((int)); -void pw_error __P((char *, int, int)); -void pw_init __P((void)); -int pw_lock __P((void)); -int pw_mkdb __P((char *)); -void pw_prompt __P((void)); -int pw_tmp __P((void)); +void pw_edit(int); +void pw_error(char *, int, int); +void pw_init(void); +int pw_lock(void); +int pw_mkdb(char *); +void pw_prompt(void); +int pw_tmp(void); diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c index 93dea637de..bc2413b499 100644 --- a/usr.sbin/vipw/vipw.c +++ b/usr.sbin/vipw/vipw.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1987, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)vipw.c 8.3 (Berkeley) 4/2/94 * $FreeBSD: src/usr.sbin/vipw/vipw.c,v 1.11 1999/10/25 09:46:57 sheldonh Exp $ - * $DragonFly: src/usr.sbin/vipw/vipw.c,v 1.2 2003/06/17 04:30:04 dillon Exp $ + * $DragonFly: src/usr.sbin/vipw/vipw.c,v 1.3 2003/11/03 19:31:44 eirikn Exp $ */ #include @@ -52,8 +52,8 @@ extern char *mppath; extern char *masterpasswd; char *tempname; -void copyfile __P((int, int)); -static void usage __P((void)); +void copyfile(int, int); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c index b015eae5b7..0e2e77a384 100644 --- a/usr.sbin/vnconfig/vnconfig.c +++ b/usr.sbin/vnconfig/vnconfig.c @@ -39,7 +39,7 @@ * * @(#)vnconfig.c 8.1 (Berkeley) 12/15/93 * $FreeBSD: src/usr.sbin/vnconfig/vnconfig.c,v 1.13.2.7 2003/06/02 09:10:27 maxim Exp $ - * $DragonFly: src/usr.sbin/vnconfig/vnconfig.c,v 1.3 2003/08/08 04:18:49 dillon Exp $ + * $DragonFly: src/usr.sbin/vnconfig/vnconfig.c,v 1.4 2003/11/03 19:31:44 eirikn Exp $ */ #include @@ -94,14 +94,14 @@ u_long setopt = 0; u_long resetopt = 0; char *configfile; -int config __P((struct vndisk *)); -void getoptions __P((struct vndisk *, char *)); -char *rawdevice __P((char *)); -void readconfig __P((int)); -static void usage __P((void)); +int config(struct vndisk *); +void getoptions(struct vndisk *, char *); +char *rawdevice(char *); +void readconfig(int); +static void usage(void); static int getsize(const char *arg); static void do_autolabel(const char *dev, const char *label); -int what_opt __P((char *, u_long *)); +int what_opt(char *, u_long *); int main(argc, argv) diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c index 82965328d7..c790d87f0d 100644 --- a/usr.sbin/watch/watch.c +++ b/usr.sbin/watch/watch.c @@ -13,7 +13,7 @@ * Snoop stuff. * * $FreeBSD: src/usr.sbin/watch/watch.c,v 1.18.2.3 2002/08/17 00:59:03 mikeh Exp $ - * $DragonFly: src/usr.sbin/watch/watch.c,v 1.2 2003/06/17 04:30:04 dillon Exp $ + * $DragonFly: src/usr.sbin/watch/watch.c,v 1.3 2003/11/03 19:31:44 eirikn Exp $ */ #include @@ -50,19 +50,19 @@ #define CHR_SWITCH 24 /* Ctrl+X */ #define CHR_CLEAR 23 /* Ctrl+V */ -static void clear __P((void)); -static void timestamp __P((const char *)); -static void set_tty __P((void)); -static void unset_tty __P((void)); -static void fatal __P((int, const char *)); -static int open_snp __P((void)); -static void cleanup __P((int)); -static void usage __P((void)); -static void setup_scr __P((void)); -static void attach_snp __P((void)); -static void detach_snp __P((void)); -static void set_dev __P((const char *)); -static void ask_dev __P((char *, const char *)); +static void clear(void); +static void timestamp (const char *); +static void set_tty(void); +static void unset_tty(void); +static void fatal(int, const char *); +static int open_snp(void); +static void cleanup(int); +static void usage(void); +static void setup_scr(void); +static void attach_snp(void); +static void detach_snp(void); +static void set_dev(const char *); +static void ask_dev(char *, const char *); int opt_reconn_close = 0; int opt_reconn_oflow = 0; diff --git a/usr.sbin/xten/xten.c b/usr.sbin/xten/xten.c index 27c307174c..591399766f 100644 --- a/usr.sbin/xten/xten.c +++ b/usr.sbin/xten/xten.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/usr.sbin/xten/xten.c,v 1.4 1999/08/28 01:21:02 peter Exp $ - * $DragonFly: src/usr.sbin/xten/xten.c,v 1.2 2003/06/17 04:30:04 dillon Exp $ + * $DragonFly: src/usr.sbin/xten/xten.c,v 1.3 2003/11/03 19:31:44 eirikn Exp $ */ /* @@ -66,8 +66,8 @@ char *X10cmdnames[] = { NULL }; -int find __P((char *, char *[])); -static void usage __P((void)); +int find(char *, char *[]); +static void usage(void); int main(argc, argv) -- 2.41.0