very basic de-lints

5 files changed, 26 insertions, 15 deletions

diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index c3f0a78ba27..954274fe746 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumprmt.c,v 1.22 2003/07/28 06:13:26 tedu Exp $	*/
+/*	$OpenBSD: dumprmt.c,v 1.23 2004/11/04 20:10:06 deraadt Exp $	*/
 /*	$NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dumprmt.c	8.1 (Berkeley) 6/5/93";
 #else
-static const char rcsid[] = "$OpenBSD: dumprmt.c,v 1.22 2003/07/28 06:13:26 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: dumprmt.c,v 1.23 2004/11/04 20:10:06 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -104,6 +104,7 @@ rmthost(char *host)
 	return (1);
 }
 
+/* ARGSUSED */
 static void
 rmtconnaborted(int signo)
 {
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 136ae89c3f2..14a7a6275af 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: itime.c,v 1.11 2003/07/28 06:13:26 tedu Exp $	*/
+/*	$OpenBSD: itime.c,v 1.12 2004/11/04 20:10:07 deraadt Exp $	*/
 /*	$NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #else
-static const char rcsid[] = "$OpenBSD: itime.c,v 1.11 2003/07/28 06:13:26 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: itime.c,v 1.12 2004/11/04 20:10:07 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -213,7 +213,7 @@ putdumptime(void)
 	}
 	if (fflush(df))
 		quit("%s: %s\n", dumpdates, strerror(errno));
-	if (ftruncate(fd, ftell(df)))
+	if (ftruncate(fd, ftello(df)))
 		quit("ftruncate (%s): %s\n", dumpdates, strerror(errno));
 	(void) fclose(df);
 	msg("level %c dump on %s", level,
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 7c10d2d8b85..8b658aca1c6 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.36 2003/08/25 23:28:15 tedu Exp $	*/
+/*	$OpenBSD: main.c,v 1.37 2004/11/04 20:10:07 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 4/15/94";
 #else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.36 2003/08/25 23:28:15 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.37 2004/11/04 20:10:07 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -200,6 +200,7 @@ main(int argc, char *argv[])
 		case 'w':
 			lastdump(ch);
 			exit(X_FINOK);	/* do nothing else */
+			break;
 
 		case 'a':		/* `auto-size', Write to EOM. */
 			unlimited = 1;
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 1ef20c3da78..2a153084f8c 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: optr.c,v 1.27 2003/07/29 18:38:35 deraadt Exp $	*/
+/*	$OpenBSD: optr.c,v 1.28 2004/11/04 20:10:07 deraadt Exp $	*/
 /*	$NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #else
-static const char rcsid[] = "$OpenBSD: optr.c,v 1.27 2003/07/29 18:38:35 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: optr.c,v 1.28 2004/11/04 20:10:07 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -132,6 +132,7 @@ char lastmsg[BUFSIZ];
  *	sleep for 2 minutes in case nobody comes to satisfy dump
  * XXX not safe
  */
+/* ARGSUSED */
 void
 alarmcatch(int signo)
 {
@@ -161,6 +162,7 @@ alarmcatch(int signo)
 /*
  *	Here if an inquisitive operator interrupts the dump program
  */
+/* ARGSUSED */
 void
 interrupt(int signo)
 {
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 7162b44c2b9..a585faf6dc1 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.20 2003/07/29 18:38:35 deraadt Exp $	*/
+/*	$OpenBSD: tape.c,v 1.21 2004/11/04 20:10:07 deraadt Exp $	*/
 /*	$NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.2 (Berkeley) 3/17/94";
 #else
-static const char rcsid[] = "$OpenBSD: tape.c,v 1.20 2003/07/29 18:38:35 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: tape.c,v 1.21 2004/11/04 20:10:07 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -202,6 +202,7 @@ dumpblock(daddr_t blkno, int size)
 
 int	nogripe = 0;
 
+/* ARGSUSED */
 void
 tperror(int signo)
 {
@@ -223,6 +224,7 @@ tperror(int signo)
 	Exit(X_REWRITE);
 }
 
+/* ARGSUSED */
 void
 sigpipe(int signo)
 {
@@ -260,8 +262,9 @@ do_stats(void)
  *	(derived from optr.c::timeest())
  * XXX not safe
  */
+/* ARGSUSED */
 void
-statussig(int notused)
+statussig(int signo)
 {
 	time_t	tnow, deltat;
 	char	msgbuf[128];
@@ -552,7 +555,7 @@ startnewtape(int top)
 	int	parentpid;
 	int	childpid;
 	int	status;
-	int	waitpid;
+	int	waitingpid;
 	char	*p;
 #ifdef sunos
 	void	(*interrupt_save)();
@@ -587,9 +590,9 @@ restore_check_point:
 		msg("Tape: %d; parent process: %d child process %d\n",
 			tapeno+1, parentpid, childpid);
 #endif /* TDEBUG */
-		while ((waitpid = wait(&status)) != childpid)
+		while ((waitingpid = wait(&status)) != childpid)
 			msg("Parent %d waiting for child %d has another child %d return\n",
-				parentpid, childpid, waitpid);
+				parentpid, childpid, waitingpid);
 		if (status & 0xFF) {
 			msg("Child %d returns LOB status %o\n",
 				childpid, status&0xFF);
@@ -615,8 +618,10 @@ restore_check_point:
 		switch(status) {
 			case X_FINOK:
 				Exit(X_FINOK);
+				break;
 			case X_ABORT:
 				Exit(X_ABORT);
+				break;
 			case X_REWRITE:
 				goto restore_check_point;
 			default:
@@ -683,6 +688,7 @@ restore_check_point:
 	}
 }
 
+/* ARGSUSED */
 void
 dumpabort(int signo)
 {
@@ -713,6 +719,7 @@ Exit(int status)
 /*
  * proceed - handler for SIGUSR2, used to synchronize IO between the slaves.
  */
+/* ARGSUSED */
 void
 proceed(int signo)
 {