diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 4e54a22cc051..f195de58f425 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $	*/
+/*	$NetBSD: lpd.c,v 1.34 2002/07/09 01:12:35 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993, 1994
@@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $");
+__RCSID("$NetBSD: lpd.c,v 1.34 2002/07/09 01:12:35 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -154,7 +154,7 @@ main(int argc, char **argv)
 	name = argv[0];
 
 	errs = 0;
-	while ((i = getopt(argc, argv, "b:cdln:srw:W")) != -1)
+	while ((i = getopt(argc, argv, "b:dln:srw:W")) != -1)
 		switch (i) {
 		case 'b':
 			if (blist_addrs >= blist_size) {
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index ac8f5f725fc8..2089525a5099 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: printjob.c,v 1.32 2002/06/08 23:40:12 itojun Exp $	*/
+/*	$NetBSD: printjob.c,v 1.33 2002/07/09 01:12:35 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)printjob.c	8.7 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: printjob.c,v 1.32 2002/06/08 23:40:12 itojun Exp $");
+__RCSID("$NetBSD: printjob.c,v 1.33 2002/07/09 01:12:35 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@ static int	child;		/* id of any filters */
 static int	lfd;		/* lock file descriptor */
 static int	ofd;		/* output filter file descriptor */
 static int	ofilter;	/* id of output filter, if any */
-static int	pfd;		/* prstatic inter file descriptor */
+static int	pfd;		/* printer file descriptor */
 static int	pid;		/* pid of lpd process */
 static int	prchild;	/* id of pr process */
 static char	title[80];	/* ``pr'' title */
@@ -1040,8 +1040,7 @@ scan_out(int scfd, char *scsp, int dlm)
 }
 
 static int
-dropit(c)
-	int c;
+dropit(int c)
 {
 	switch(c) {
 
@@ -1189,8 +1188,7 @@ dofork(int action)
  * Kill child processes to abort current job.
  */
 static void
-abortpr(signo)
-	int signo;
+abortpr(int signo)
 {
 	(void)unlink(tempfile);
 	kill(0, SIGINT);
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index edca53988f6a..f82c97dc3c5b 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: recvjob.c,v 1.14 2001/12/04 22:52:44 christos Exp $	*/
+/*	$NetBSD: recvjob.c,v 1.15 2002/07/09 01:12:35 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: recvjob.c,v 1.14 2001/12/04 22:52:44 christos Exp $");
+__RCSID("$NetBSD: recvjob.c,v 1.15 2002/07/09 01:12:35 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -302,8 +302,7 @@ chksize(int size)
 }
 
 static int
-read_number(fn)
-	char *fn;
+read_number(char *fn)
 {
 	char lin[80];
 	FILE *fp;