Add rcsid. Remove unused #includes. Add missing prototypes and others -Wall

cleanings. Spelling.

1 files changed, 7 insertions, 7 deletions

diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 3bc4e8b3..cddf32b 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -32,28 +32,28 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/time.h>
+#include <sys/stat.h>
 
 #include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
 #include <protocols/dumprestore.h>
 
 #include <err.h>
-#include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "pathnames.h"
@@ -365,7 +365,7 @@ obsolete(argcp, argvp)
 	}
 
 	/* Copy remaining arguments. */
-	while (*nargv++ = *argv++);
+	while ((*nargv++ = *argv++));
 
 	/* Update argument count. */
 	*argcp = nargv - *argvp - 1;