From: David Rhodus Date: Sat, 1 Nov 2003 17:16:02 +0000 (+0000) Subject: * Nuke ~771 __P()'s from our tree. X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/9a76cd7569706604245f05fd583a4f272ff7453e * Nuke ~771 __P()'s from our tree. Work sent-in by: Eirik Nygaard --- diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index c69bead8da..3d07f411ce 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -25,7 +25,7 @@ * * @(#)Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia. All rights reserved. * $FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.25.2.1 2001/07/30 10:38:04 dd Exp $ - * $DragonFly: src/sbin/adjkerntz/adjkerntz.c,v 1.3 2003/09/28 14:39:16 hmp Exp $ + * $DragonFly: src/sbin/adjkerntz/adjkerntz.c,v 1.4 2003/11/01 17:15:57 drhodus Exp $ */ /* @@ -58,8 +58,8 @@ #define REPORT_PERIOD (30*60) -static void fake __P((int)); -static void usage __P((void)); +static void fake(int); +static void usage(void); static void fake(int unused __unused) diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h index b342d0744f..9becab8513 100644 --- a/sbin/atm/atm/atm.h +++ b/sbin/atm/atm/atm.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.4 1999/08/28 00:12:17 peter Exp $ - * @(#) $DragonFly: src/sbin/atm/atm/atm.h,v 1.2 2003/06/17 04:27:32 dillon Exp $ + * @(#) $DragonFly: src/sbin/atm/atm/atm.h,v 1.3 2003/11/01 17:15:57 drhodus Exp $ * */ @@ -55,7 +55,7 @@ struct cmd { int minp; /* Minimum number of parameters */ int maxp; /* Maximum number of parameters */ void (*func) /* Processing function */ - __P((int, char **, struct cmd *)); + (int, char **, struct cmd *); char *help; /* User help string */ }; @@ -129,86 +129,86 @@ extern char prefix[]; /* Current command prefix */ * Global function declarations */ /* atm.c */ -int do_cmd __P((struct cmd *, int, char **)); -void usage __P((struct cmd *, char *)); -void attach __P((int, char **, struct cmd *)); -void detach __P((int, char **, struct cmd *)); -void pvc_add __P((int, char **, struct cmd *)); -void arp_add __P((int, char **, struct cmd *)); -void pvc_dlt __P((int, char **, struct cmd *)); -void svc_dlt __P((int, char **, struct cmd *)); -void vcc_dlt __P((int, char **, struct cmd *, struct atmdelreq *)); -void arp_dlt __P((int, char **, struct cmd *)); -void help __P((int, char **, struct cmd *)); +int do_cmd(struct cmd *, int, char **); +void usage(struct cmd *, char *); +void attach(int, char **, struct cmd *); +void detach(int, char **, struct cmd *); +void pvc_add(int, char **, struct cmd *); +void arp_add(int, char **, struct cmd *); +void pvc_dlt(int, char **, struct cmd *); +void svc_dlt(int, char **, struct cmd *); +void vcc_dlt(int, char **, struct cmd *, struct atmdelreq *); +void arp_dlt(int, char **, struct cmd *); +void help(int, char **, struct cmd *); /* atm_eni.c */ -void show_eni_stats __P((char *, int, char **)); -void print_eni_oc3 __P((struct air_vinfo_rsp *)); -void print_eni_atm __P((struct air_vinfo_rsp *)); -void print_eni_aal0 __P((struct air_vinfo_rsp *)); -void print_eni_aal5 __P((struct air_vinfo_rsp *)); -void print_eni_driver __P((struct air_vinfo_rsp *)); +void show_eni_stats(char *, int, char **); +void print_eni_oc3(struct air_vinfo_rsp *); +void print_eni_atm(struct air_vinfo_rsp *); +void print_eni_aal0(struct air_vinfo_rsp *); +void print_eni_aal5(struct air_vinfo_rsp *); +void print_eni_driver(struct air_vinfo_rsp *); /* atm_fore200.c */ -void show_fore200_stats __P((char *, int, char **)); -void print_fore200_taxi __P((struct air_vinfo_rsp *)); -void print_fore200_oc3 __P((struct air_vinfo_rsp *)); -void print_fore200_dev __P((struct air_vinfo_rsp *)); -void print_fore200_atm __P((struct air_vinfo_rsp *)); -void print_fore200_aal0 __P((struct air_vinfo_rsp *)); -void print_fore200_aal4 __P((struct air_vinfo_rsp *)); -void print_fore200_aal5 __P((struct air_vinfo_rsp *)); -void print_fore200_driver __P((struct air_vinfo_rsp *)); +void show_fore200_stats(char *, int, char **); +void print_fore200_taxi(struct air_vinfo_rsp *); +void print_fore200_oc3(struct air_vinfo_rsp *); +void print_fore200_dev(struct air_vinfo_rsp *); +void print_fore200_atm(struct air_vinfo_rsp *); +void print_fore200_aal0(struct air_vinfo_rsp *); +void print_fore200_aal4(struct air_vinfo_rsp *); +void print_fore200_aal5(struct air_vinfo_rsp *); +void print_fore200_driver(struct air_vinfo_rsp *); /* atm_inet.c */ void ip_pvcadd __P((int, char **, struct cmd *, struct atmaddreq *, struct air_int_rsp *)); /* atm_print.c */ -void print_arp_info __P((struct air_arp_rsp *)); -void print_asrv_info __P((struct air_asrv_rsp *)); -void print_cfg_info __P((struct air_cfg_rsp *)); -void print_intf_info __P((struct air_int_rsp *)); -void print_ip_vcc_info __P((struct air_ip_vcc_rsp *)); -void print_netif_info __P((struct air_netif_rsp *)); -void print_intf_stats __P((struct air_phy_stat_rsp *)); -void print_vcc_stats __P((struct air_vcc_rsp *)); -void print_vcc_info __P((struct air_vcc_rsp *)); -void print_version_info __P((struct air_version_rsp *)); +void print_arp_info(struct air_arp_rsp *); +void print_asrv_info(struct air_asrv_rsp *); +void print_cfg_info(struct air_cfg_rsp *); +void print_intf_info(struct air_int_rsp *); +void print_ip_vcc_info(struct air_ip_vcc_rsp *); +void print_netif_info(struct air_netif_rsp *); +void print_intf_stats(struct air_phy_stat_rsp *); +void print_vcc_stats(struct air_vcc_rsp *); +void print_vcc_info(struct air_vcc_rsp *); +void print_version_info(struct air_version_rsp *); /* atm_set.c */ -void set_arpserver __P((int, char **, struct cmd *)); -void set_macaddr __P((int, char **, struct cmd *)); -void set_netif __P((int, char **, struct cmd *)); -void set_prefix __P((int, char **, struct cmd *)); +void set_arpserver(int, char **, struct cmd *); +void set_macaddr(int, char **, struct cmd *); +void set_netif(int, char **, struct cmd *); +void set_prefix(int, char **, struct cmd *); /* atm_show.c */ -void show_arp __P((int, char **, struct cmd *)); -void show_arpserv __P((int, char **, struct cmd *)); -void show_config __P((int, char **, struct cmd *)); -void show_intf __P((int, char **, struct cmd *)); -void show_ip_vcc __P((int, char **, struct cmd *)); -void show_netif __P((int, char **, struct cmd *)); -void show_intf_stats __P((int, char **, struct cmd *)); -void show_vcc_stats __P((int, char **, struct cmd *)); -void show_vcc __P((int, char **, struct cmd *)); -void show_version __P((int, char **, struct cmd *)); +void show_arp(int, char **, struct cmd *); +void show_arpserv(int, char **, struct cmd *); +void show_config(int, char **, struct cmd *); +void show_intf(int, char **, struct cmd *); +void show_ip_vcc(int, char **, struct cmd *); +void show_netif(int, char **, struct cmd *); +void show_intf_stats(int, char **, struct cmd *); +void show_vcc_stats(int, char **, struct cmd *); +void show_vcc(int, char **, struct cmd *); +void show_version(int, char **, struct cmd *); /* atm_subr.c */ -char * get_vendor __P((int)); -char * get_adapter __P((int)); -char * get_media_type __P((int)); -char * get_bus_type __P((int)); -char * get_bus_slot_info __P((int, u_long)); -char * get_adapter_name __P((char *)); -int do_info_ioctl __P((struct atminfreq *, int)); -int get_vcc_info __P((char *, struct air_vcc_rsp **)); -int verify_nif_name __P((char *)); +char * get_vendor(int); +char * get_adapter(int); +char * get_media_type(int); +char * get_bus_type(int); +char * get_bus_slot_info(int, u_long); +char * get_adapter_name(char *); +int do_info_ioctl(struct atminfreq *, int); +int get_vcc_info(char *, struct air_vcc_rsp **); +int verify_nif_name(char *); struct sockaddr_in * - get_ip_addr __P((char *)); -int get_hex_addr __P((char *, u_char *, int)); -char * format_mac_addr __P((Mac_addr *)); -int parse_ip_prefix __P((char *, struct in_addr *)); -int compress_prefix_list __P((struct in_addr *, int)); -void check_netif_name __P((char *)); -void sock_error __P((int)); + get_ip_addr(char *); +int get_hex_addr(char *, u_char *, int); +char * format_mac_addr(Mac_addr *); +int parse_ip_prefix(char *, struct in_addr *); +int compress_prefix_list(struct in_addr *, int); +void check_netif_name(char *); +void sock_error(int); diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c index 805d41df04..c8c2c3a00f 100644 --- a/sbin/atm/atm/atm_show.c +++ b/sbin/atm/atm/atm_show.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sbin/atm/atm/atm_show.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $ - * @(#) $DragonFly: src/sbin/atm/atm/atm_show.c,v 1.3 2003/09/28 14:39:16 hmp Exp $ + * @(#) $DragonFly: src/sbin/atm/atm/atm_show.c,v 1.4 2003/11/01 17:15:57 drhodus Exp $ */ /* @@ -58,9 +58,9 @@ /* * Local functions */ -static int vcc_compare __P((const void *, const void *)); -static int ip_vcc_compare __P((const void *, const void *)); -static int arp_compare __P((const void *, const void *)); +static int vcc_compare(const void *, const void *); +static int ip_vcc_compare(const void *, const void *); +static int arp_compare(const void *, const void *); /* diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index d8d294fdf6..3b17c661bf 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1981, 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)badsect.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/badsect/badsect.c,v 1.7.2.2 2001/07/30 10:30:04 dd Exp $ - * $DragonFly: src/sbin/badsect/badsect.c,v 1.4 2003/09/28 14:39:16 hmp Exp $ + * $DragonFly: src/sbin/badsect/badsect.c,v 1.5 2003/11/01 17:15:57 drhodus Exp $ */ /* @@ -78,8 +78,8 @@ long dev_bsize = 1; char buf[MAXBSIZE]; -void rdfs __P((daddr_t, int, char *)); -int chkuse __P((daddr_t, int)); +void rdfs(daddr_t, int, char *); +int chkuse(daddr_t, int); static void usage(void) diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index d662853d5d..e89c04f365 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.16.2.2 2000/12/11 01:03:25 obrien Exp $ - * $DragonFly: src/sbin/ccdconfig/ccdconfig.c,v 1.3 2003/09/28 14:39:16 hmp Exp $ + * $DragonFly: src/sbin/ccdconfig/ccdconfig.c,v 1.4 2003/11/01 17:15:57 drhodus Exp $ */ #include @@ -89,17 +89,17 @@ static struct nlist nl[] = { #define CCD_UNCONFIGALL 3 /* unconfigure all devices */ #define CCD_DUMP 4 /* dump a ccd's configuration */ -static int checkdev __P((char *)); -static int do_io __P((char *, u_long, struct ccd_ioctl *)); -static int do_single __P((int, char **, int)); -static int do_all __P((int)); -static int dump_ccd __P((int, char **)); -static int getmaxpartitions __P((void)); -static int getrawpartition __P((void)); -static int flags_to_val __P((char *)); -static void print_ccd_info __P((struct ccd_softc *, kvm_t *)); -static char *resolve_ccdname __P((char *)); -static void usage __P((void)); +static int checkdev(char *); +static int do_io(char *, u_long, struct ccd_ioctl *); +static int do_single(int, char **, int); +static int do_all(int); +static int dump_ccd(int, char **); +static int getmaxpartitions(void); +static int getrawpartition(void); +static int flags_to_val(char *); +static void print_ccd_info(struct ccd_softc *, kvm_t *); +static char *resolve_ccdname(char *); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 6743823eee..0697d9a52b 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)dmesg.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/dmesg/dmesg.c,v 1.11.2.3 2001/08/08 22:32:15 obrien Exp $ - * $DragonFly: src/sbin/dmesg/dmesg.c,v 1.3 2003/09/28 14:39:16 hmp Exp $ + * $DragonFly: src/sbin/dmesg/dmesg.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -56,7 +56,7 @@ struct nlist nl[] = { { NULL }, }; -void usage __P((void)); +void usage(void); #define KREAD(addr, var) \ kvm_read(kd, addr, &var, sizeof(var)) != sizeof(var) diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index ed41bcdd70..6ce00dfb47 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -33,7 +33,7 @@ * @(#)dump.h 8.2 (Berkeley) 4/28/95 * * $FreeBSD: src/sbin/dump/dump.h,v 1.7.6.4 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/dump.h,v 1.2 2003/06/17 04:27:32 dillon Exp $ + * $DragonFly: src/sbin/dump/dump.h,v 1.3 2003/11/01 17:15:58 drhodus Exp $ */ #define MAXINOPB (MAXBSIZE / sizeof(struct dinode)) @@ -97,53 +97,53 @@ int tp_bshift; /* log2(TP_BSIZE) */ #endif /* operator interface functions */ -void broadcast __P((char *message)); -void infosch __P((int)); -void lastdump __P((int arg)); /* int should be char */ -void msg __P((const char *fmt, ...)) __printflike(1, 2); -void msgtail __P((const char *fmt, ...)) __printflike(1, 2); -int query __P((char *question)); -void quit __P((const char *fmt, ...)) __printflike(1, 2); -void timeest __P((void)); -time_t unctime __P((char *str)); +void broadcast(char *message); +void infosch(int); +void lastdump(int arg); /* int should be char */ +void msg(const char *fmt, ...) __printflike(1, 2); +void msgtail(const char *fmt, ...) __printflike(1, 2); +int query(char *question); +void quit(const char *fmt, ...) __printflike(1, 2); +void timeest(void); +time_t unctime(char *str); /* mapping rouintes */ struct dinode; -long blockest __P((struct dinode *dp)); -int mapfiles __P((ino_t maxino, long *tapesize)); -int mapdirs __P((ino_t maxino, long *tapesize)); +long blockest(struct dinode *dp); +int mapfiles(ino_t maxino, long *tapesize); +int mapdirs(ino_t maxino, long *tapesize); /* file dumping routines */ -void blksout __P((daddr_t *blkp, int frags, ino_t ino)); -void bread __P((daddr_t blkno, char *buf, int size)); -void dumpino __P((struct dinode *dp, ino_t ino)); -void dumpmap __P((char *map, int type, ino_t ino)); -void writeheader __P((ino_t ino)); +void blksout(daddr_t *blkp, int frags, ino_t ino); +void bread(daddr_t blkno, char *buf, int size); +void dumpino(struct dinode *dp, ino_t ino); +void dumpmap(char *map, int type, ino_t ino); +void writeheader(ino_t ino); /* tape writing routines */ -int alloctape __P((void)); -void close_rewind __P((void)); -void dumpblock __P((daddr_t blkno, int size)); -void startnewtape __P((int top)); -void trewind __P((void)); -void writerec __P((char *dp, int isspcl)); +int alloctape(void); +void close_rewind(void); +void dumpblock(daddr_t blkno, int size); +void startnewtape(int top); +void trewind(void); +void writerec(char *dp, int isspcl); -void Exit __P((int status)) __dead2; -void dumpabort __P((int signo)); -void getfstab __P((void)); +void Exit(int status) __dead2; +void dumpabort(int signo); +void getfstab(void); -char *rawname __P((char *cp)); -struct dinode *getino __P((ino_t inum)); +char *rawname(char *cp); +struct dinode *getino(ino_t inum); /* rdump routines */ #ifdef RDUMP -void rmtclose __P((void)); -int rmthost __P((char *host)); -int rmtopen __P((char *tape, int mode)); -int rmtwrite __P((char *buf, int count)); +void rmtclose(void); +int rmthost(char *host); +int rmtopen(char *tape, int mode); +int rmtwrite(char *buf, int count); #endif /* RDUMP */ -void interrupt __P((int signo)); /* in case operator bangs on console */ +void interrupt(int signo); /* in case operator bangs on console */ /* * Exit status codes @@ -155,7 +155,7 @@ void interrupt __P((int signo)); /* in case operator bangs on console */ #define OPGRENT "operator" /* group entry to notify */ -struct fstab *fstabsearch __P((char *key)); /* search fs_file and fs_spec */ +struct fstab *fstabsearch(char *key); /* search fs_file and fs_spec */ #ifndef NAME_MAX #define NAME_MAX 255 @@ -173,13 +173,13 @@ struct dumpdates { int nddates; /* number of records (might be zero) */ int ddates_in; /* we have read the increment file */ struct dumpdates **ddatev; /* the arrayfied version */ -void initdumptimes __P((void)); -void getdumptime __P((void)); -void putdumptime __P((void)); +void initdumptimes(void); +void getdumptime(void); +void putdumptime(void); #define ITITERATE(i, ddp) \ for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) -void sig __P((int signo)); +void sig(int signo); /* * Compatibility with old systems. diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index c7c32a0265..ee2d713594 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -32,7 +32,7 @@ * * @(#)dumprmt.c 8.3 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/dump/dumprmt.c,v 1.14.2.1 2000/07/01 06:31:52 ps Exp $ - * $DragonFly: src/sbin/dump/dumprmt.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dump/dumprmt.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -75,15 +75,15 @@ static int rmtstate = TS_CLOSED; static int rmtape; static char *rmtpeer; -static int okname __P((char *)); -static int rmtcall __P((char *, char *)); -static void rmtconnaborted __P((/* int, int */)); -static int rmtgetb __P((void)); -static void rmtgetconn __P((void)); -static void rmtgets __P((char *, int)); -static int rmtreply __P((char *)); +static int okname(char *); +static int rmtcall(char *, char *); +static void rmtconnaborted(/* int, int */); +static int rmtgetb(void); +static void rmtgetconn(void); +static void rmtgets(char *, int); +static int rmtreply(char *); #ifdef KERBEROS -int krcmd __P((char **, int /*u_short*/, char *, char *, int *, char *)); +int krcmd(char **, int /*u_short*/, char *, char *, int *, char *); #endif static int errfd = -1; diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index f8440a6dd3..d592d6ed21 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -32,7 +32,7 @@ * * @(#)itime.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/dump/itime.c,v 1.3.2.1 2001/08/01 06:29:35 obrien Exp $ - * $DragonFly: src/sbin/dump/itime.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dump/itime.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -69,10 +69,10 @@ struct dumpdates **ddatev = 0; int nddates = 0; int ddates_in = 0; -static void dumprecout __P((FILE *, struct dumpdates *)); -static int getrecord __P((FILE *, struct dumpdates *)); -static int makedumpdate __P((struct dumpdates *, char *)); -static void readdumptimes __P((FILE *)); +static void dumprecout(FILE *, struct dumpdates *); +static int getrecord(FILE *, struct dumpdates *); +static int makedumpdate(struct dumpdates *, char *); +static void readdumptimes(FILE *); void initdumptimes(void) diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 3dac438cb8..ed27a7dd1d 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/main.c,v 1.20.2.9 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/main.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dump/main.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -80,9 +80,9 @@ long dev_bsize = 1; /* recalculated below */ long blocksperfile; /* output blocks per file */ char *host = NULL; /* remote host (if any) */ -static long numarg __P((char *, long, long)); -static void obsolete __P((int *, char **[])); -static void usage __P((void)); +static long numarg(char *, long, long); +static void obsolete(int *, char **[]); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index c0da541c9e..5337f78cc8 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -32,7 +32,7 @@ * * @(#)optr.c 8.2 (Berkeley) 1/6/94 * $FreeBSD: src/sbin/dump/optr.c,v 1.9.2.5 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/optr.c,v 1.3 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dump/optr.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -54,8 +54,8 @@ #include "dump.h" #include "pathnames.h" -void alarmcatch __P((/* int, int */)); -int datesort __P((const void *, const void *)); +void alarmcatch(/* int, int */); +int datesort(const void *, const void *); /* * Query the operator; This previously-fascist piece of code diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index a851c275d8..907221d1a9 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -32,7 +32,7 @@ * * @(#)tape.c 8.4 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/tape.c,v 1.12.2.3 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/tape.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dump/tape.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -77,12 +77,12 @@ extern int cartridge; extern char *host; char *nexttape; -static int atomic __P((ssize_t (*)(), int, char *, int)); -static void doslave __P((int, int)); -static void enslave __P((void)); -static void flushtape __P((void)); -static void killall __P((void)); -static void rollforward __P((void)); +static int atomic(ssize_t (*)(), int, char *, int); +static void doslave(int, int); +static void enslave(void); +static void flushtape(void); +static void killall(void); +static void rollforward(void); /* * Concurrent dump mods (Caltech) - disk block reading and tape writing diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 26f1d9859b..8732ca7d70 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -32,7 +32,7 @@ * * @(#)traverse.c 8.7 (Berkeley) 6/15/95 * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $ - * $DragonFly: src/sbin/dump/traverse.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dump/traverse.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -72,7 +72,7 @@ typedef long fsizeT; static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size, long *tapesize, int nodump)); -static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size)); +static void dmpindir(ino_t ino, daddr_t blk, int level, fsizeT *size); static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize, long *tapesize, int nodump)); diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index c36cdba203..1687051a40 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)dumpfs.c 8.5 (Berkeley) 4/29/95 * $FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.13.2.1 2001/01/22 18:10:11 iedowse Exp $ - * $DragonFly: src/sbin/dumpfs/dumpfs.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dumpfs/dumpfs.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -62,10 +62,10 @@ union { long dev_bsize = 1; -int dumpfs __P((char *)); -int dumpcg __P((char *, int, int)); -void pbits __P((void *, int)); -void usage __P((void)); +int dumpfs(char *); +int dumpcg(char *, int, int); +void pbits(void *, int); +void usage(void); int main(int argc, char **argv) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index b972529886..0568914fd9 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)swapon.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/dumpon/dumpon.c,v 1.10.2.2 2001/07/30 10:30:05 dd Exp $ - * $DragonFly: src/sbin/dumpon/dumpon.c,v 1.3 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/dumpon/dumpon.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -46,7 +46,7 @@ #include #include -void usage __P((void)) __dead2; +void usage(void) __dead2; int main(int argc, char **argv) diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c index 149f94cca2..416f4c27ea 100644 --- a/sbin/fsck/dir.c +++ b/sbin/fsck/dir.c @@ -32,7 +32,7 @@ * * @(#)dir.c 8.8 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/dir.c,v 1.15 1999/08/28 00:12:45 peter Exp $ - * $DragonFly: src/sbin/fsck/dir.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/dir.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -59,14 +59,14 @@ struct odirtemplate odirhead = { 0, DIRBLKSIZ - 12, 2, ".." }; -static int chgino __P((struct inodesc *)); -static int dircheck __P((struct inodesc *, struct direct *)); -static int expanddir __P((struct dinode *dp, char *name)); -static void freedir __P((ino_t ino, ino_t parent)); -static struct direct *fsck_readdir __P((struct inodesc *)); -static struct bufarea *getdirblk __P((ufs_daddr_t blkno, long size)); -static int lftempname __P((char *bufp, ino_t ino)); -static int mkentry __P((struct inodesc *)); +static int chgino(struct inodesc *); +static int dircheck(struct inodesc *, struct direct *); +static int expanddir(struct dinode *dp, char *name); +static void freedir(ino_t ino, ino_t parent); +static struct direct *fsck_readdir(struct inodesc *); +static struct bufarea *getdirblk(ufs_daddr_t blkno, long size); +static int lftempname(char *bufp, ino_t ino); +static int mkentry(struct inodesc *); /* * Propagate connected state through the tree. diff --git a/sbin/fsck/fsck.h b/sbin/fsck/fsck.h index e39570caa4..0547aab05e 100644 --- a/sbin/fsck/fsck.h +++ b/sbin/fsck/fsck.h @@ -32,7 +32,7 @@ * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 * $FreeBSD: src/sbin/fsck/fsck.h,v 1.12.2.1 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/fsck.h,v 1.2 2003/06/17 04:27:32 dillon Exp $ + * $DragonFly: src/sbin/fsck/fsck.h,v 1.3 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -239,68 +239,68 @@ struct dinode zino; struct fstab; -void adjust __P((struct inodesc *, int lcnt)); -ufs_daddr_t allocblk __P((long frags)); -ino_t allocdir __P((ino_t parent, ino_t request, int mode)); -ino_t allocino __P((ino_t request, int type)); -void blkerror __P((ino_t ino, char *type, ufs_daddr_t blk)); -char *blockcheck __P((char *name)); -int bread __P((int fd, char *buf, ufs_daddr_t blk, long size)); -void bufinit __P((void)); -void bwrite __P((int fd, char *buf, ufs_daddr_t blk, long size)); -void cacheino __P((struct dinode *dp, ino_t inumber)); -void catch __P((int)); -void catchquit __P((int)); -int changeino __P((ino_t dir, char *name, ino_t newnum)); +void adjust(struct inodesc *, int lcnt); +ufs_daddr_t allocblk(long frags); +ino_t allocdir(ino_t parent, ino_t request, int mode); +ino_t allocino(ino_t request, int type); +void blkerror(ino_t ino, char *type, ufs_daddr_t blk); +char *blockcheck(char *name); +int bread(int fd, char *buf, ufs_daddr_t blk, long size); +void bufinit(void); +void bwrite(int fd, char *buf, ufs_daddr_t blk, long size); +void cacheino(struct dinode *dp, ino_t inumber); +void catch(int); +void catchquit(int); +int changeino(ino_t dir, char *name, ino_t newnum); int checkfstab __P((int preen, int maxrun, int (*docheck)(struct fstab *), int (*chkit)(char *, char *, long, int))); -int chkrange __P((ufs_daddr_t blk, int cnt)); -void ckfini __P((int markclean)); -int ckinode __P((struct dinode *dp, struct inodesc *)); -void clri __P((struct inodesc *, char *type, int flag)); -int clearentry __P((struct inodesc *)); -void direrror __P((ino_t ino, char *errmesg)); -int dirscan __P((struct inodesc *)); -int dofix __P((struct inodesc *, char *msg)); -void ffs_clrblock __P((struct fs *, u_char *, ufs_daddr_t)); -void ffs_fragacct __P((struct fs *, int, int32_t [], int)); -int ffs_isblock __P((struct fs *, u_char *, ufs_daddr_t)); -void ffs_setblock __P((struct fs *, u_char *, ufs_daddr_t)); -void fileerror __P((ino_t cwd, ino_t ino, char *errmesg)); -int findino __P((struct inodesc *)); -int findname __P((struct inodesc *)); -void flush __P((int fd, struct bufarea *bp)); -void freeblk __P((ufs_daddr_t blkno, long frags)); -void freeino __P((ino_t ino)); -void freeinodebuf __P((void)); -int ftypeok __P((struct dinode *dp)); -void getblk __P((struct bufarea *bp, ufs_daddr_t blk, long size)); -struct bufarea *getdatablk __P((ufs_daddr_t blkno, long size)); -struct inoinfo *getinoinfo __P((ino_t inumber)); -struct dinode *getnextinode __P((ino_t inumber)); -void getpathname __P((char *namebuf, ino_t curdir, ino_t ino)); -struct dinode *ginode __P((ino_t inumber)); -void infohandler __P((int sig)); -void inocleanup __P((void)); -void inodirty __P((void)); -struct inostat *inoinfo __P((ino_t inum)); -int linkup __P((ino_t orphan, ino_t parentdir, char *name)); -int makeentry __P((ino_t parent, ino_t ino, char *name)); -void panic __P((const char *fmt, ...)); -void pass1 __P((void)); -void pass1b __P((void)); -int pass1check __P((struct inodesc *)); -void pass2 __P((void)); -void pass3 __P((void)); -void pass4 __P((void)); -int pass4check __P((struct inodesc *)); -void pass5 __P((void)); -void pfatal __P((const char *fmt, ...)); -void pinode __P((ino_t ino)); -void propagate __P((void)); -void pwarn __P((const char *fmt, ...)); -int reply __P((char *question)); -void setinodebuf __P((ino_t)); -int setup __P((char *dev)); -void voidquit __P((int)); +int chkrange(ufs_daddr_t blk, int cnt); +void ckfini(int markclean); +int ckinode(struct dinode *dp, struct inodesc *); +void clri(struct inodesc *, char *type, int flag); +int clearentry(struct inodesc *); +void direrror(ino_t ino, char *errmesg); +int dirscan(struct inodesc *); +int dofix(struct inodesc *, char *msg); +void ffs_clrblock(struct fs *, u_char *, ufs_daddr_t); +void ffs_fragacct(struct fs *, int, int32_t [], int); +int ffs_isblock(struct fs *, u_char *, ufs_daddr_t); +void ffs_setblock(struct fs *, u_char *, ufs_daddr_t); +void fileerror(ino_t cwd, ino_t ino, char *errmesg); +int findino(struct inodesc *); +int findname(struct inodesc *); +void flush(int fd, struct bufarea *bp); +void freeblk(ufs_daddr_t blkno, long frags); +void freeino(ino_t ino); +void freeinodebuf(void); +int ftypeok(struct dinode *dp); +void getblk(struct bufarea *bp, ufs_daddr_t blk, long size); +struct bufarea *getdatablk(ufs_daddr_t blkno, long size); +struct inoinfo *getinoinfo(ino_t inumber); +struct dinode *getnextinode(ino_t inumber); +void getpathname(char *namebuf, ino_t curdir, ino_t ino); +struct dinode *ginode(ino_t inumber); +void infohandler(int sig); +void inocleanup(void); +void inodirty(void); +struct inostat *inoinfo(ino_t inum); +int linkup(ino_t orphan, ino_t parentdir, char *name); +int makeentry(ino_t parent, ino_t ino, char *name); +void panic(const char *fmt, ...); +void pass1(void); +void pass1b(void); +int pass1check(struct inodesc *); +void pass2(void); +void pass3(void); +void pass4(void); +int pass4check(struct inodesc *); +void pass5(void); +void pfatal(const char *fmt, ...); +void pinode(ino_t ino); +void propagate(void); +void pwarn(const char *fmt, ...); +int reply(char *question); +void setinodebuf(ino_t); +int setup(char *dev); +void voidquit(int); diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c index feba23498d..44914f0394 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/fsck/fsutil.c,v 1.2.2.1 2001/08/01 05:47:55 obrien Exp $ - * $DragonFly: src/sbin/fsck/fsutil.c,v 1.3 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/fsutil.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ * * $NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $ */ @@ -65,7 +65,7 @@ static int preen = 0; extern char *__progname; -static void vmsg __P((int, const char *, va_list)); +static void vmsg(int, const char *, va_list); void setcdevname(const char *cd, int pr) diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h index 90abca50a4..89ada29c1d 100644 --- a/sbin/fsck/fsutil.h +++ b/sbin/fsck/fsutil.h @@ -29,31 +29,31 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/fsck/fsutil.h,v 1.3.2.1 2001/08/01 05:47:55 obrien Exp $ - * $DragonFly: src/sbin/fsck/fsutil.h,v 1.2 2003/06/17 04:27:32 dillon Exp $ + * $DragonFly: src/sbin/fsck/fsutil.h,v 1.3 2003/11/01 17:15:58 drhodus Exp $ */ -void perror __P((const char *)); -void errexit __P((const char *, ...)) +void perror(const char *); +void errexit(const char *, ...) __attribute__((__noreturn__,__format__(__printf__,1,2))); -void pfatal __P((const char *, ...)) +void pfatal(const char *, ...) __attribute__((__format__(__printf__,1,2))); -void pwarn __P((const char *, ...)) +void pwarn(const char *, ...) __attribute__((__format__(__printf__,1,2))); -void panic __P((const char *, ...)) +void panic(const char *, ...) __attribute__((__noreturn__,__format__(__printf__,1,2))); -const char *rawname __P((const char *)); -const char *unrawname __P((const char *)); +const char *rawname(const char *); +const char *unrawname(const char *); #if 0 -const char *blockcheck __P((const char *)); +const char *blockcheck(const char *); #endif -const char *devcheck __P((const char *)); -const char *cdevname __P((void)); -void setcdevname __P((const char *, int)); -struct statfs *getmntpt __P((const char *)); -int hotroot __P((void)); -void *emalloc __P((size_t)); -void *erealloc __P((void *, size_t)); -char *estrdup __P((const char *)); +const char *devcheck(const char *); +const char *cdevname(void); +void setcdevname(const char *, int); +struct statfs *getmntpt(const char *); +int hotroot(void); +void *emalloc(size_t); +void *erealloc(void *, size_t); +char *estrdup(const char *); #define CHECK_PREEN 0x0001 #define CHECK_VERBOSE 0x0002 @@ -62,5 +62,5 @@ char *estrdup __P((const char *)); #define DO_BACKGRD 0x0010 struct fstab; -int checkfstab __P((int, int (*)(struct fstab *), +int checkfstab(int, int (*)(struct fstab *, int (*) (const char *, const char *, const char *, char *, pid_t *))); diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c index 2ebf3685ee..d339394e6e 100644 --- a/sbin/fsck/inode.c +++ b/sbin/fsck/inode.c @@ -32,7 +32,7 @@ * * @(#)inode.c 8.8 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/inode.c,v 1.20 2000/02/28 20:02:41 mckusick Exp $ - * $DragonFly: src/sbin/fsck/inode.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/inode.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -50,7 +50,7 @@ static ino_t startinum; -static int iblock __P((struct inodesc *, long ilevel, quad_t isize)); +static int iblock(struct inodesc *, long ilevel, quad_t isize); int ckinode(struct dinode *dp, register struct inodesc *idesc) diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c index 7aa410dc10..a8aca59c62 100644 --- a/sbin/fsck/main.c +++ b/sbin/fsck/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1986, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/14/95 * $FreeBSD: src/sbin/fsck/main.c,v 1.21.2.1 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/main.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/main.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -53,12 +53,12 @@ #include "fsck.h" -static int argtoi __P((int flag, char *req, char *str, int base)); -static int docheck __P((struct fstab *fsp)); +static int argtoi(int flag, char *req, char *str, int base); +static int docheck(struct fstab *fsp); static int checkfilesys __P((char *filesys, char *mntpt, long auxdata, int child)); -static struct statfs *getmntpt __P((const char *)); -int main __P((int argc, char *argv[])); +static struct statfs *getmntpt(const char *); +int main(int argc, char *argv[]); int main(int argc, char **argv) diff --git a/sbin/fsck/pass1.c b/sbin/fsck/pass1.c index f324b19c93..8efcb03a90 100644 --- a/sbin/fsck/pass1.c +++ b/sbin/fsck/pass1.c @@ -32,7 +32,7 @@ * * @(#)pass1.c 8.6 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/pass1.c,v 1.16.2.5 2002/06/23 22:34:58 iedowse Exp $ - * $DragonFly: src/sbin/fsck/pass1.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/pass1.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -50,7 +50,7 @@ static ufs_daddr_t badblk; static ufs_daddr_t dupblk; static ino_t lastino; /* last inode in use */ -static void checkinode __P((ino_t inumber, struct inodesc *)); +static void checkinode(ino_t inumber, struct inodesc *); void pass1(void) diff --git a/sbin/fsck/pass1b.c b/sbin/fsck/pass1b.c index 40ef7a6da1..2d01355de3 100644 --- a/sbin/fsck/pass1b.c +++ b/sbin/fsck/pass1b.c @@ -32,7 +32,7 @@ * * @(#)pass1b.c 8.4 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/pass1b.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/pass1b.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/pass1b.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -45,7 +45,7 @@ #include "fsck.h" static struct dups *duphead; -static int pass1bcheck __P((struct inodesc *)); +static int pass1bcheck(struct inodesc *); void pass1b(void) diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c index 312f480d49..197254ca07 100644 --- a/sbin/fsck/pass2.c +++ b/sbin/fsck/pass2.c @@ -32,7 +32,7 @@ * * @(#)pass2.c 8.9 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/pass2.c,v 1.10.2.2 2001/11/24 15:14:59 iedowse Exp $ - * $DragonFly: src/sbin/fsck/pass2.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/pass2.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -47,8 +47,8 @@ #define MINDIRSIZE (sizeof (struct dirtemplate)) -static int blksort __P((const void *, const void *)); -static int pass2check __P((struct inodesc *)); +static int blksort(const void *, const void *); +static int pass2check(struct inodesc *); void pass2(void) diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index 2a8fd56a53..b4d970cb1c 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -32,7 +32,7 @@ * * @(#)preen.c 8.5 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $ - * $DragonFly: src/sbin/fsck/preen.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/preen.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -64,8 +64,8 @@ struct disk { int nrun, ndisks; -static void addpart __P((char *name, char *fsname, long auxdata)); -static struct disk *finddisk __P((char *name)); +static void addpart(char *name, char *fsname, long auxdata); +static struct disk *finddisk(char *name); static int startdisk __P((struct disk *dk, int (*checkit)(char *, char *, long, int))); diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c index 3ad403e5eb..8c242b5ddc 100644 --- a/sbin/fsck/setup.c +++ b/sbin/fsck/setup.c @@ -32,7 +32,7 @@ * * @(#)setup.c 8.10 (Berkeley) 5/9/95 * $FreeBSD: src/sbin/fsck/setup.c,v 1.17.2.4 2002/06/24 05:10:41 dillon Exp $ - * $DragonFly: src/sbin/fsck/setup.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/setup.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #define DKTYPENAMES @@ -55,10 +55,10 @@ struct bufarea asblk; #define altsblock (*asblk.b_un.b_fs) #define POWEROF2(num) (((num) & ((num) - 1)) == 0) -static void badsb __P((int listerr, char *s)); -static int calcsb __P((char *dev, int devfd, struct fs *fs)); -static struct disklabel *getdisklabel __P((char *s, int fd)); -static int readsb __P((int listerr)); +static void badsb(int listerr, char *s); +static int calcsb(char *dev, int devfd, struct fs *fs); +static struct disklabel *getdisklabel(char *s, int fd); +static int readsb(int listerr); /* * Read in a superblock finding an alternate if necessary. diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c index 17a51edf36..ed02a5b29a 100644 --- a/sbin/fsck/utilities.c +++ b/sbin/fsck/utilities.c @@ -32,7 +32,7 @@ * * @(#)utilities.c 8.6 (Berkeley) 5/19/95 * $FreeBSD: src/sbin/fsck/utilities.c,v 1.11.2.3 2001/01/23 23:11:07 iedowse Exp $ - * $DragonFly: src/sbin/fsck/utilities.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck/utilities.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $ */ #include @@ -48,7 +48,7 @@ long diskreads, totalreads; /* Disk cache statistics */ -static void rwerror __P((char *mesg, ufs_daddr_t blk)); +static void rwerror(char *mesg, ufs_daddr_t blk); int ftypeok(struct dinode *dp) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 9755b35837..33088770fc 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -33,7 +33,7 @@ * * $NetBSD: dir.c,v 1.14 1998/08/25 19:18:15 ross Exp $ * $FreeBSD: src/sbin/fsck_msdosfs/dir.c,v 1.1.2.1 2001/08/01 05:47:55 obrien Exp $ - * $DragonFly: src/sbin/fsck_msdosfs/dir.c,v 1.3 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck_msdosfs/dir.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ */ @@ -92,12 +92,12 @@ /* dir.c */ -static struct dosDirEntry *newDosDirEntry __P((void)); -static void freeDosDirEntry __P((struct dosDirEntry *)); -static struct dirTodoNode *newDirTodo __P((void)); -static void freeDirTodo __P((struct dirTodoNode *)); -static char *fullpath __P((struct dosDirEntry *)); -static u_char calcShortSum __P((u_char *)); +static struct dosDirEntry *newDosDirEntry(void); +static void freeDosDirEntry(struct dosDirEntry *); +static struct dirTodoNode *newDirTodo(void); +static void freeDirTodo(struct dirTodoNode *); +static char *fullpath(struct dosDirEntry *); +static u_char calcShortSum(u_char *); static int delete __P((int, struct bootblock *, struct fatEntry *, cl_t, int, cl_t, int, int)); static int removede __P((int, struct bootblock *, struct fatEntry *, u_char *, diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h index 76ef3bde56..8517acb99c 100644 --- a/sbin/fsck_msdosfs/ext.h +++ b/sbin/fsck_msdosfs/ext.h @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * $NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $ * $FreeBSD: src/sbin/fsck_msdosfs/ext.h,v 1.1.2.1 2001/08/01 05:47:56 obrien Exp $ - * $DragonFly: src/sbin/fsck_msdosfs/ext.h,v 1.2 2003/06/17 04:27:32 dillon Exp $ + * $DragonFly: src/sbin/fsck_msdosfs/ext.h,v 1.3 2003/11/01 17:15:58 drhodus Exp $ */ #ifndef EXT_H @@ -57,12 +57,12 @@ extern struct dosDirEntry *rootDir; /* * function declarations */ -int ask __P((int, const char *, ...)) __attribute__((__format__(__printf__,2,3))); +int ask(int, const char *, ...) __attribute__((__format__(__printf__,2,3))); /* * Check filesystem given as arg */ -int checkfilesys __P((const char *)); +int checkfilesys(const char *); /* * Return values of various functions @@ -80,41 +80,41 @@ int checkfilesys __P((const char *)); * read a boot block in a machine independend fashion and translate * it into our struct bootblock. */ -int readboot __P((int, struct bootblock *)); +int readboot(int, struct bootblock *); /* * Correct the FSInfo block. */ -int writefsinfo __P((int, struct bootblock *)); +int writefsinfo(int, struct bootblock *); /* * Read one of the FAT copies and return a pointer to the new * allocated array holding our description of it. */ -int readfat __P((int, struct bootblock *, int, struct fatEntry **)); +int readfat(int, struct bootblock *, int, struct fatEntry **); /* * Check two FAT copies for consistency and merge changes into the * first if neccessary. */ -int comparefat __P((struct bootblock *, struct fatEntry *, struct fatEntry *, int)); +int comparefat(struct bootblock *, struct fatEntry *, struct fatEntry *, int); /* * Check a FAT */ -int checkfat __P((struct bootblock *, struct fatEntry *)); +int checkfat(struct bootblock *, struct fatEntry *); /* * Write back FAT entries */ -int writefat __P((int, struct bootblock *, struct fatEntry *, int)); +int writefat(int, struct bootblock *, struct fatEntry *, int); /* * Read a directory */ -int resetDosDirSection __P((struct bootblock *, struct fatEntry *)); -void finishDosDirSection __P((void)); -int handleDirTree __P((int, struct bootblock *, struct fatEntry *)); +int resetDosDirSection(struct bootblock *, struct fatEntry *); +void finishDosDirSection(void); +int handleDirTree(int, struct bootblock *, struct fatEntry *); /* * Cross-check routines run after everything is completely in memory @@ -122,12 +122,12 @@ int handleDirTree __P((int, struct bootblock *, struct fatEntry *)); /* * Check for lost cluster chains */ -int checklost __P((int, struct bootblock *, struct fatEntry *)); +int checklost(int, struct bootblock *, struct fatEntry *); /* * Try to reconnect a lost cluster chain */ -int reconnect __P((int, struct bootblock *, struct fatEntry *, cl_t)); -void finishlf __P((void)); +int reconnect(int, struct bootblock *, struct fatEntry *, cl_t); +void finishlf(void); /* * Small helper functions @@ -135,11 +135,11 @@ void finishlf __P((void)); /* * Return the type of a reserved cluster as text */ -char *rsrvdcltype __P((cl_t)); +char *rsrvdcltype(cl_t); /* * Clear a cluster chain in a FAT */ -void clearchain __P((struct bootblock *, struct fatEntry *, cl_t)); +void clearchain(struct bootblock *, struct fatEntry *, cl_t); #endif diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index f0f2fb63c5..7cd7928503 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -31,7 +31,7 @@ * * $NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $ * $FreeBSD: src/sbin/fsck_msdosfs/fat.c,v 1.1.2.1 2001/08/01 05:47:56 obrien Exp $ - * $DragonFly: src/sbin/fsck_msdosfs/fat.c,v 1.3 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck_msdosfs/fat.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ */ @@ -46,10 +46,10 @@ #include "ext.h" #include "fsutil.h" -static int checkclnum __P((struct bootblock *, int, cl_t, cl_t *)); -static int clustdiffer __P((cl_t, cl_t *, cl_t *, int)); -static int tryclear __P((struct bootblock *, struct fatEntry *, cl_t, cl_t *)); -static int _readfat __P((int, struct bootblock *, int, u_char **)); +static int checkclnum(struct bootblock *, int, cl_t, cl_t *); +static int clustdiffer(cl_t, cl_t *, cl_t *, int); +static int tryclear(struct bootblock *, struct fatEntry *, cl_t, cl_t *); +static int _readfat(int, struct bootblock *, int, u_char **); /* * Check a cluster number for valid value diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c index b15a63f46c..9b8ea426ad 100644 --- a/sbin/fsck_msdosfs/main.c +++ b/sbin/fsck_msdosfs/main.c @@ -31,7 +31,7 @@ * * $NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $ * $FreeBSD: src/sbin/fsck_msdosfs/main.c,v 1.4.2.1 2001/08/01 05:47:56 obrien Exp $ - * $DragonFly: src/sbin/fsck_msdosfs/main.c,v 1.3 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsck_msdosfs/main.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $ */ @@ -57,8 +57,8 @@ int alwaysyes; /* assume "yes" for all questions */ int preen; /* set when preening */ int rdonly; /* device is opened read only (supersedes above) */ -static void usage __P((void)); -int main __P((int, char **)); +static void usage(void); +int main(int, char **); static void usage(void) diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 2932a207bd..b4619fd5e8 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/fsdb/fsdb.c,v 1.13.2.3 2002/03/20 13:39:02 joerg Exp $ - * $DragonFly: src/sbin/fsdb/fsdb.c,v 1.5 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsdb/fsdb.c,v 1.6 2003/11/01 17:15:59 drhodus Exp $ */ #include @@ -47,8 +47,8 @@ #include "fsdb.h" #include "fsck.h" -static void usage __P((void)); -int cmdloop __P((void)); +static void usage(void); +int cmdloop(void); static void usage(void) @@ -402,8 +402,8 @@ CMDFUNCSTART(ls) return 0; } -int findino __P((struct inodesc *idesc)); /* from fsck */ -static int dolookup __P((char *name)); +int findino(struct inodesc *idesc); /* from fsck */ +static int dolookup(char *name); static int dolookup(char *name) diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h index a2a980f4ac..0629035b22 100644 --- a/sbin/fsdb/fsdb.h +++ b/sbin/fsdb/fsdb.h @@ -28,13 +28,13 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/fsdb/fsdb.h,v 1.4.2.1 2002/03/20 13:39:02 joerg Exp $ - * $DragonFly: src/sbin/fsdb/fsdb.h,v 1.2 2003/06/17 04:27:32 dillon Exp $ + * $DragonFly: src/sbin/fsdb/fsdb.h,v 1.3 2003/11/01 17:15:59 drhodus Exp $ */ -extern int bread __P((int fd, char *buf, daddr_t blk, long size)); -extern void bwrite __P((int fd, char *buf, daddr_t blk, long size)); -extern void rwerror __P((char *mesg, daddr_t blk)); -extern int reply __P((char *question)); +extern int bread(int fd, char *buf, daddr_t blk, long size); +extern void bwrite(int fd, char *buf, daddr_t blk, long size); +extern void rwerror(char *mesg, daddr_t blk); +extern int reply(char *question); extern long dev_bsize; extern long secsize; @@ -49,14 +49,14 @@ struct cmdtable { unsigned int flags; #define FL_RO 0x0000 /* for symmetry */ #define FL_WR 0x0001 /* wants to write */ - int (*handler) __P((int argc, char *argv[])); + int (*handler)(int argc, char *argv[]); }; extern struct dinode *curinode; extern ino_t curinum; -int argcount __P((struct cmdtable *cmdp, int argc, char *argv[])); -char **crack __P((char *line, int *argc)); -void printstat __P((const char *cp, ino_t inum, struct dinode *dp)); -int printactive __P((int doblocks)); -int checkactive __P((void)); -int checkactivedir __P((void)); +int argcount(struct cmdtable *cmdp, int argc, char *argv[]); +char **crack(char *line, int *argc); +void printstat(const char *cp, ino_t inum, struct dinode *dp); +int printactive(int doblocks); +int checkactive(void); +int checkactivedir(void); diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index 105b34821f..b4bc3ebbcb 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.9.2.2 2002/03/20 13:39:02 joerg Exp $ - * $DragonFly: src/sbin/fsdb/fsdbutil.c,v 1.4 2003/09/28 14:39:17 hmp Exp $ + * $DragonFly: src/sbin/fsdb/fsdbutil.c,v 1.5 2003/11/01 17:15:59 drhodus Exp $ */ #include @@ -47,9 +47,9 @@ #include "fsdb.h" #include "fsck.h" -static int charsperline __P((void)); -static int printindir __P((ufs_daddr_t blk, int level, char *bufp)); -static void printblocks __P((ino_t inum, struct dinode *dp)); +static int charsperline(void); +static int printindir(ufs_daddr_t blk, int level, char *bufp); +static void printblocks(ino_t inum, struct dinode *dp); char ** crack(char *line, int *argc) diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c index 5ac9776cfc..ceca44bcf0 100644 --- a/sbin/fsirand/fsirand.c +++ b/sbin/fsirand/fsirand.c @@ -30,7 +30,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/fsirand/fsirand.c,v 1.7.2.1 2000/07/01 06:23:36 ps Exp $ - * $DragonFly: src/sbin/fsirand/fsirand.c,v 1.4 2003/09/28 14:39:18 hmp Exp $ + * $DragonFly: src/sbin/fsirand/fsirand.c,v 1.5 2003/11/01 17:15:59 drhodus Exp $ */ #include @@ -49,8 +49,8 @@ #include #include -static void usage __P((void)); -int fsirand __P((char *)); +static void usage(void); +int fsirand(char *); int printonly = 0, force = 0, ignorelabel = 0; diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 2cb55d843d..cf9c7d561c 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)ifconfig.c 8.2 (Berkeley) 2/16/94 * $FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.51.2.19 2003/01/28 11:02:56 fjoe Exp $ - * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.3 2003/09/28 14:39:18 hmp Exp $ + * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.4 2003/11/01 17:15:59 drhodus Exp $ */ #include @@ -134,29 +134,29 @@ int listcloners = 0; char addr_buf[MAXHOSTNAMELEN *2 + 1]; /*for getnameinfo()*/ #endif -void Perror __P((const char *cmd)); -void checkatrange __P((struct sockaddr_at *)); -int ifconfig __P((int argc, char *const *argv, const struct afswtch *afp)); -void notealias __P((const char *, int, int, const struct afswtch *afp)); -void list_cloners __P((void)); -void printb __P((const char *s, unsigned value, const char *bits)); -void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); +void Perror(const char *cmd); +void checkatrange(struct sockaddr_at *); +int ifconfig(int argc, char *const *argv, const struct afswtch *afp); +void notealias(const char *, int, int, const struct afswtch *afp); +void list_cloners(void); +void printb(const char *s, unsigned value, const char *bits); +void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); void status __P((const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, struct ifa_msghdr *ifam)); -void tunnel_status __P((int s)); -void usage __P((void)); -void ifmaybeload __P((char *name)); +void tunnel_status(int s); +void usage(void); +void ifmaybeload(char *name); #ifdef INET6 -void in6_fillscopeid __P((struct sockaddr_in6 *sin6)); -int prefix __P((void *, int)); -static char *sec2str __P((time_t)); +void in6_fillscopeid(struct sockaddr_in6 *sin6); +int prefix(void *, int); +static char *sec2str(time_t); int explicit_prefix = 0; #endif -typedef void c_func __P((const char *cmd, int arg, int s, const struct afswtch *afp)); -typedef void c_func2 __P((const char *arg, const char *arg2, int s, const struct afswtch *afp)); +typedef void c_func(const char *cmd, int arg, int s, const struct afswtch *afp); +typedef void c_func2(const char *arg, const char *arg2, int s, const struct afswtch *afp); c_func setatphase, setatrange; c_func setifaddr, setifbroadaddr, setifdstaddr, setifnetmask; c_func2 settunnel; @@ -174,7 +174,7 @@ c_func setifflags, setifmetric, setifmtu, setifcap; c_func clone_destroy; -void clone_create __P((void)); +void clone_create(void); #define NEXTARG 0xffffff @@ -184,8 +184,8 @@ const struct cmd { const char *c_name; int c_parameter; /* NEXTARG means next argv */ - void (*c_func) __P((const char *, int, int, const struct afswtch *afp)); - void (*c_func2) __P((const char *, const char *, int, const struct afswtch *afp)); + void (*c_func)(const char *, int, int, const struct afswtch *afp); + void (*c_func2)(const char *, const char *, int, const struct afswtch *afp); } cmds[] = { { "up", IFF_UP, setifflags } , { "down", -IFF_UP, setifflags }, @@ -286,9 +286,9 @@ struct cmd { * XNS support liberally adapted from code written at the University of * Maryland principally by James O'Toole and Chris Torek. */ -typedef void af_status __P((int, struct rt_addrinfo *)); -typedef void af_getaddr __P((const char *, int)); -typedef void af_getprefix __P((const char *, int)); +typedef void af_status(int, struct rt_addrinfo *); +typedef void af_getaddr(const char *, int); +typedef void af_getprefix(const char *, int); af_status in_status, at_status, link_status; af_getaddr in_getaddr, at_getaddr, link_getaddr; diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c index 0db9940468..ac7bcbc332 100644 --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -1,6 +1,6 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ /* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.6.2.3 2001/11/14 04:35:07 yar Exp $ */ -/* $DragonFly: src/sbin/ifconfig/ifmedia.c,v 1.3 2003/09/28 14:39:18 hmp Exp $ */ +/* $DragonFly: src/sbin/ifconfig/ifmedia.c,v 1.4 2003/11/01 17:15:59 drhodus Exp $ */ /* * Copyright (c) 1997 Jason R. Thorpe. @@ -90,15 +90,15 @@ #include "ifconfig.h" -static void domediaopt __P((const char *, int, int)); -static int get_media_subtype __P((int, const char *)); -static int get_media_options __P((int, const char *)); -static int lookup_media_word __P((struct ifmedia_description *, const char *)); -static void print_media_word __P((int, int)); -static void print_media_word_ifconfig __P((int)); +static void domediaopt(const char *, int, int); +static int get_media_subtype(int, const char *); +static int get_media_options(int, const char *); +static int lookup_media_word(struct ifmedia_description *, const char *); +static void print_media_word(int, int); +static void print_media_word_ifconfig(int); -static struct ifmedia_description *get_toptype_desc __P((int)); -static struct ifmedia_type_to_subtype *get_toptype_ttos __P((int)); +static struct ifmedia_description *get_toptype_desc(int); +static struct ifmedia_type_to_subtype *get_toptype_ttos(int); static struct ifmedia_description *get_subtype_desc __P((int, struct ifmedia_type_to_subtype *ttos)); diff --git a/sbin/init/init.c b/sbin/init/init.c index 3c51175d06..e1c4a46fed 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)init.c 8.1 (Berkeley) 7/15/93 * $FreeBSD: src/sbin/init/init.c,v 1.38.2.8 2001/10/22 11:27:32 des Exp $ - * $DragonFly: src/sbin/init/init.c,v 1.3 2003/09/28 14:39:18 hmp Exp $ + * $DragonFly: src/sbin/init/init.c,v 1.4 2003/11/01 17:15:59 drhodus Exp $ */ #include @@ -92,31 +92,31 @@ #define RESOURCE_WINDOW "default" #define RESOURCE_GETTY "default" -void handle __P((sig_t, ...)); -void delset __P((sigset_t *, ...)); +void handle(sig_t, ...); +void delset(sigset_t *, ...); -void stall __P((char *, ...)); -void warning __P((char *, ...)); -void emergency __P((char *, ...)); -void disaster __P((int)); -void badsys __P((int)); -int runshutdown __P((void)); +void stall(char *, ...); +void warning(char *, ...); +void emergency(char *, ...); +void disaster(int); +void badsys(int); +int runshutdown(void); /* * We really need a recursive typedef... * The following at least guarantees that the return type of (*state_t)() * is sufficiently wide to hold a function pointer. */ -typedef long (*state_func_t) __P((void)); -typedef state_func_t (*state_t) __P((void)); +typedef long (*state_func_t)(void); +typedef state_func_t (*state_t)(void); -state_func_t single_user __P((void)); -state_func_t runcom __P((void)); -state_func_t read_ttys __P((void)); -state_func_t multi_user __P((void)); -state_func_t clean_ttys __P((void)); -state_func_t catatonia __P((void)); -state_func_t death __P((void)); +state_func_t single_user(void); +state_func_t runcom(void); +state_func_t read_ttys(void); +state_func_t multi_user(void); +state_func_t clean_ttys(void); +state_func_t catatonia(void); +state_func_t death(void); enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; #define FALSE 0 @@ -125,10 +125,10 @@ enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; int Reboot = FALSE; int howto = RB_AUTOBOOT; -void transition __P((state_t)); +void transition(state_t); state_t requested_transition = runcom; -void setctty __P((char *)); +void setctty(char *); typedef struct init_session { int se_index; /* index of entry in ttys file */ @@ -150,30 +150,30 @@ typedef struct init_session { struct init_session *se_next; } session_t; -void free_session __P((session_t *)); -session_t *new_session __P((session_t *, int, struct ttyent *)); +void free_session(session_t *); +session_t *new_session(session_t *, int, struct ttyent *); session_t *sessions; -char **construct_argv __P((char *)); -void start_window_system __P((session_t *)); -void collect_child __P((pid_t)); -pid_t start_getty __P((session_t *)); -void transition_handler __P((int)); -void alrm_handler __P((int)); -void setsecuritylevel __P((int)); -int getsecuritylevel __P((void)); -int setupargv __P((session_t *, struct ttyent *)); +char **construct_argv(char *); +void start_window_system(session_t *); +void collect_child(pid_t); +pid_t start_getty(session_t *); +void transition_handler(int); +void alrm_handler(int); +void setsecuritylevel(int); +int getsecuritylevel(void); +int setupargv(session_t *, struct ttyent *); #ifdef LOGIN_CAP -void setprocresources __P((const char *)); +void setprocresources(const char *); #endif int clang; -void clear_session_logs __P((session_t *)); +void clear_session_logs(session_t *); -int start_session_db __P((void)); -void add_session __P((session_t *)); -void del_session __P((session_t *)); -session_t *find_session __P((pid_t)); +int start_session_db(void); +void add_session(session_t *); +void del_session(session_t *); +session_t *find_session(pid_t); DB *session_db; /* diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c index a66cd1bdda..b7930b9c66 100644 --- a/sbin/kget/kget.c +++ b/sbin/kget/kget.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/kget/kget.c,v 1.4.2.2 2001/08/01 08:19:51 obrien Exp $ - * $DragonFly: src/sbin/kget/kget.c,v 1.2 2003/06/17 04:27:33 dillon Exp $ + * $DragonFly: src/sbin/kget/kget.c,v 1.3 2003/11/01 17:15:59 drhodus Exp $ */ #include @@ -69,7 +69,7 @@ main(int argc, char *argv[]) perror("buffer sizing"); exit(-1); } - buf=(char *)malloc(len*sizeof(char)); + buf=malloc(len*sizeof(char)); if (buf==NULL) { perror("malloc"); exit(-1); diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 009adabea9..ebb452d46c 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/ldconfig/ldconfig.c,v 1.31.2.3 2001/07/11 23:59:10 obrien Exp $ - * $DragonFly: src/sbin/ldconfig/ldconfig.c,v 1.3 2003/09/28 14:39:18 hmp Exp $ + * $DragonFly: src/sbin/ldconfig/ldconfig.c,v 1.4 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -85,13 +85,13 @@ struct shlib_list { static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head; static char *dir_list; -static int buildhints __P((void)); -static int dodir __P((char *, int)); -int dofile __P((char *, int)); -static void enter __P((char *, char *, char *, int *, int)); -static void listhints __P((void)); -static int readhints __P((void)); -static void usage __P((void)); +static int buildhints(void); +static int dodir(char *, int); +int dofile(char *, int); +static void enter(char *, char *, char *, int *, int); +static void listhints(void); +static int readhints(void); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h index e6b4cbe2cf..32f239b184 100644 --- a/sbin/ldconfig/ldconfig.h +++ b/sbin/ldconfig/ldconfig.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/ldconfig/ldconfig.h,v 1.2.2.2 2001/03/04 07:28:48 kris Exp $ - * $DragonFly: src/sbin/ldconfig/ldconfig.h,v 1.2 2003/06/17 04:27:33 dillon Exp $ + * $DragonFly: src/sbin/ldconfig/ldconfig.h,v 1.3 2003/11/01 17:16:00 drhodus Exp $ */ #ifndef LDCONFIG_H @@ -35,8 +35,8 @@ extern int insecure; /* -i flag, needed here for elfhints.c */ __BEGIN_DECLS -void list_elf_hints __P((const char *)); -void update_elf_hints __P((const char *, int, char **, int)); +void list_elf_hints(const char *); +void update_elf_hints(const char *, int, char **, int); __END_DECLS #endif diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h index baa1f426a7..8b1f3768ae 100644 --- a/sbin/mount/extern.h +++ b/sbin/mount/extern.h @@ -24,12 +24,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/mount/extern.h,v 1.3 1999/08/28 00:13:24 peter Exp $ - * $DragonFly: src/sbin/mount/extern.h,v 1.2 2003/06/17 04:27:33 dillon Exp $ + * $DragonFly: src/sbin/mount/extern.h,v 1.3 2003/11/01 17:16:00 drhodus Exp $ */ /* vfslist.c */ -int checkvfsname __P((const char *, const char **)); -const char **makevfslist __P((char *)); +int checkvfsname(const char *, const char **); +const char **makevfslist(char *); /* mount_ufs.c */ -int mount_ufs __P((int, char *const *)); +int mount_ufs(int, char *const *); diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h index 1ad3326ec8..d0617ee973 100644 --- a/sbin/mount/mntopts.h +++ b/sbin/mount/mntopts.h @@ -32,7 +32,7 @@ * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 * $FreeBSD: src/sbin/mount/mntopts.h,v 1.16 1999/10/09 11:54:07 phk Exp $ - * $DragonFly: src/sbin/mount/mntopts.h,v 1.2 2003/06/17 04:27:33 dillon Exp $ + * $DragonFly: src/sbin/mount/mntopts.h,v 1.3 2003/11/01 17:16:00 drhodus Exp $ */ struct mntopt { @@ -88,7 +88,7 @@ struct mntopt { MOPT_NOCLUSTERR, \ MOPT_NOCLUSTERW -void getmntopts __P((const char *, const struct mntopt *, int *, int *)); -void rmslashes __P((char *, char *)); -void checkpath __P((const char *, char resolved_path[])); +void getmntopts(const char *, const struct mntopt *, int *, int *); +void rmslashes(char *, char *); +void checkpath(const char *, char resolved_path[]); extern int getmnt_silent; diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 4ca1665c03..c66ab5b012 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount.c 8.25 (Berkeley) 5/8/95 * $FreeBSD: src/sbin/mount/mount.c,v 1.39.2.3 2001/08/01 08:26:23 obrien Exp $ - * $DragonFly: src/sbin/mount/mount.c,v 1.3 2003/09/28 14:39:18 hmp Exp $ + * $DragonFly: src/sbin/mount/mount.c,v 1.4 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -61,21 +61,21 @@ int debug, fstab_style, verbose; -char *catopt __P((char *, const char *)); +char *catopt(char *, const char *); struct statfs - *getmntpt __P((const char *)); -int hasopt __P((const char *, const char *)); -int ismounted __P((struct fstab *, struct statfs *, int)); -int isremountable __P((const char *)); -void mangle __P((char *, int *, const char **)); -char *update_options __P((char *, char *, int)); + *getmntpt(const char *); +int hasopt(const char *, const char *); +int ismounted(struct fstab *, struct statfs *, int); +int isremountable(const char *); +void mangle(char *, int *, const char **); +char *update_options(char *, char *, int); int mountfs __P((const char *, const char *, const char *, int, const char *, const char *)); -void remopt __P((char *, const char *)); -void prmount __P((struct statfs *)); -void putfsent __P((const struct statfs *)); -void usage __P((void)); -char *flags2opts __P((int)); +void remopt(char *, const char *); +void prmount(struct statfs *); +void putfsent(const struct statfs *); +void usage(void); +char *flags2opts(int); /* Map from mount options to printable formats. */ static struct opt { diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c index 01301db924..750aed8160 100644 --- a/sbin/mount/mount_ufs.c +++ b/sbin/mount/mount_ufs.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_ufs.c 8.4 (Berkeley) 4/26/95 * $FreeBSD: src/sbin/mount/mount_ufs.c,v 1.16.2.3 2001/08/01 08:27:29 obrien Exp $ - * $DragonFly: src/sbin/mount/mount_ufs.c,v 1.4 2003/09/28 14:39:18 hmp Exp $ + * $DragonFly: src/sbin/mount/mount_ufs.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -50,7 +50,7 @@ #include "extern.h" #include "mntopts.h" -static void ufs_usage __P((void)); +static void ufs_usage(void); static struct mntopt mopts[] = { MOPT_STDOPTS, diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c index b9716a0d0a..e52d382096 100644 --- a/sbin/mount_ext2fs/mount_ext2fs.c +++ b/sbin/mount_ext2fs/mount_ext2fs.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_lfs.c 8.3 (Berkeley) 3/27/94 * $FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.11 1999/10/09 11:54:09 phk Exp $ - * $DragonFly: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.4 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -58,7 +58,7 @@ struct mntopt mopts[] = { { NULL } }; -static void usage __P((void)) __dead2; +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c index 2f05ee6efc..4cc4f9bfc3 100644 --- a/sbin/mount_hpfs/mount_hpfs.c +++ b/sbin/mount_hpfs/mount_hpfs.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.c,v 1.1 1999/12/09 19:09:15 semenu Exp $ - * $DragonFly: src/sbin/mount_hpfs/mount_hpfs.c,v 1.4 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_hpfs/mount_hpfs.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -54,11 +54,11 @@ static struct mntopt mopts[] = { { NULL } }; -static gid_t a_gid __P((char *)); -static uid_t a_uid __P((char *)); -static mode_t a_mask __P((char *)); -static void usage __P((void)) __dead2; -static void load_u2wtable __P((struct hpfs_args *, char *)); +static gid_t a_gid(char *); +static uid_t a_uid(char *); +static mode_t a_mask(char *); +static void usage(void) __dead2; +static void load_u2wtable(struct hpfs_args *, char *); int main(int argc, char **argv) diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 710c616c41..49f24bfa63 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/mount_msdos/mount_msdos.c,v 1.19.2.1 2000/07/20 10:35:13 kris Exp $ - * $DragonFly: src/sbin/mount_msdos/mount_msdos.c,v 1.4 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_msdos/mount_msdos.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -72,12 +72,12 @@ static struct mntopt mopts[] = { { NULL } }; -static gid_t a_gid __P((char *)); -static uid_t a_uid __P((char *)); -static mode_t a_mask __P((char *)); -static void usage __P((void)) __dead2; -static void load_u2wtable __P((struct msdosfs_args *, char *)); -static void load_ultable __P((struct msdosfs_args *, char *)); +static gid_t a_gid(char *); +static uid_t a_uid(char *); +static mode_t a_mask(char *); +static void usage(void) __dead2; +static void load_u2wtable(struct msdosfs_args *, char *); +static void load_ultable(struct msdosfs_args *, char *); int main(int argc, char **argv) diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index b68c6fe8aa..5cac2ff7aa 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_nfs.c 8.11 (Berkeley) 5/4/95 * $FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.36.2.6 2003/05/13 14:45:40 trhodes Exp $ - * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.5 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.6 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -185,11 +185,11 @@ enum tryret { TRYRET_LOCALERR /* Local failure. */ }; -int getnfsargs __P((char *, struct nfs_args *)); -void set_rpc_maxgrouplist __P((int)); -void usage __P((void)) __dead2; -int xdr_dir __P((XDR *, char *)); -int xdr_fh __P((XDR *, struct nfhret *)); +int getnfsargs(char *, struct nfs_args *); +void set_rpc_maxgrouplist(int); +void usage(void) __dead2; +int xdr_dir(XDR *, char *); +int xdr_fh(XDR *, struct nfhret *); enum tryret nfs_tryproto(struct nfs_args *nfsargsp, struct sockaddr_in *sin, char *hostp, char *spec, char **errstr); enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr); diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c index 45d8d94bd2..3359bff8e2 100644 --- a/sbin/mount_ntfs/mount_ntfs.c +++ b/sbin/mount_ntfs/mount_ntfs.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.c,v 1.3.2.2 2001/10/12 22:08:43 semenu Exp $ - * $DragonFly: src/sbin/mount_ntfs/mount_ntfs.c,v 1.4 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_ntfs/mount_ntfs.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ * */ @@ -57,12 +57,12 @@ static struct mntopt mopts[] = { { NULL } }; -static gid_t a_gid __P((char *)); -static uid_t a_uid __P((char *)); -static mode_t a_mask __P((char *)); -static void usage __P((void)) __dead2; +static gid_t a_gid(char *); +static uid_t a_uid(char *); +static mode_t a_mask(char *); +static void usage(void) __dead2; -static void load_u2wtable __P((struct ntfs_args *, char *)); +static void load_u2wtable(struct ntfs_args *, char *); int main(int argc, char **argv) diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c index 11ce4948b6..b8850956b6 100644 --- a/sbin/mount_null/mount_null.c +++ b/sbin/mount_null/mount_null.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_null.c 8.6 (Berkeley) 4/26/95 * $FreeBSD: src/sbin/mount_null/mount_null.c,v 1.13 1999/10/09 11:54:11 phk Exp $ - * $DragonFly: src/sbin/mount_null/mount_null.c,v 1.4 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_null/mount_null.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -57,8 +57,8 @@ struct mntopt mopts[] = { { NULL } }; -int subdir __P((const char *, const char *)); -static void usage __P((void)) __dead2; +int subdir(const char *, const char *); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c index 689aac6c13..f234ba6240 100644 --- a/sbin/mount_portal/mount_portal.c +++ b/sbin/mount_portal/mount_portal.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_portal.c 8.6 (Berkeley) 4/26/95 * $FreeBSD: src/sbin/mount_portal/mount_portal.c,v 1.16 1999/10/09 11:54:11 phk Exp $ - * $DragonFly: src/sbin/mount_portal/mount_portal.c,v 1.3 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_portal/mount_portal.c,v 1.4 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -64,7 +64,7 @@ struct mntopt mopts[] = { { NULL } }; -static void usage __P((void)) __dead2; +static void usage(void) __dead2; static sig_atomic_t readcf; /* Set when SIGHUP received */ diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h index 0bfb576023..e3b7056b03 100644 --- a/sbin/mount_portal/portald.h +++ b/sbin/mount_portal/portald.h @@ -37,7 +37,7 @@ * @(#)portald.h 8.1 (Berkeley) 6/5/93 * * $FreeBSD: src/sbin/mount_portal/portald.h,v 1.5 1999/08/28 00:13:37 peter Exp $ - * $DragonFly: src/sbin/mount_portal/portald.h,v 1.3 2003/08/08 04:18:40 dillon Exp $ + * $DragonFly: src/sbin/mount_portal/portald.h,v 1.4 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -80,6 +80,6 @@ extern int portal_tcplisten __P((struct portal_cred *, /* * Global functions */ -extern void activate __P((qelem *q, int so)); -extern char **conf_match __P((qelem *q, char *key)); -extern void conf_read __P((qelem *q, char *conf)); +extern void activate(qelem *q, int so); +extern char **conf_match(qelem *q, char *key); +extern void conf_read(qelem *q, char *conf); diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c index 98b63f53b2..fd84e89263 100644 --- a/sbin/mount_std/mount_std.c +++ b/sbin/mount_std/mount_std.c @@ -36,7 +36,7 @@ * * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * $FreeBSD: src/sbin/mount_std/mount_std.c,v 1.10.2.1 2001/07/30 10:30:07 dd Exp $ - * $DragonFly: src/sbin/mount_std/mount_std.c,v 1.3 2003/09/28 14:39:19 hmp Exp $ + * $DragonFly: src/sbin/mount_std/mount_std.c,v 1.4 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -56,7 +56,7 @@ static struct mntopt mopts[] = { { NULL } }; -static void usage __P((void)) __dead2; +static void usage(void) __dead2; static const char *fsname; int diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c index c62f40599e..3accededc1 100644 --- a/sbin/mount_umap/mount_umap.c +++ b/sbin/mount_umap/mount_umap.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_umap.c 8.5 (Berkeley) 4/26/95 * $FreeBSD: src/sbin/mount_umap/mount_umap.c,v 1.15 1999/10/09 11:54:13 phk Exp $ - * $DragonFly: src/sbin/mount_umap/Attic/mount_umap.c,v 1.4 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/mount_umap/Attic/mount_umap.c,v 1.5 2003/11/01 17:16:00 drhodus Exp $ */ #include @@ -76,7 +76,7 @@ static struct mntopt mopts[] = { { NULL } }; -static void usage __P((void)) __dead2; +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c index 8ce5eab8ed..4793352fc3 100644 --- a/sbin/mount_union/mount_union.c +++ b/sbin/mount_union/mount_union.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)mount_union.c 8.5 (Berkeley) 3/27/94 * $FreeBSD: src/sbin/mount_union/mount_union.c,v 1.12 1999/10/09 11:54:14 phk Exp $ - * $DragonFly: src/sbin/mount_union/mount_union.c,v 1.4 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/mount_union/mount_union.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -58,8 +58,8 @@ static struct mntopt mopts[] = { { NULL } }; -static int subdir __P((const char *, const char *)); -static void usage __P((void)) __dead2; +static int subdir(const char *, const char *); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 87b6eb86e7..9ad6621ef6 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)mountd.c 8.15 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/mountd/mountd.c,v 1.39.2.5 2002/09/13 15:57:43 joerg Exp $ - * $DragonFly: src/sbin/mountd/mountd.c,v 1.4 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/mountd/mountd.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -142,47 +142,47 @@ struct fhreturn { }; /* Global defs */ -char *add_expdir __P((struct dirlist **, char *, int)); +char *add_expdir(struct dirlist **, char *, int); void add_dlist __P((struct dirlist **, struct dirlist *, struct grouplist *, int)); -void add_mlist __P((char *, char *)); -int check_dirpath __P((char *)); -int check_options __P((struct dirlist *)); -int chk_host __P((struct dirlist *, u_int32_t, int *, int *)); -void del_mlist __P((char *, char *)); -struct dirlist *dirp_search __P((struct dirlist *, char *)); +void add_mlist(char *, char *); +int check_dirpath(char *); +int check_options(struct dirlist *); +int chk_host(struct dirlist *, u_int32_t, int *, int *); +void del_mlist(char *, char *); +struct dirlist *dirp_search(struct dirlist *, char *); int do_mount __P((struct exportlist *, struct grouplist *, int, struct ucred *, char *, int, struct statfs *)); int do_opt __P((char **, char **, struct exportlist *, struct grouplist *, int *, int *, struct ucred *)); -struct exportlist *ex_search __P((fsid_t *)); -struct exportlist *get_exp __P((void)); -void free_dir __P((struct dirlist *)); -void free_exp __P((struct exportlist *)); -void free_grp __P((struct grouplist *)); -void free_host __P((struct hostlist *)); -void get_exportlist __P((void)); -int get_host __P((char *, struct grouplist *, struct grouplist *)); -int get_num __P((char *)); -struct hostlist *get_ht __P((void)); -int get_line __P((void)); -void get_mountlist __P((void)); -int get_net __P((char *, struct netmsk *, int)); -void getexp_err __P((struct exportlist *, struct grouplist *)); -struct grouplist *get_grp __P((void)); +struct exportlist *ex_search(fsid_t *); +struct exportlist *get_exp(void); +void free_dir(struct dirlist *); +void free_exp(struct exportlist *); +void free_grp(struct grouplist *); +void free_host(struct hostlist *); +void get_exportlist(void); +int get_host(char *, struct grouplist *, struct grouplist *); +int get_num(char *); +struct hostlist *get_ht(void); +int get_line(void); +void get_mountlist(void); +int get_net(char *, struct netmsk *, int); +void getexp_err(struct exportlist *, struct grouplist *); +struct grouplist *get_grp(void); void hang_dirp __P((struct dirlist *, struct grouplist *, struct exportlist *, int)); -void mntsrv __P((struct svc_req *, SVCXPRT *)); -void nextfield __P((char **, char **)); -void out_of_mem __P((void)); -void parsecred __P((char *, struct ucred *)); -int put_exlist __P((struct dirlist *, XDR *, struct dirlist *, int *)); -int scan_tree __P((struct dirlist *, u_int32_t)); -static void usage __P((void)); -int xdr_dir __P((XDR *, char *)); -int xdr_explist __P((XDR *, caddr_t)); -int xdr_fhs __P((XDR *, caddr_t)); -int xdr_mlist __P((XDR *, caddr_t)); +void mntsrv(struct svc_req *, SVCXPRT *); +void nextfield(char **, char **); +void out_of_mem(void); +void parsecred(char *, struct ucred *); +int put_exlist(struct dirlist *, XDR *, struct dirlist *, int *); +int scan_tree(struct dirlist *, u_int32_t); +static void usage(void); +int xdr_dir(XDR *, char *); +int xdr_explist(XDR *, caddr_t); +int xdr_fhs(XDR *, caddr_t); +int xdr_mlist(XDR *, caddr_t); struct exportlist *exphead; struct mountlist *mlhead; @@ -211,7 +211,7 @@ int opt_flags; #ifdef DEBUG int debug = 1; -void SYSLOG __P((int, const char *, ...)); +void SYSLOG(int, const char *, ...); #define syslog SYSLOG #else int debug = 0; @@ -285,7 +285,7 @@ main(int argc, char **argv) signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN); } - signal(SIGHUP, (void (*) __P((int))) get_exportlist); + signal(SIGHUP, (void (*)(int)) get_exportlist); { FILE *pidfile = fopen(_PATH_MOUNTDPID, "w"); if (pidfile != NULL) { fprintf(pidfile, "%d\n", getpid()); diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 3fb0355a3a..ed583d9f62 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -32,7 +32,7 @@ * * @(#)mkfs.c 8.11 (Berkeley) 5/3/95 * $FreeBSD: src/sbin/newfs/mkfs.c,v 1.29.2.6 2001/09/21 19:15:21 dillon Exp $ - * $DragonFly: src/sbin/newfs/mkfs.c,v 1.4 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/newfs/mkfs.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -57,13 +57,13 @@ #ifndef STANDALONE #include #else -extern int atoi __P((char *)); -extern char * getenv __P((char *)); +extern int atoi(char *); +extern char * getenv(char *); #endif #ifdef FSIRAND -extern long random __P((void)); -extern void srandomdev __P((void)); +extern long random(void); +extern void srandomdev(void); #endif /* @@ -143,25 +143,25 @@ int randinit; daddr_t alloc(); long calcipg(); static int charsperline(); -void clrblock __P((struct fs *, unsigned char *, int)); -void fsinit __P((time_t)); -void initcg __P((int, time_t)); -int isblock __P((struct fs *, unsigned char *, int)); -void iput __P((struct dinode *, ino_t)); -int makedir __P((struct direct *, int)); -void rdfs __P((daddr_t, int, char *)); -void setblock __P((struct fs *, unsigned char *, int)); -void wtfs __P((daddr_t, int, char *)); -void wtfsflush __P((void)); +void clrblock(struct fs *, unsigned char *, int); +void fsinit(time_t); +void initcg(int, time_t); +int isblock(struct fs *, unsigned char *, int); +void iput(struct dinode *, ino_t); +int makedir(struct direct *, int); +void rdfs(daddr_t, int, char *); +void setblock(struct fs *, unsigned char *, int); +void wtfs(daddr_t, int, char *); +void wtfsflush(void); #ifndef STANDALONE -void get_memleft __P((void)); -void raise_data_limit __P((void)); +void get_memleft(void); +void raise_data_limit(void); #else -void free __P((char *)); -char * calloc __P((u_long, u_long)); -caddr_t malloc __P((u_long)); -caddr_t realloc __P((char *, u_long)); +void free(char *); +char * calloc(u_long, u_long); +caddr_t malloc(u_long); +caddr_t realloc(char *, u_long); #endif int mfs_ppid = 0; diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 2a9930997e..562b87ab20 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)newfs.c 8.13 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/newfs/newfs.c,v 1.30.2.9 2003/05/13 12:03:55 joerg Exp $ - * $DragonFly: src/sbin/newfs/newfs.c,v 1.4 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/newfs/newfs.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ /* @@ -200,8 +200,8 @@ int unlabeled; char device[MAXPATHLEN]; char *progname; -extern void mkfs __P((struct partition *, char *, int, int)); -static void usage __P((void)); +extern void mkfs(struct partition *, char *, int, int); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c index 6d91fa5fe3..cc915cbe77 100644 --- a/sbin/nfsd/nfsd.c +++ b/sbin/nfsd/nfsd.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1989, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)nfsd.c 8.9 (Berkeley) 3/29/95 * $FreeBSD: src/sbin/nfsd/nfsd.c,v 1.15.2.1 2000/09/16 22:52:23 brian Exp $ - * $DragonFly: src/sbin/nfsd/nfsd.c,v 1.4 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/nfsd/nfsd.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -89,15 +89,15 @@ struct timeval ktv; NFSKERBKEYSCHED_T kerb_keysched; #endif -void nonfs __P((int)); -void reapchild __P((int)); -void setbindhost __P((struct sockaddr_in *ia, const char *bindhost)); +void nonfs(int); +void reapchild(int); +void setbindhost(struct sockaddr_in *ia, const char *bindhost); #ifdef OLD_SETPROCTITLE #ifdef __FreeBSD__ -void setproctitle __P((char *)); +void setproctitle(char *); #endif #endif -void usage __P((void)); +void usage(void); /* * Nfs server daemon mostly just a user context for nfssvc() diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c index 1395de5b43..43ca5f76b4 100644 --- a/sbin/nfsiod/nfsiod.c +++ b/sbin/nfsiod/nfsiod.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)nfsiod.c 8.4 (Berkeley) 5/3/95 * $FreeBSD: src/sbin/nfsiod/nfsiod.c,v 1.9 1999/08/28 00:13:55 peter Exp $ - * $DragonFly: src/sbin/nfsiod/nfsiod.c,v 1.3 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/nfsiod/nfsiod.c,v 1.4 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -60,9 +60,9 @@ int debug = 1; int debug = 0; #endif -void nonfs __P((int)); -void reapchild __P((int)); -void usage __P((void)); +void nonfs(int); +void reapchild(int); +void usage(void); /* * Nfsiod does asynchronous buffered I/O on behalf of the NFS client. diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c index fb653ccc54..1e6f508994 100644 --- a/sbin/nos-tun/nos-tun.c +++ b/sbin/nos-tun/nos-tun.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sbin/nos-tun/nos-tun.c,v 1.6.2.2 2001/08/01 23:14:00 obrien Exp $ - * $DragonFly: src/sbin/nos-tun/nos-tun.c,v 1.3 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/nos-tun/nos-tun.c,v 1.4 2003/11/01 17:16:01 drhodus Exp $ */ /* @@ -81,7 +81,7 @@ static struct ifreq ifrq; int net; /* socket descriptor */ int tun; /* tunnel descriptor */ -static void usage __P((void)); +static void usage(void); int Set_address(char *addr, struct sockaddr_in *sin) { diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 91eb11de4e..967d5e083e 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -31,7 +31,7 @@ * @(#) Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved. * @(#)ping.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/ping6/ping6.c,v 1.4.2.10 2002/12/09 03:04:44 suz Exp $ - * $DragonFly: src/sbin/ping6/ping6.c,v 1.3 2003/09/28 14:39:20 hmp Exp $ + * $DragonFly: src/sbin/ping6/ping6.c,v 1.4 2003/11/01 17:16:01 drhodus Exp $ */ /* BSDI ping.c,v 2.3 1996/01/21 17:56:50 jch Exp */ @@ -243,37 +243,37 @@ volatile sig_atomic_t seenint; volatile sig_atomic_t seeninfo; #endif -int main __P((int, char *[])); -void fill __P((char *, char *)); -int get_hoplim __P((struct msghdr *)); -int get_pathmtu __P((struct msghdr *)); -void set_pathmtu __P((int)); -struct in6_pktinfo *get_rcvpktinfo __P((struct msghdr *)); -void onsignal __P((int)); -void retransmit __P((void)); -void onint __P((int)); -size_t pingerlen __P((void)); -int pinger __P((void)); -const char *pr_addr __P((struct sockaddr *, int)); -void pr_icmph __P((struct icmp6_hdr *, u_char *)); -void pr_iph __P((struct ip6_hdr *)); -void pr_suptypes __P((struct icmp6_nodeinfo *, size_t)); -void pr_nodeaddr __P((struct icmp6_nodeinfo *, int)); -int myechoreply __P((const struct icmp6_hdr *)); -int mynireply __P((const struct icmp6_nodeinfo *)); +int main(int, char *[]); +void fill(char *, char *); +int get_hoplim(struct msghdr *); +int get_pathmtu(struct msghdr *); +void set_pathmtu(int); +struct in6_pktinfo *get_rcvpktinfo(struct msghdr *); +void onsignal(int); +void retransmit(void); +void onint(int); +size_t pingerlen(void); +int pinger(void); +const char *pr_addr(struct sockaddr *, int); +void pr_icmph(struct icmp6_hdr *, u_char *); +void pr_iph(struct ip6_hdr *); +void pr_suptypes(struct icmp6_nodeinfo *, size_t); +void pr_nodeaddr(struct icmp6_nodeinfo *, int); +int myechoreply(const struct icmp6_hdr *); +int mynireply(const struct icmp6_nodeinfo *); char *dnsdecode __P((const u_char **, const u_char *, const u_char *, u_char *, size_t)); -void pr_pack __P((u_char *, int, struct msghdr *)); -void pr_exthdrs __P((struct msghdr *)); -void pr_ip6opt __P((void *)); -void pr_rthdr __P((void *)); -int pr_bitrange __P((u_int32_t, int, int)); -void pr_retip __P((struct ip6_hdr *, u_char *)); -void summary __P((void)); -void tvsub __P((struct timeval *, struct timeval *)); -int setpolicy __P((int, char *)); -char *nigroup __P((char *)); -void usage __P((void)); +void pr_pack(u_char *, int, struct msghdr *); +void pr_exthdrs(struct msghdr *); +void pr_ip6opt(void *); +void pr_rthdr(void *); +int pr_bitrange(u_int32_t, int, int); +void pr_retip(struct ip6_hdr *, u_char *); +void summary(void); +void tvsub(struct timeval *, struct timeval *); +int setpolicy(int, char *); +char *nigroup(char *); +void usage(void); int main(int argc, char **argv) diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index a997128e0e..4b0dec4b01 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)quotacheck.c 8.3 (Berkeley) 1/29/94 * $FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.11 1999/08/28 00:14:01 peter Exp $ - * $DragonFly: src/sbin/quotacheck/quotacheck.c,v 1.4 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/quotacheck/quotacheck.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ /* @@ -99,24 +99,24 @@ int fi; /* open disk file descriptor */ u_long highid[MAXQUOTAS]; /* highest addid()'ed identifier per type */ struct fileusage * - addid __P((u_long, int, char *)); -char *blockcheck __P((char *)); -void bread __P((daddr_t, char *, long)); -extern int checkfstab __P((int, int, int (*)(struct fstab *), - int (*)(char *, char *, long, int))); -int chkquota __P((char *, char *, struct quotaname *)); -void freeinodebuf __P((void)); + addid(u_long, int, char *); +char *blockcheck(char *); +void bread(daddr_t, char *, long); +extern int checkfstab(int, int, int (*)(struct fstab *), + int (*)(char *, char *, long, int)); +int chkquota(char *, char *, struct quotaname *); +void freeinodebuf(void); struct dinode * - getnextinode __P((ino_t)); -int getquotagid __P((void)); -int hasquota __P((struct fstab *, int, char **)); + getnextinode(ino_t); +int getquotagid(void); +int hasquota(struct fstab *, int, char **); struct fileusage * - lookup __P((u_long, int)); -void *needchk __P((struct fstab *)); -int oneof __P((char *, char*[], int)); -void resetinodebuf __P((void)); -int update __P((char *, char *, int)); -void usage __P((void)); + lookup(u_long, int); +void *needchk(struct fstab *); +int oneof(char *, char*[], int); +void resetinodebuf(void); +int update(char *, char *, int); +void usage(void); int main(int argc, char **argv) diff --git a/sbin/rcorder/ealloc.c b/sbin/rcorder/ealloc.c index 1b881865d9..649a961d93 100644 --- a/sbin/rcorder/ealloc.c +++ b/sbin/rcorder/ealloc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * $NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ - * $DragonFly: src/sbin/rcorder/ealloc.c,v 1.2 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/rcorder/ealloc.c,v 1.3 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -51,7 +51,7 @@ __RCSID("$NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $"); #include "ealloc.h" -static void enomem __P((void)); +static void enomem(void); /* * enomem -- diff --git a/sbin/rcorder/ealloc.h b/sbin/rcorder/ealloc.h index d7e5709d2b..39a98b6b83 100644 --- a/sbin/rcorder/ealloc.h +++ b/sbin/rcorder/ealloc.h @@ -1,9 +1,9 @@ /* * $NetBSD: ealloc.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ - * $DragonFly: src/sbin/rcorder/ealloc.h,v 1.1 2003/07/24 06:35:38 dillon Exp $ + * $DragonFly: src/sbin/rcorder/ealloc.h,v 1.2 2003/11/01 17:16:01 drhodus Exp $ */ -void *emalloc __P((size_t len)); -char *estrdup __P((const char *str)); -void *erealloc __P((void *ptr, size_t size)); -void *ecalloc __P((size_t nmemb, size_t size)); +void *emalloc(size_t len); +char *estrdup(const char *str); +void *erealloc(void *ptr, size_t size); +void *ecalloc(size_t nmemb, size_t size); diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c index c4620a3b47..6337c54554 100644 --- a/sbin/rcorder/hash.c +++ b/sbin/rcorder/hash.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * $NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ - * $DragonFly: src/sbin/rcorder/hash.c,v 1.2 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/rcorder/hash.c,v 1.3 2003/11/01 17:16:01 drhodus Exp $ */ #ifdef MAKE_BOOTSTRAP @@ -77,7 +77,7 @@ __RCSID("$NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $"); * defined: */ -static void RebuildTable __P((Hash_Table *)); +static void RebuildTable(Hash_Table *); /* * The following defines the ratio of # entries to # buckets diff --git a/sbin/rcorder/hash.h b/sbin/rcorder/hash.h index 2903a3353f..4d8fff8ef1 100644 --- a/sbin/rcorder/hash.h +++ b/sbin/rcorder/hash.h @@ -37,7 +37,7 @@ * * from: @(#)hash.h 8.1 (Berkeley) 6/6/93 * $NetBSD: hash.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ - * $DragonFly: src/sbin/rcorder/hash.h,v 1.1 2003/07/24 06:35:38 dillon Exp $ + * $DragonFly: src/sbin/rcorder/hash.h,v 1.2 2003/11/01 17:16:01 drhodus Exp $ */ /* hash.h -- @@ -119,12 +119,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/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c index a46f6f0bb7..109203b75d 100644 --- a/sbin/rcorder/rcorder.c +++ b/sbin/rcorder/rcorder.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: rcorder.c,v 1.7 2000/08/04 07:33:55 enami Exp $ - * $DragonFly: src/sbin/rcorder/rcorder.c,v 1.2 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/rcorder/rcorder.c,v 1.3 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -127,27 +127,27 @@ strnodelist *bl_list; strnodelist *keep_list; strnodelist *skip_list; -void do_file __P((filenode *fnode)); -void strnode_add __P((strnodelist **, char *, filenode *)); -int skip_ok __P((filenode *fnode)); -int keep_ok __P((filenode *fnode)); -void satisfy_req __P((f_reqnode *rnode, char *filename)); -void crunch_file __P((char *)); -void parse_require __P((filenode *, char *)); -void parse_provide __P((filenode *, char *)); -void parse_before __P((filenode *, char *)); -void parse_keywords __P((filenode *, char *)); -filenode *filenode_new __P((char *)); -void add_require __P((filenode *, char *)); -void add_provide __P((filenode *, char *)); -void add_before __P((filenode *, char *)); -void add_keyword __P((filenode *, char *)); -void insert_before __P((void)); -Hash_Entry *make_fake_provision __P((filenode *)); -void crunch_all_files __P((void)); -void initialize __P((void)); -void generate_ordering __P((void)); -int main __P((int, char *[])); +void do_file(filenode *fnode); +void strnode_add(strnodelist **, char *, filenode *); +int skip_ok(filenode *fnode); +int keep_ok(filenode *fnode); +void satisfy_req(f_reqnode *rnode, char *filename); +void crunch_file(char *); +void parse_require(filenode *, char *); +void parse_provide(filenode *, char *); +void parse_before(filenode *, char *); +void parse_keywords(filenode *, char *); +filenode *filenode_new(char *); +void add_require(filenode *, char *); +void add_provide(filenode *, char *); +void add_before(filenode *, char *); +void add_keyword(filenode *, char *); +void insert_before(void); +Hash_Entry *make_fake_provision(filenode *); +void crunch_all_files(void); +void initialize(void); +void generate_ordering(void); +int main(int, char *[]); int main(int argc, char **argv) diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index a6f47aaf29..58097cac42 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -37,7 +37,7 @@ * * @(#)dirs.c 8.7 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/restore/dirs.c,v 1.14.2.5 2001/10/15 13:44:45 dd Exp $ - * $DragonFly: src/sbin/restore/dirs.c,v 1.4 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/restore/dirs.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -116,16 +116,16 @@ struct odirect { char d_name[ODIRSIZ]; }; -static struct inotab *allocinotab __P((ino_t, struct dinode *, long)); -static void dcvt __P((struct odirect *, struct direct *)); -static void flushent __P((void)); -static struct inotab *inotablookup __P((ino_t)); -static RST_DIR *opendirfile __P((const char *)); -static void putdir __P((char *, long)); -static void putent __P((struct direct *)); -static void rst_seekdir __P((RST_DIR *, long, long)); -static long rst_telldir __P((RST_DIR *)); -static struct direct *searchdir __P((ino_t, char *)); +static struct inotab *allocinotab(ino_t, struct dinode *, long); +static void dcvt(struct odirect *, struct direct *); +static void flushent(void); +static struct inotab *inotablookup(ino_t); +static RST_DIR *opendirfile(const char *); +static void putdir(char *, long); +static void putent(struct direct *); +static void rst_seekdir(RST_DIR *, long, long); +static long rst_telldir(RST_DIR *); +static struct direct *searchdir(ino_t, char *); /* * Extract directory contents, building up a directory structure diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h index 3e95b62365..1c8ccf263f 100644 --- a/sbin/restore/extern.h +++ b/sbin/restore/extern.h @@ -32,81 +32,81 @@ * * @(#)extern.h 8.2 (Berkeley) 1/7/94 * $FreeBSD: src/sbin/restore/extern.h,v 1.5 1999/08/28 00:14:05 peter Exp $ - * $DragonFly: src/sbin/restore/extern.h,v 1.2 2003/06/17 04:27:34 dillon Exp $ + * $DragonFly: src/sbin/restore/extern.h,v 1.3 2003/11/01 17:16:01 drhodus Exp $ */ -struct entry *addentry __P((char *, ino_t, int)); -long addfile __P((char *, ino_t, int)); -int addwhiteout __P((char *)); -void badentry __P((struct entry *, char *)); -void canon __P((char *, char *, int)); -void checkrestore __P((void)); -void closemt __P((void)); -void createfiles __P((void)); -void createleaves __P((char *)); -void createlinks __P((void)); -long deletefile __P((char *, ino_t, int)); -void deleteino __P((ino_t)); -void delwhiteout __P((struct entry *)); -ino_t dirlookup __P((const char *)); -void done __P((int)) __dead2; -void dumpsymtable __P((char *, long)); -void extractdirs __P((int)); -int extractfile __P((char *)); -void findunreflinks __P((void)); -char *flagvalues __P((struct entry *)); -void freeentry __P((struct entry *)); -void freename __P((char *)); -int genliteraldir __P((char *, ino_t)); -char *gentempname __P((struct entry *)); -void getfile __P((void (*)(char *, long), void (*)(char *, long))); -void getvol __P((long)); -void initsymtable __P((char *)); -int inodetype __P((ino_t)); -int linkit __P((char *, char *, int)); -struct entry *lookupino __P((ino_t)); -struct entry *lookupname __P((char *)); -long listfile __P((char *, ino_t, int)); -ino_t lowerbnd __P((ino_t)); -void mktempname __P((struct entry *)); -void moveentry __P((struct entry *, char *)); -void msg __P((const char *, ...)); -char *myname __P((struct entry *)); -void newnode __P((struct entry *)); -void newtapebuf __P((long)); -long nodeupdates __P((char *, ino_t, int)); -void onintr __P((int)); -void panic __P((const char *, ...)); -void pathcheck __P((char *)); -struct direct *pathsearch __P((const char *)); -void printdumpinfo __P((void)); -void removeleaf __P((struct entry *)); -void removenode __P((struct entry *)); -void removeoldleaves __P((void)); -void removeoldnodes __P((void)); -void renameit __P((char *, char *)); -int reply __P((char *)); -RST_DIR *rst_opendir __P((const char *)); -struct direct *rst_readdir __P((RST_DIR *)); -void rst_closedir __P((RST_DIR *dirp)); -void runcmdshell __P((void)); -char *savename __P((char *)); -void setdirmodes __P((int)); -void setinput __P((char *)); -void setup __P((void)); -void skipdirs __P((void)); -void skipfile __P((void)); -void skipmaps __P((void)); -void swabst __P((u_char *, u_char *)); -void treescan __P((char *, ino_t, long (*)(char *, ino_t, int))); -ino_t upperbnd __P((ino_t)); -long verifyfile __P((char *, ino_t, int)); -void xtrnull __P((char *, long)); +struct entry *addentry(char *, ino_t, int); +long addfile(char *, ino_t, int); +int addwhiteout(char *); +void badentry(struct entry *, char *); +void canon(char *, char *, int); +void checkrestore(void); +void closemt(void); +void createfiles(void); +void createleaves(char *); +void createlinks(void); +long deletefile(char *, ino_t, int); +void deleteino(ino_t); +void delwhiteout(struct entry *); +ino_t dirlookup(const char *); +void done(int) __dead2; +void dumpsymtable(char *, long); +void extractdirs(int); +int extractfile(char *); +void findunreflinks(void); +char *flagvalues(struct entry *); +void freeentry(struct entry *); +void freename(char *); +int genliteraldir(char *, ino_t); +char *gentempname(struct entry *); +void getfile(void (*)(char *, long), void (*)(char *, long)); +void getvol(long); +void initsymtable(char *); +int inodetype(ino_t); +int linkit(char *, char *, int); +struct entry *lookupino(ino_t); +struct entry *lookupname(char *); +long listfile(char *, ino_t, int); +ino_t lowerbnd(ino_t); +void mktempname(struct entry *); +void moveentry(struct entry *, char *); +void msg(const char *, ...); +char *myname(struct entry *); +void newnode(struct entry *); +void newtapebuf(long); +long nodeupdates(char *, ino_t, int); +void onintr(int); +void panic(const char *, ...); +void pathcheck(char *); +struct direct *pathsearch(const char *); +void printdumpinfo(void); +void removeleaf(struct entry *); +void removenode(struct entry *); +void removeoldleaves(void); +void removeoldnodes(void); +void renameit(char *, char *); +int reply(char *); +RST_DIR *rst_opendir(const char *); +struct direct *rst_readdir(RST_DIR *); +void rst_closedir(RST_DIR *dirp); +void runcmdshell(void); +char *savename(char *); +void setdirmodes(int); +void setinput(char *); +void setup(void); +void skipdirs(void); +void skipfile(void); +void skipmaps(void); +void swabst(u_char *, u_char *); +void treescan(char *, ino_t, long (*)(char *, ino_t, int)); +ino_t upperbnd(ino_t); +long verifyfile(char *, ino_t, int); +void xtrnull(char *, long); /* From ../dump/dumprmt.c */ -void rmtclose __P((void)); -int rmthost __P((char *)); -int rmtioctl __P((int, int)); -int rmtopen __P((char *, int)); -int rmtread __P((char *, int)); -int rmtseek __P((int, int)); +void rmtclose(void); +int rmthost(char *); +int rmtioctl(int, int); +int rmtopen(char *, int); +int rmtread(char *, int); +int rmtseek(int, int); diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c index c03c75b2c4..70c7f406d9 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -32,7 +32,7 @@ * * @(#)interactive.c 8.5 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/restore/interactive.c,v 1.8.2.1 2001/01/03 14:36:08 iedowse Exp $ - * $DragonFly: src/sbin/restore/interactive.c,v 1.4 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/restore/interactive.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -77,14 +77,14 @@ struct arglist { char *cmd; /* the current command */ }; -static char *copynext __P((char *, char *)); -static int fcmp __P((const void *, const void *)); -static void formatf __P((struct afile *, int)); -static void getcmd __P((char *, char *, char *, int, struct arglist *)); -struct dirent *glob_readdir __P((RST_DIR *dirp)); -static int glob_stat __P((const char *, struct stat *)); -static void mkentry __P((char *, struct direct *, struct afile *)); -static void printlist __P((char *, char *)); +static char *copynext(char *, char *); +static int fcmp(const void *, const void *); +static void formatf(struct afile *, int); +static void getcmd(char *, char *, char *, int, struct arglist *); +struct dirent *glob_readdir(RST_DIR *dirp); +static int glob_stat(const char *, struct stat *); +static void mkentry(char *, struct direct *, struct afile *); +static void printlist(char *, char *); /* * Read and execute commands from the terminal. diff --git a/sbin/restore/main.c b/sbin/restore/main.c index 784f8f65db..9e9e9ad597 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/4/95 * $FreeBSD: src/sbin/restore/main.c,v 1.10.2.3 2001/10/02 08:30:17 cjc Exp $ - * $DragonFly: src/sbin/restore/main.c,v 1.4 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/restore/main.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -67,8 +67,8 @@ time_t dumptime; time_t dumpdate; FILE *terminal; -static void obsolete __P((int *, char **[])); -static void usage __P((void)); +static void obsolete(int *, char **[]); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c index 619a5dd1b7..bdcd971aad 100644 --- a/sbin/restore/restore.c +++ b/sbin/restore/restore.c @@ -32,7 +32,7 @@ * * @(#)restore.c 8.3 (Berkeley) 9/13/94 * $FreeBSD: src/sbin/restore/restore.c,v 1.7.2.1 2002/03/01 21:32:28 iedowse Exp $ - * $DragonFly: src/sbin/restore/restore.c,v 1.4 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/restore/restore.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -45,7 +45,7 @@ #include "restore.h" #include "extern.h" -static char *keyval __P((int)); +static char *keyval(int); /* * This implements the 't' option. diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c index c9713ad53e..b5696f0b2c 100644 --- a/sbin/restore/symtab.c +++ b/sbin/restore/symtab.c @@ -32,7 +32,7 @@ * * @(#)symtab.c 8.3 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/restore/symtab.c,v 1.7.2.1 2001/12/19 14:54:14 tobez Exp $ - * $DragonFly: src/sbin/restore/symtab.c,v 1.4 2003/09/28 14:39:21 hmp Exp $ + * $DragonFly: src/sbin/restore/symtab.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ /* @@ -70,9 +70,9 @@ static struct entry **entry; static long entrytblsize; -static void addino __P((ino_t, struct entry *)); -static struct entry *lookupparent __P((char *)); -static void removeentry __P((struct entry *)); +static void addino(ino_t, struct entry *); +static struct entry *lookupparent(char *); +static void removeentry(struct entry *); /* * Look up an entry by inode number diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 21e0caaace..227675a6ba 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -37,7 +37,7 @@ * * @(#)tape.c 8.9 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/restore/tape.c,v 1.16.2.8 2002/06/30 22:57:52 iedowse Exp $ - * $DragonFly: src/sbin/restore/tape.c,v 1.4 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/restore/tape.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $ */ #include @@ -87,23 +87,23 @@ static int Qcvt; /* Swap quads (for sun) */ #define FLUSHTAPEBUF() blkcnt = ntrec + 1 -static void accthdr __P((struct s_spcl *)); -static int checksum __P((int *)); -static void findinode __P((struct s_spcl *)); -static void findtapeblksize __P((void)); -static int gethead __P((struct s_spcl *)); -static void readtape __P((char *)); -static void setdumpnum __P((void)); -static u_long swabl __P((u_long)); -static u_char *swablong __P((u_char *, int)); -static u_char *swabshort __P((u_char *, int)); -static void terminateinput __P((void)); -static void xtrfile __P((char *, long)); -static void xtrlnkfile __P((char *, long)); -static void xtrlnkskip __P((char *, long)); -static void xtrmap __P((char *, long)); -static void xtrmapskip __P((char *, long)); -static void xtrskip __P((char *, long)); +static void accthdr(struct s_spcl *); +static int checksum(int *); +static void findinode(struct s_spcl *); +static void findtapeblksize(void); +static int gethead(struct s_spcl *); +static void readtape(char *); +static void setdumpnum(void); +static u_long swabl(u_long); +static u_char *swablong(u_char *, int); +static u_char *swabshort(u_char *, int); +static void terminateinput(void); +static void xtrfile(char *, long); +static void xtrlnkfile(char *, long); +static void xtrlnkskip(char *, long); +static void xtrmap(char *, long); +static void xtrmapskip(char *, long); +static void xtrskip(char *, long); static int readmapflag; diff --git a/sbin/route/route.c b/sbin/route/route.c index b657923178..94e9a72d6a 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1989, 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)route.c 8.6 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/route/route.c,v 1.40.2.11 2003/02/27 23:10:10 ru Exp $ - * $DragonFly: src/sbin/route/route.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/route/route.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -99,19 +99,19 @@ int locking, lockrest, debugonly; struct rt_metrics rt_metrics; u_long rtm_inits; uid_t uid; -int atalk_aton __P((const char *, struct at_addr *)); -char *atalk_ntoa __P((struct at_addr)); +int atalk_aton(const char *, struct at_addr *); +char *atalk_ntoa(struct at_addr); const char *routename(), *netname(); void flushroutes(), newroute(), monitor(), sockaddr(), sodump(), bprintf(); void print_getmsg(), print_rtmsg(), pmsg_common(), pmsg_addrs(), mask_addr(); #ifdef INET6 -static int inet6_makenetandmask __P((struct sockaddr_in6 *, char *)); +static int inet6_makenetandmask(struct sockaddr_in6 *, char *); #endif int getaddr(), rtmsg(), x25_makemask(); int prefixlen(); extern char *iso_ntoa(); -void usage __P((const char *)) __dead2; +void usage(const char *) __dead2; void usage(const char *cp) diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h index 23ab70f40b..75294c93c3 100644 --- a/sbin/routed/radix.h +++ b/sbin/routed/radix.h @@ -33,7 +33,7 @@ * @(#)radix.h 8.2 (Berkeley) 10/31/94 * * $FreeBSD: src/sbin/routed/radix.h,v 1.4 1999/08/28 00:14:17 peter Exp $ - * $DragonFly: src/sbin/routed/radix.h,v 1.2 2003/06/17 04:27:34 dillon Exp $ + * $DragonFly: src/sbin/routed/radix.h,v 1.3 2003/11/01 17:16:02 drhodus Exp $ */ #ifndef __RADIX_H_ @@ -120,15 +120,15 @@ struct radix_node_head { __P((void *v, void *mask, struct radix_node_head *head, struct radix_node nodes[])); struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); struct radix_node *(*rnh_lookup) /* locate based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); int (*rnh_walktree) /* traverse tree */ (struct radix_node_head *head, int (*f)(struct radix_node *, struct walkarg *), @@ -142,25 +142,25 @@ struct radix_node_head { #define Bzero(p, n) memset((void *)(p), 0, (size_t)(n)); #define Free(p) free((void *)p); -void rn_init __P((void)); -int rn_inithead __P((void **, int)); -int rn_refines __P((void *, void *)); +void rn_init(void); +int rn_inithead(void **, int); +int rn_refines(void *, void *); int rn_walktree __P((struct radix_node_head *, - int (*)__P((struct radix_node *, struct walkarg *)), + int (*)(struct radix_node *, struct walkarg *), struct walkarg *)); struct radix_node - *rn_addmask __P((void *, int, int)), + *rn_addmask(void *, int, int), *rn_addroute __P((void *, void *, struct radix_node_head *, struct radix_node [2])), - *rn_delete __P((void *, void *, struct radix_node_head *)), + *rn_delete(void *, void *, struct radix_node_head *), *rn_insert __P((void *, struct radix_node_head *, int *, struct radix_node [2])), - *rn_match __P((void *, struct radix_node_head *)), - *rn_newpair __P((void *, int, struct radix_node[2])), - *rn_search __P((void *, struct radix_node *)), - *rn_search_m __P((void *, struct radix_node *, void *)); + *rn_match(void *, struct radix_node_head *), + *rn_newpair(void *, int, struct radix_node[2]), + *rn_search(void *, struct radix_node *), + *rn_search_m(void *, struct radix_node *, void *); -struct radix_node *rn_lookup __P((void *, void *, struct radix_node_head *)); +struct radix_node *rn_lookup(void *, void *, struct radix_node_head *); #endif /* __RADIX_H_ */ diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 54a10d6e6a..5febd33dca 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1986, 1992, 1993 The Regents of the University of California. All rights reserved. * @(#)savecore.c 8.3 (Berkeley) 1/2/94 * $FreeBSD: src/sbin/savecore/savecore.c,v 1.28.2.13 2002/04/07 21:17:50 asmodai Exp $ - * $DragonFly: src/sbin/savecore/savecore.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/savecore/savecore.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -120,23 +120,23 @@ u_long kernbase; /* offset of kvm to core file */ int clear, compress, force, verbose; /* flags */ int keep; /* keep dump on device */ -void check_kmem __P((void)); -int check_space __P((void)); -void clear_dump __P((void)); -void DumpRead __P((int fd, void *bp, int size, off_t off, int flag)); -void DumpWrite __P((int fd, void *bp, int size, off_t off, int flag)); -int dump_exists __P((void)); -void find_dev __P((dev_t)); -int get_crashtime __P((void)); -void get_dumpsize __P((void)); -void kmem_setup __P((void)); -void log __P((int, char *, ...)) __printf0like(2, 3); -void Lseek __P((int, off_t, int)); -int Open __P((const char *, int rw)); -int Read __P((int, void *, int)); -void save_core __P((void)); -void usage __P((void)); -void Write __P((int, void *, int)); +void check_kmem(void); +int check_space(void); +void clear_dump(void); +void DumpRead(int fd, void *bp, int size, off_t off, int flag); +void DumpWrite(int fd, void *bp, int size, off_t off, int flag); +int dump_exists(void); +void find_dev(dev_t); +int get_crashtime(void); +void get_dumpsize(void); +void kmem_setup(void); +void log(int, char *, ...) __printf0like(2, 3); +void Lseek(int, off_t, int); +int Open(const char *, int rw); +int Read(int, void *, int); +void save_core(void); +void usage(void); +void Write(int, void *, int); int main(int argc, char **argv) diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 70fd25ed9c..8e2149894b 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1988, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)shutdown.c 8.4 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/shutdown/shutdown.c,v 1.21.2.1 2001/07/30 10:38:08 dd Exp $ - * $DragonFly: src/sbin/shutdown/shutdown.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/shutdown/shutdown.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -88,15 +88,15 @@ static int dohalt, dopower, doreboot, killflg, mbuflen, oflag; static char mbuf[BUFSIZ]; static const char *nosync, *whom; -void badtime __P((void)); -void die_you_gravy_sucking_pig_dog __P((void)); -void finish __P((int)); -void getoffset __P((char *)); -void loop __P((void)); -void nolog __P((void)); -void timeout __P((int)); -void timewarn __P((int)); -void usage __P((const char *)); +void badtime(void); +void die_you_gravy_sucking_pig_dog(void); +void finish(int); +void getoffset(char *); +void loop(void); +void nolog(void); +void timeout(int); +void timewarn(int); +void usage(const char *); int main(int argc, char **argv) diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index c2b777ef68..94ad0eb9dc 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -36,7 +36,7 @@ * @(#) Copyright (c) 1988 Regents of the University of California. All rights reserved. * @(#)slattach.c 4.6 (Berkeley) 6/1/90 * $FreeBSD: src/sbin/slattach/slattach.c,v 1.36 1999/08/28 00:14:25 peter Exp $ - * $DragonFly: src/sbin/slattach/slattach.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/slattach/slattach.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -69,7 +69,7 @@ void setup_line(int cflag); /* configure terminal settings */ void slip_discipline(); /* switch to slip line discipline */ void configure_network(); /* configure slip interface */ void acquire_line(); /* get tty device as controlling terminal */ -static void usage __P((void)); +static void usage(void); int fd = -1; char *dev = (char *)0; /* path name of the tty (e.g. /dev/tty01) */ diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index b60ae34eb9..5813965fea 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1990, 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)startslip.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/startslip/startslip.c,v 1.31.2.1 2000/05/07 18:26:51 joe Exp $ - * $DragonFly: src/sbin/startslip/startslip.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/startslip/startslip.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -95,10 +95,10 @@ int debug = 0; #endif #define printd if (debug) printf -int carrier __P((void)); -void down __P((int)); -int getline __P((char *, int, int, time_t)); -static void usage __P((void)); +int carrier(void); +void down(int); +int getline(char *, int, int, time_t); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 849b37e100..041775ea74 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)swapon.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/swapon/swapon.c,v 1.8.2.2 2001/07/30 10:30:11 dd Exp $ - * $DragonFly: src/sbin/swapon/swapon.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/swapon/swapon.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -44,8 +44,8 @@ #include #include -static void usage __P((void)); -int add __P((char *name, int ignoreebusy)); +static void usage(void); +int add(char *name, int ignoreebusy); int main(int argc, char **argv) diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c index c40b79948f..562488fd18 100644 --- a/sbin/sysctl/pathconf.c +++ b/sbin/sysctl/pathconf.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1993 The Regents of the University of California. All rights reserved. * @(#)pathconf.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/sbin/sysctl/pathconf.c,v 1.4 1999/08/28 00:14:30 peter Exp $ - * $DragonFly: src/sbin/sysctl/Attic/pathconf.c,v 1.3 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/sysctl/Attic/pathconf.c,v 1.4 2003/11/01 17:16:02 drhodus Exp $ */ #include @@ -72,10 +72,10 @@ struct list pclist = { pcnames, PC_MAXID }; int Aflag, aflag, nflag, wflag, stdinflag; -int findname __P((char *, char *, char**, struct list *)); -void listall __P((char *, struct list *)); -void parse __P((char *, char *, int)); -static void usage __P((void)); +int findname(char *, char *, char**, struct list *); +void listall(char *, struct list *); +void parse(char *, char *, int); +static void usage(void); int main(int argc, char **argv) diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index dff5e5d481..e7a09a41e0 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved. * @(#)tunefs.c 8.2 (Berkeley) 4/19/94 * $FreeBSD: src/sbin/tunefs/tunefs.c,v 1.11.2.5 2001/10/14 21:50:39 iedowse Exp $ - * $DragonFly: src/sbin/tunefs/tunefs.c,v 1.4 2003/09/28 14:39:22 hmp Exp $ + * $DragonFly: src/sbin/tunefs/tunefs.c,v 1.5 2003/11/01 17:16:02 drhodus Exp $ */ /* @@ -67,12 +67,12 @@ union { int fi; long dev_bsize = 1; -void bwrite __P((daddr_t, const char *, int)); -int bread __P((daddr_t, char *, int)); -void getsb __P((struct fs *, const char *)); -void putsb __P((struct fs *, const char *, int)); -void usage __P((void)); -void printfs __P((void)); +void bwrite(daddr_t, const char *, int); +int bread(daddr_t, char *, int); +void getsb(struct fs *, const char *); +void putsb(struct fs *, const char *, int); +void usage(void); +void printfs(void); int main(int argc, char **argv)