From c40ae61c8c183033b215d5e580b876d7f4b55a89 Mon Sep 17 00:00:00 2001 From: alfred Date: Thu, 11 Jul 2002 18:31:16 +0000 Subject: de-__P() --- usr.sbin/ac/ac.c | 26 +++++++++--------- usr.sbin/ancontrol/ancontrol.c | 54 +++++++++++++++++++------------------- usr.sbin/apmd/apmd.h | 8 +++--- usr.sbin/cdcontrol/cdcontrol.c | 51 ++++++++++++++++++----------------- usr.sbin/chroot/chroot.c | 2 +- usr.sbin/edquota/edquota.c | 28 ++++++++++---------- usr.sbin/kgmon/kgmon.c | 16 +++++------ usr.sbin/lastlogin/lastlogin.c | 6 ++--- usr.sbin/mailwrapper/mailwrapper.c | 8 +++--- usr.sbin/mtree/compare.c | 2 +- usr.sbin/mtree/create.c | 9 +++---- usr.sbin/mtree/extern.h | 24 ++++++++--------- usr.sbin/mtree/misc.c | 2 +- usr.sbin/mtree/mtree.c | 2 +- usr.sbin/mtree/spec.c | 4 +-- usr.sbin/mtree/verify.c | 4 +-- 16 files changed, 122 insertions(+), 124 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 322865a..ea76a35 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -84,20 +84,20 @@ static struct tty_list *Ttys = NULL; static int Debug = 0; #endif -int main __P((int, char **)); -int ac __P((FILE *)); -struct tty_list *add_tty __P((char *)); -int do_tty __P((char *)); -FILE *file __P((const char *)); -struct utmp_list *log_in __P((struct utmp_list *, struct utmp *)); -struct utmp_list *log_out __P((struct utmp_list *, struct utmp *)); -int on_console __P((struct utmp_list *)); -void show __P((const char *, time_t)); -void show_today __P((struct user_list *, struct utmp_list *, +int main(int, char **); +int ac(FILE *); +struct tty_list *add_tty(char *); +int do_tty(char *); +FILE *file(const char *); +struct utmp_list *log_in(struct utmp_list *, struct utmp *); +struct utmp_list *log_out(struct utmp_list *, struct utmp *); +int on_console(struct utmp_list *); +void show(const char *, time_t); +void show_today __P((struct user_list *, struct utmp_list *, time_t)); -void show_users __P((struct user_list *)); -struct user_list *update_user __P((struct user_list *, char *, time_t)); -void usage __P((void)); +void show_users(struct user_list *); +struct user_list *update_user(struct user_list *, char *, time_t); +void usage(void); /* * open wtmp or die diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c index 6fb1cd3..543b37a 100644 --- a/usr.sbin/ancontrol/ancontrol.c +++ b/usr.sbin/ancontrol/ancontrol.c @@ -59,35 +59,35 @@ static const char rcsid[] = #include #include -static void an_getval __P((const char *, struct an_req *)); -static void an_setval __P((const char *, struct an_req *)); -static void an_printwords __P((u_int16_t *, int)); -static void an_printspeeds __P((u_int8_t*, int)); -static void an_printbool __P((int)); -static void an_printhex __P((char *, int)); -static void an_printstr __P((char *, int)); -static void an_dumpstatus __P((const char *)); -static void an_dumpstats __P((const char *)); -static void an_dumpconfig __P((const char *)); -static void an_dumpcaps __P((const char *)); -static void an_dumpssid __P((const char *)); -static void an_dumpap __P((const char *)); -static void an_setconfig __P((const char *, int, void *)); -static void an_setssid __P((const char *, int, void *)); -static void an_setap __P((const char *, int, void *)); -static void an_setspeed __P((const char *, int, void *)); -static void an_readkeyinfo __P((const char *)); +static void an_getval(const char *, struct an_req *); +static void an_setval(const char *, struct an_req *); +static void an_printwords(u_int16_t *, int); +static void an_printspeeds(u_int8_t*, int); +static void an_printbool(int); +static void an_printhex(char *, int); +static void an_printstr(char *, int); +static void an_dumpstatus(const char *); +static void an_dumpstats(const char *); +static void an_dumpconfig(const char *); +static void an_dumpcaps(const char *); +static void an_dumpssid(const char *); +static void an_dumpap(const char *); +static void an_setconfig(const char *, int, void *); +static void an_setssid(const char *, int, void *); +static void an_setap(const char *, int, void *); +static void an_setspeed(const char *, int, void *); +static void an_readkeyinfo(const char *); #ifdef ANCACHE -static void an_zerocache __P((const char *)); -static void an_readcache __P((const char *)); +static void an_zerocache(const char *); +static void an_readcache(const char *); #endif -static int an_hex2int __P((char)); -static void an_str2key __P((char *, struct an_ltv_key *)); -static void an_setkeys __P((const char *, char *, int)); -static void an_enable_tx_key __P((const char *, char *)); -static void an_enable_leap_mode __P((const char *, char *)); -static void usage __P((char *)); -int main __P((int, char **)); +static int an_hex2int(char); +static void an_str2key(char *, struct an_ltv_key *); +static void an_setkeys(const char *, char *, int); +static void an_enable_tx_key(const char *, char *); +static void an_enable_leap_mode(const char *, char *); +static void usage(char *); +int main(int, char **); #define ACT_DUMPSTATS 1 #define ACT_DUMPCONFIG 2 diff --git a/usr.sbin/apmd/apmd.h b/usr.sbin/apmd/apmd.h index b716d0d..1be5afa 100644 --- a/usr.sbin/apmd/apmd.h +++ b/usr.sbin/apmd/apmd.h @@ -53,10 +53,10 @@ enum { }; struct event_cmd_op { - int (* act) __P((void *this)); - void (* dump) __P((void *this, FILE * fp)); - struct event_cmd * (* clone) __P((void *this)); - void (* free) __P((void *this)); + int (* act)(void *this); + void (* dump)(void *this, FILE * fp); + struct event_cmd * (* clone)(void *this); + void (* free)(void *this); }; struct event_cmd { struct event_cmd * next; diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c index e41528e..7b90e34 100644 --- a/usr.sbin/cdcontrol/cdcontrol.c +++ b/usr.sbin/cdcontrol/cdcontrol.c @@ -119,32 +119,31 @@ int fd = -1; int verbose = 1; int msf = 1; -int setvol __P((int, int)); -int read_toc_entrys __P((int)); -int play_msf __P((int, int, int, int, int, int)); -int play_track __P((int, int, int, int)); -int get_vol __P((int *, int *)); -int status __P((int *, int *, int *, int *)); -int open_cd __P((void)); -int next_prev __P((char *arg, int)); -int play __P((char *arg)); -int info __P((char *arg)); -int cdid __P((void)); -int pstatus __P((char *arg)); -char *input __P((int *)); -void prtrack __P((struct cd_toc_entry *e, int lastflag)); -void lba2msf __P((unsigned long lba, - u_char *m, u_char *s, u_char *f)); -unsigned int msf2lba __P((u_char m, u_char s, u_char f)); -int play_blocks __P((int blk, int len)); -int run __P((int cmd, char *arg)); -char *parse __P((char *buf, int *cmd)); -void help __P((void)); -void usage __P((void)); -char *use_cdrom_instead __P((const char *)); -__const char *strstatus __P((int)); -static u_int dbprog_discid __P((void)); -__const char *cdcontrol_prompt __P((void)); +int setvol(int, int); +int read_toc_entrys(int); +int play_msf(int, int, int, int, int, int); +int play_track(int, int, int, int); +int get_vol(int *, int *); +int status(int *, int *, int *, int *); +int open_cd(void); +int next_prev(char *arg, int); +int play(char *arg); +int info(char *arg); +int cdid(void); +int pstatus(char *arg); +char *input(int *); +void prtrack(struct cd_toc_entry *e, int lastflag); +void lba2msf(unsigned long lba, u_char *m, u_char *s, u_char *f); +unsigned int msf2lba(u_char m, u_char s, u_char f); +int play_blocks(int blk, int len); +int run(int cmd, char *arg); +char *parse(char *buf, int *cmd); +void help(void); +void usage(void); +char *use_cdrom_instead(const char *); +__const char *strstatus(int); +static u_int dbprog_discid(void); +__const char *cdcontrol_prompt(void); void help () { diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index 0a3be8e..9c23eb6 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -54,7 +54,7 @@ static const char rcsid[] = #include #include -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index fefb657..0f45116 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -83,20 +83,20 @@ struct quotause { }; #define FOUND 0x01 -int alldigits __P((const char *s)); -int cvtatos __P((time_t, char *, time_t *)); -char *cvtstoa __P((time_t)); -int editit __P((char *)); -void freeprivs __P((struct quotause *)); -int getentry __P((const char *, int)); -struct quotause *getprivs __P((long, int, char *)); -int hasquota __P((struct fstab *, int, char **)); -void putprivs __P((long, int, struct quotause *)); -int readprivs __P((struct quotause *, char *)); -int readtimes __P((struct quotause *, char *)); -static void usage __P((void)); -int writetimes __P((struct quotause *, int, int)); -int writeprivs __P((struct quotause *, int, char *, int)); +int alldigits(const char *s); +int cvtatos(time_t, char *, time_t *); +char *cvtstoa(time_t); +int editit(char *); +void freeprivs(struct quotause *); +int getentry(const char *, int); +struct quotause *getprivs(long, int, char *); +int hasquota(struct fstab *, int, char **); +void putprivs(long, int, struct quotause *); +int readprivs(struct quotause *, char *); +int readtimes(struct quotause *, char *); +static void usage(void); +int writetimes(struct quotause *, int, int); +int writeprivs(struct quotause *, int, char *, int); int main(argc, argv) diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index 3ee5a73..65e6674 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -78,14 +78,14 @@ struct kvmvars { int Bflag, bflag, hflag, kflag, rflag, pflag; int debug = 0; -int getprof __P((struct kvmvars *)); -int getprofhz __P((struct kvmvars *)); -void kern_readonly __P((int)); -int openfiles __P((char *, char *, struct kvmvars *)); -void setprof __P((struct kvmvars *kvp, int state)); -void dumpstate __P((struct kvmvars *kvp)); -void reset __P((struct kvmvars *kvp)); -static void usage __P((void)); +int getprof(struct kvmvars *); +int getprofhz(struct kvmvars *); +void kern_readonly(int); +int openfiles(char *, char *, struct kvmvars *); +void setprof(struct kvmvars *kvp, int state); +void dumpstate(struct kvmvars *kvp); +void reset(struct kvmvars *kvp); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 9f08377..21c82c3 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -48,9 +48,9 @@ __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $"); static const char *logfile = _PATH_LASTLOG; - int main __P((int, char **)); -static void output __P((struct passwd *, struct lastlog *)); -static void usage __P((void)); + int main(int, char **); +static void output(struct passwd *, struct lastlog *); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index 4eef31c..4153680 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -49,11 +49,11 @@ struct arglist { char **argv; }; -int main __P((int, char *[], char *[])); +int main(int, char *[], char *[]); -static void initarg __P((struct arglist *)); -static void addarg __P((struct arglist *, const char *, int)); -static void freearg __P((struct arglist *, int)); +static void initarg(struct arglist *); +static void addarg(struct arglist *, const char *, int); +static void freearg(struct arglist *, int); extern const char *__progname; /* from crt0.o */ diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c index 19e48cd..b2328a6 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/mtree/compare.c @@ -63,7 +63,7 @@ static const char rcsid[] = extern int uflag; extern int lineno; -static char *ftype __P((u_int)); +static char *ftype(u_int); #define INDENTNAMELEN 8 #define LABEL \ diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index 2975fb5..a7dfc67 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -79,11 +79,10 @@ static uid_t uid; static mode_t mode; static u_long flags = 0xffffffff; -static int dsort __P((const FTSENT **, const FTSENT **)); -static void output __P((int, int *, const char *, ...)) __printflike(3, 4); -static int statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, - u_long *)); -static void statf __P((int, FTSENT *)); +static int dsort(const FTSENT **, const FTSENT **); +static void output(int, int *, const char *, ...) __printflike(3, 4); +static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *); +static void statf(int, FTSENT *); void cwalk() diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h index 54dafdf..0805430 100644 --- a/usr.sbin/mtree/extern.h +++ b/usr.sbin/mtree/extern.h @@ -34,17 +34,17 @@ * $FreeBSD$ */ -int compare __P((char *, NODE *, FTSENT *)); -int crc __P((int, u_long *, u_long *)); -void cwalk __P((void)); -char *flags_to_string __P((u_long)); +int compare(char *, NODE *, FTSENT *); +int crc(int, u_long *, u_long *); +void cwalk(void); +char *flags_to_string(u_long); -char *inotype __P((u_int)); -u_int parsekey __P((char *, int *)); -char *rlink __P((char *)); -NODE *spec __P((void)); -int verify __P((void)); +char *inotype(u_int); +u_int parsekey(char *, int *); +char *rlink(char *); +NODE *spec(void); +int verify(void); -int check_excludes __P((const char *, const char *)); -void init_excludes __P((void)); -void read_excludes_file __P((const char *)); +int check_excludes(const char *, const char *); +void init_excludes(void); +void read_excludes_file(const char *); diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c index 7721ff4..151a28b 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/mtree/misc.c @@ -91,7 +91,7 @@ parsekey(name, needvaluep) int *needvaluep; { KEY *k, tmp; - int keycompare __P((const void *, const void *)); + int keycompare(const void *, const void *); tmp.name = name; k = (KEY *)bsearch(&tmp, keylist, sizeof(keylist) / sizeof(KEY), diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index 331e669..254c1b6 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -62,7 +62,7 @@ int cflag, dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, Uflag; u_int keys; char fullpath[MAXPATHLEN]; -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c index 4cbf80b..cbf0f50 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/mtree/spec.c @@ -55,8 +55,8 @@ static const char rcsid[] = int lineno; /* Current spec line number. */ -static void set __P((char *, NODE *)); -static void unset __P((char *, NODE *)); +static void set(char *, NODE *); +static void unset(char *, NODE *); NODE * spec() diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c index 0da0e12..1177f78 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/mtree/verify.c @@ -60,8 +60,8 @@ extern int lineno; static NODE *root; static char path[MAXPATHLEN]; -static void miss __P((NODE *, char *)); -static int vwalk __P((void)); +static void miss(NODE *, char *); +static int vwalk(void); int verify() -- cgit v1.1