diff options
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r-- | usr.sbin/lpr/common_source/common.c | 6 | ||||
-rw-r--r-- | usr.sbin/lpr/common_source/lp.h | 48 | ||||
-rw-r--r-- | usr.sbin/lpr/common_source/rmjob.c | 6 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/cmds.c | 32 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/extern.h | 28 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/lpc.c | 14 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/lpc.h | 4 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/extern.h | 18 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/key.c | 28 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/lpd.c | 18 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/printjob.c | 40 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/recvjob.c | 18 | ||||
-rw-r--r-- | usr.sbin/lpr/lpq/lpq.c | 8 | ||||
-rw-r--r-- | usr.sbin/lpr/lpr/lpr.c | 24 | ||||
-rw-r--r-- | usr.sbin/lpr/lprm/lprm.c | 6 | ||||
-rw-r--r-- | usr.sbin/lpr/pac/pac.c | 22 |
16 files changed, 160 insertions, 160 deletions
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index bb1468459e4..48b4f45eea0 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $ */ +/* $OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,7 +42,7 @@ #if 0 static const char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -121,7 +121,7 @@ char *printcapdb[2] = { _PATH_PRINTCAP, 0 }; extern uid_t uid, euid; -static int compar __P((const void *, const void *)); +static int compar(const void *, const void *); /* * Create a TCP connection to host "rhost" at port "rport". diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 01f0a3c599c..335b90d8332 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.h,v 1.6 2001/12/06 03:12:30 ericj Exp $ */ +/* $OpenBSD: lp.h,v 1.7 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -105,28 +105,28 @@ struct queue { __BEGIN_DECLS struct dirent; -void blankfill __P((int)); -char *checkremote __P((void)); -int chk __P((char *)); -void displayq __P((int)); -void dump __P((char *, char *, int)); -void fatal __P((const char *, ...)); -int getline __P((FILE *)); -int getport __P((char *, int)); +void blankfill(int); +char *checkremote(void); +int chk(char *); +void displayq(int); +void dump(char *, char *, int); +void fatal(const char *, ...); +int getline(FILE *); +int getport(char *, int); int getq __P((struct queue *(*[]))); -void header __P((void)); -void inform __P((char *)); -int inlist __P((char *, char *)); -int iscf __P((struct dirent *)); -int isowner __P((char *, char *)); -void ldump __P((char *, char *, int)); -int lockchk __P((char *)); -void prank __P((int)); -void process __P((char *)); -void rmjob __P((void)); -void rmremote __P((void)); -void show __P((char *, char *, int)); -int startdaemon __P((char *)); -void nodaemon __P((void)); -void delay __P((int)); +void header(void); +void inform(char *); +int inlist(char *, char *); +int iscf(struct dirent *); +int isowner(char *, char *); +void ldump(char *, char *, int); +int lockchk(char *); +void prank(int); +void process(char *); +void rmjob(void); +void rmremote(void); +void show(char *, char *, int); +int startdaemon(char *); +void nodaemon(void); +void delay(int); __END_DECLS diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 279d06c35c5..fe7e125c3b9 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmjob.c,v 1.11 2001/08/30 17:38:13 millert Exp $ */ +/* $OpenBSD: rmjob.c,v 1.12 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -37,7 +37,7 @@ #if 0 static const char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.11 2001/08/30 17:38:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.12 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -75,7 +75,7 @@ static char current[NAME_MAX]; /* active control file name */ extern uid_t uid, euid; /* real and effective user id's */ -static void do_unlink __P((char *)); +static void do_unlink(char *); void rmjob() diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index 206d8e435ad..ac98baf23c4 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert Exp $ */ +/* $OpenBSD: cmds.c,v 1.15 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: cmds.c,v 1.15 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -74,20 +74,20 @@ static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert extern uid_t uid, euid; -void abortpr __P((int)); -void cleanpr __P((void)); -void disablepr __P((void)); -int doarg __P((char *)); -int doselect __P((struct dirent *)); -void enablepr __P((void)); -void prstat __P((void)); -void putmsg __P((int, char **)); -int sortq __P((const void *, const void *)); -void startpr __P((int)); -void stoppr __P((void)); -int touch __P((struct queue *)); -void unlinkf __P((char *)); -void upstat __P((char *)); +void abortpr(int); +void cleanpr(void); +void disablepr(void); +int doarg(char *); +int doselect(struct dirent *); +void enablepr(void); +void prstat(void); +void putmsg(int, char **); +int sortq(const void *, const void *); +void startpr(int); +void stoppr(void); +int touch(struct queue *); +void unlinkf(char *); +void upstat(char *); /* * kill an existing daemon and disable printing. diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h index 88624141133..16a1c725bb4 100644 --- a/usr.sbin/lpr/lpc/extern.h +++ b/usr.sbin/lpr/lpc/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1997/01/17 16:12:36 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -41,19 +41,19 @@ __BEGIN_DECLS -void clean __P((int, char **)); -void disable __P((int, char **)); -void doabort __P((int, char **)); -void down __P((int, char **)); -void enable __P((int, char **)); -void help __P((int, char **)); -void quit __P((int, char **)); -void restart __P((int, char **)); -void startcmd __P((int, char **)); -void status __P((int, char **)); -void stop __P((int, char **)); -void topq __P((int, char **)); -void up __P((int, char **)); +void clean(int, char **); +void disable(int, char **); +void doabort(int, char **); +void down(int, char **); +void enable(int, char **); +void help(int, char **); +void quit(int, char **); +void restart(int, char **); +void startcmd(int, char **); +void status(int, char **); +void stop(int, char **); +void topq(int, char **); +void up(int, char **); __END_DECLS extern int NCMDS; diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c index 3c3ffe04331..5b4cfc20c2a 100644 --- a/usr.sbin/lpr/lpc/lpc.c +++ b/usr.sbin/lpr/lpc/lpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpc.c,v 1.11 2001/12/06 03:12:30 ericj Exp $ */ +/* $OpenBSD: lpc.c,v 1.12 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: lpc.c,v 1.11 2001/12/06 03:12:30 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lpc.c,v 1.12 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -82,11 +82,11 @@ int margc; char *margv[MAX_MARGV]; uid_t uid, euid; -void cmdscanner __P((void)); -struct cmd *getcmd __P((char *)); -void intr __P((int)); -void makeargv __P((void)); -int ingroup __P((char *)); +void cmdscanner(void); +struct cmd *getcmd(char *); +void intr(int); +void makeargv(void); +int ingroup(char *); int main(argc, argv) diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h index bc5378e7ecd..281eb2d2c1e 100644 --- a/usr.sbin/lpr/lpc/lpc.h +++ b/usr.sbin/lpr/lpc/lpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lpc.h,v 1.2 1997/01/17 16:12:38 millert Exp $ */ +/* $OpenBSD: lpc.h,v 1.3 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,6 +42,6 @@ struct cmd { char *c_name; /* command name */ char *c_help; /* help message */ /* routine to do the work */ - void (*c_handler) __P((int, char *[])); + void (*c_handler)(int, char *[]); int c_priv; /* privileged command */ }; diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h index ae075c35690..9c1ff356469 100644 --- a/usr.sbin/lpr/lpd/extern.h +++ b/usr.sbin/lpr/lpd/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1997/07/17 09:09:11 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -53,11 +53,11 @@ struct info { struct winsize win; /* window info */ }; -void printjob __P((void)); -void recvjob __P((void)); -void sttyclearflags __P((struct termios *tp, int flags)); -void sttysetflags __P((struct termios *tp, int flags)); -void sttyclearlflags __P((struct termios *tp, int flags)); -void sttysetlflags __P((struct termios *tp, int flags)); -int ksearch __P((char ***, struct info *)); -int msearch __P((char ***, struct info *)); +void printjob(void); +void recvjob(void); +void sttyclearflags(struct termios *tp, int flags); +void sttysetflags(struct termios *tp, int flags); +void sttyclearlflags(struct termios *tp, int flags); +void sttysetlflags(struct termios *tp, int flags); +int ksearch(char ***, struct info *); +int msearch(char ***, struct info *); diff --git a/usr.sbin/lpr/lpd/key.c b/usr.sbin/lpr/lpd/key.c index a4f8df16149..259e97f28a6 100644 --- a/usr.sbin/lpr/lpd/key.c +++ b/usr.sbin/lpr/lpd/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert Exp $ */ +/* $OpenBSD: key.c,v 1.4 2002/02/16 21:28:03 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static const char sccsid[] = "@(#)key.c 8.3 (Berkeley) 4/2/94"; #else -static const char rcsid[] = "$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -56,22 +56,22 @@ static const char rcsid[] = "$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert E #include "extern.h" __BEGIN_DECLS -void f_cbreak __P((struct info *)); -void f_columns __P((struct info *)); -void f_dec __P((struct info *)); -void f_extproc __P((struct info *)); -void f_ispeed __P((struct info *)); -void f_nl __P((struct info *)); -void f_ospeed __P((struct info *)); -void f_raw __P((struct info *)); -void f_rows __P((struct info *)); -void f_sane __P((struct info *)); -void f_tty __P((struct info *)); +void f_cbreak(struct info *); +void f_columns(struct info *); +void f_dec(struct info *); +void f_extproc(struct info *); +void f_ispeed(struct info *); +void f_nl(struct info *); +void f_ospeed(struct info *); +void f_raw(struct info *); +void f_rows(struct info *); +void f_sane(struct info *); +void f_tty(struct info *); __END_DECLS static struct key { char *name; /* name */ - void (*f) __P((struct info *)); /* function */ + void (*f)(struct info *); /* function */ #define F_NEEDARG 0x01 /* needs an argument */ #define F_OFFOK 0x02 /* can turn off */ int flags; diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 7a9429446f0..d9465a32cc9 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt Exp $ */ +/* $OpenBSD: lpd.c,v 1.28 2002/02/16 21:28:03 millert Exp $ */ /* $NetBSD: lpd.c,v 1.7 1996/04/24 14:54:06 mrg Exp $ */ /* @@ -45,7 +45,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: lpd.c,v 1.28 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -104,17 +104,17 @@ static const char rcsid[] = "$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt #include "pathnames.h" #include "extern.h" -extern int __ivaliduser __P((FILE *, in_addr_t, const char *, const char *)); +extern int __ivaliduser(FILE *, in_addr_t, const char *, const char *); int lflag; /* log requests flag */ int from_remote; /* from remote socket */ -static void reapchild __P((int)); -static void mcleanup __P((int)); -static void doit __P((void)); -static void startup __P((void)); -static void chkhost __P((struct sockaddr_in *)); -static int ckqueue __P((char *)); +static void reapchild(int); +static void mcleanup(int); +static void doit(void); +static void startup(void); +static void chkhost(struct sockaddr_in *); +static int ckqueue(char *); /* unused, needed for lpc */ volatile sig_atomic_t gotintr; diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index 14586c9a374..fb10a6dbcae 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printjob.c,v 1.29 2002/01/21 17:30:38 deraadt Exp $ */ +/* $OpenBSD: printjob.c,v 1.30 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $ */ /* @@ -115,25 +115,25 @@ static char pxwidth[10] = "-x"; /* page width in pixels */ static char tempfile[] = "errsXXXXXXXXXX"; /* file name for filter output */ static char width[10] = "-w"; /* page width in static characters */ -static void abortpr __P((int)); -static void banner __P((char *, char *)); -static int dofork __P((int)); -static int dropit __P((int)); -static void init __P((void)); -static void openpr __P((void)); -static void opennet __P((char *)); -static void opentty __P((void)); -static void openrem __P((void)); -static int print __P((int, char *)); -static int printit __P((char *)); -static void pstatus __P((const char *, ...)); -static char response __P((void)); -static void scan_out __P((int, char *, int)); -static char *scnline __P((int, char *, int)); -static int sendfile __P((int, char *)); -static int sendit __P((char *)); -static void sendmail __P((char *, int)); -static void setty __P((void)); +static void abortpr(int); +static void banner(char *, char *); +static int dofork(int); +static int dropit(int); +static void init(void); +static void openpr(void); +static void opennet(char *); +static void opentty(void); +static void openrem(void); +static int print(int, char *); +static int printit(char *); +static void pstatus(const char *, ...); +static char response(void); +static void scan_out(int, char *, int); +static char *scnline(int, char *, int); +static int sendfile(int, char *); +static int sendit(char *); +static void sendmail(char *, int); +static void setty(void); void printjob() diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index 490485d3142..71021f5114b 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: recvjob.c,v 1.17 2001/11/27 17:24:27 millert Exp $ */ +/* $OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95"; #else -static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.17 2001/11/27 17:24:27 millert Exp $"; +static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -77,13 +77,13 @@ static int minfree; /* keep at least minfree blocks available */ static char *sp = ""; static char tfname[NAME_MAX]; /* tmp copy of cf before linking */ -static int chksize __P((int)); -static void frecverr __P((const char *, ...)); -static int noresponse __P((void)); -static void rcleanup __P((int)); -static int read_number __P((char *)); -static int readfile __P((char *, int)); -static int readjob __P((void)); +static int chksize(int); +static void frecverr(const char *, ...); +static int noresponse(void); +static void rcleanup(int); +static int read_number(char *); +static int readfile(char *, int); +static int readjob(void); void diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c index 6e2b09ec64a..7d578382b3e 100644 --- a/usr.sbin/lpr/lpq/lpq.c +++ b/usr.sbin/lpr/lpq/lpq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpq.c,v 1.10 2001/12/06 03:12:31 ericj Exp $ */ +/* $OpenBSD: lpq.c,v 1.11 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpq.c,v 1.10 2001/12/06 03:12:31 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lpq.c,v 1.11 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -79,8 +79,8 @@ uid_t uid, euid; volatile sig_atomic_t gotintr; -static int ckqueue __P((char *)); -void usage __P((void)); +static int ckqueue(char *); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c index 71054fe86b6..99c84378bc8 100644 --- a/usr.sbin/lpr/lpr/lpr.c +++ b/usr.sbin/lpr/lpr/lpr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpr.c,v 1.23 2001/12/06 03:12:31 ericj Exp $ */ +/* $OpenBSD: lpr.c,v 1.24 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: lpr.c,v 1.10 1996/03/21 18:12:25 jtc Exp $ */ /* @@ -50,7 +50,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: lpr.c,v 1.23 2001/12/06 03:12:31 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lpr.c,v 1.24 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -108,16 +108,16 @@ static struct stat statb; volatile sig_atomic_t gotintr; -static void card __P((int, char *)); -static void chkprinter __P((char *)); -static void cleanup __P((int)); -static void copy __P((int, char [])); -static char *linked __P((char *)); -static char *lmktemp __P((char *, int, int)); -static void mktemps __P((void)); -static int nfile __P((char *)); -static int test __P((char *)); -static char *itoa __P((int)); +static void card(int, char *); +static void chkprinter(char *); +static void cleanup(int); +static void copy(int, char []); +static char *linked(char *); +static char *lmktemp(char *, int, int); +static void mktemps(void); +static int nfile(char *); +static int test(char *); +static char *itoa(int); uid_t uid, euid; diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c index e94c43a0974..226730c6302 100644 --- a/usr.sbin/lpr/lprm/lprm.c +++ b/usr.sbin/lpr/lprm/lprm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lprm.c,v 1.9 2001/12/06 03:12:31 ericj Exp $ */ +/* $OpenBSD: lprm.c,v 1.10 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: lprm.c,v 1.9 2001/12/06 03:12:31 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lprm.c,v 1.10 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -86,7 +86,7 @@ static char luser[MAXLOGNAME]; /* buffer for person */ volatile sig_atomic_t gotintr; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 7ba97d9615e..f355056a4e8 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pac.c,v 1.11 2001/11/23 03:58:19 deraadt Exp $ */ +/* $OpenBSD: pac.c,v 1.12 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: pac.c,v 1.7 1996/03/21 18:21:20 jtc Exp $ */ /* @@ -45,7 +45,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: pac.c,v 1.11 2001/11/23 03:58:19 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: pac.c,v 1.12 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -100,15 +100,15 @@ struct hent { static struct hent *hashtab[HSHSIZE]; /* Hash table proper */ -static void account __P((FILE *)); -static int any __P((int, char [])); -static int chkprinter __P((char *)); -static void dumpit __P((void)); -static int hash __P((char [])); -static struct hent *enter __P((char [])); -static struct hent *lookup __P((char [])); -static int qucmp __P((const void *, const void *)); -static void rewrite __P((void)); +static void account(FILE *); +static int any(int, char []); +static int chkprinter(char *); +static void dumpit(void); +static int hash(char []); +static struct hent *enter(char []); +static struct hent *lookup(char []); +static int qucmp(const void *, const void *); +static void rewrite(void); int main(argc, argv) |