o __P removed

o ansi function prototypes
o unifdef -D__STDC__
o __dead2 on usage prototype
o remove now-bogus main prototype

4 files changed, 67 insertions, 222 deletions

diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 00d072e..3270d81 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -80,25 +80,20 @@ static char *options = NULL;
 static int flags = 0;
 static int forceflag = 0;
 
-int main __P((int, char *[]));
-
-static int checkfs __P((const char *, const char *, const char *, char *,
-    pid_t *));
-static int selected __P((const char *));
-static void addoption __P((char *));
-static const char *getoptions __P((const char *));
-static void addentry __P((struct fstypelist *, const char *, const char *));
-static void maketypelist __P((char *));
-static void catopt __P((char **, const char *));
-static void mangle __P((char *, int *, const char ***, int *));
-static const char *getfslab __P((const char *));
-static void usage __P((void));
-static int isok __P((struct fstab *));
+static int checkfs(const char *, const char *, const char *, char *, pid_t *);
+static int selected(const char *);
+static void addoption(char *);
+static const char *getoptions(const char *);
+static void addentry(struct fstypelist *, const char *, const char *);
+static void maketypelist(char *);
+static void catopt(char **, const char *);
+static void mangle(char *, int *, const char ***, int *);
+static const char *getfslab(const char *);
+static void usage(void) __dead2;
+static int isok(struct fstab *);
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	struct fstab *fs;
 	int i, rval = 0;
@@ -230,8 +225,7 @@ main(argc, argv)
 
 
 static int
-isok(fs)
-	struct fstab *fs;
+isok(struct fstab *fs)
 {
 	int i;
 
@@ -283,10 +277,8 @@ isok(fs)
 
 
 static int
-checkfs(pvfstype, spec, mntpt, auxopt, pidp)
-	const char *pvfstype, *spec, *mntpt;
-	char *auxopt;
-	pid_t *pidp;
+checkfs(const char *pvfstype, const char *spec, const char *mntpt,
+    char *auxopt, pid_t *pidp)
 {
 	/* List of directories containing fsck_xxx subcommands. */
 	static const char *edirs[] = {
@@ -416,8 +408,7 @@ checkfs(pvfstype, spec, mntpt, auxopt, pidp)
 
 
 static int
-selected(type)
-	const char *type;
+selected(const char *type)
 {
 	struct entry *e;
 
@@ -431,8 +422,7 @@ selected(type)
 
 
 static const char *
-getoptions(type)
-	const char *type;
+getoptions(const char *type)
 {
 	struct entry *e;
 
@@ -444,8 +434,7 @@ getoptions(type)
 
 
 static void
-addoption(optstr)
-	char *optstr;
+addoption(char *optstr)
 {
 	char *newoptions;
 	struct entry *e;
@@ -465,10 +454,7 @@ addoption(optstr)
 
 
 static void
-addentry(list, type, opts)
-	struct fstypelist *list;
-	const char *type;
-	const char *opts;
+addentry(struct fstypelist *list, const char *type, const char *opts)
 {
 	struct entry *e;
 
@@ -480,8 +466,7 @@ addentry(list, type, opts)
 
 
 static void
-maketypelist(fslist)
-	char *fslist;
+maketypelist(char *fslist)
 {
 	char *ptr;
 
@@ -502,9 +487,7 @@ maketypelist(fslist)
 
 
 static void
-catopt(sp, o)
-	char **sp;
-	const char *o;
+catopt(char **sp, const char *o)
 {
 	char *s;
 	size_t i, j;
@@ -522,10 +505,7 @@ catopt(sp, o)
 
 
 static void
-mangle(options, argcp, argvp, maxargcp)
-	char *options;
-	int *argcp, *maxargcp;
-	const char ***argvp;
+mangle(char *options, int *argcp, const char ***argvp, int *maxargcp)
 {
 	char *p, *s;
 	int argc, maxargc;
@@ -563,8 +543,7 @@ mangle(options, argcp, argvp, maxargcp)
 
 
 const static char *
-getfslab(str)
-	const char *str;
+getfslab(const char *str)
 {
 	struct disklabel dl;
 	int fd;
@@ -599,7 +578,7 @@ getfslab(str)
 
 
 static void
-usage()
+usage(void)
 {
 	extern char *__progname;
 	static const char common[] =
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 0f6140c..e6e3629 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -43,11 +43,7 @@ __RCSID("$NetBSD: fsutil.c,v 1.7 1998/07/30 17:41:03 thorpej Exp $");
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <errno.h>
 #include <fstab.h>
 #include <err.h>
@@ -65,58 +61,41 @@ static int preen = 0;
 
 extern char *__progname;
 
-static void vmsg __P((int, const char *, va_list)) __printflike(2, 0);
+static void vmsg(int, const char *, va_list) __printflike(2, 0);
 
 void
-setcdevname(cd, pr)
-	const char *cd;
-	int pr;
+setcdevname(const char *cd, int pr)
 {
 	dev = cd;
 	preen = pr;
 }
 
 const char *
-cdevname()
+cdevname(void)
 {
 	return dev;
 }
 
 int
-hotroot()
+hotroot(void)
 {
 	return hot;
 }
 
 /*VARARGS*/
 void
-#if __STDC__
 errexit(const char *fmt, ...)
-#else
-errexit(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	const char *fmt;
-
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#endif
 	(void) vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	exit(8);
 }
 
 static void
-vmsg(fatal, fmt, ap)
-	int fatal;
-	const char *fmt;
-	va_list ap;
+vmsg(int fatal, const char *fmt, va_list ap)
 {
 	if (!fatal && preen)
 		(void) printf("%s: ", dev);
@@ -136,82 +115,45 @@ vmsg(fatal, fmt, ap)
 
 /*VARARGS*/
 void
-#if __STDC__
 pfatal(const char *fmt, ...)
-#else
-pfatal(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	const char *fmt;
-
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#endif
 	vmsg(1, fmt, ap);
 	va_end(ap);
 }
 
 /*VARARGS*/
 void
-#if __STDC__
 pwarn(const char *fmt, ...)
-#else
-pwarn(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	const char *fmt;
 
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#endif
+	va_start(ap, fmt);
 	vmsg(0, fmt, ap);
 	va_end(ap);
 }
 
 void
-perror(s)
-	const char *s;
+perror(const char *s)
 {
 	pfatal("%s (%s)", s, strerror(errno));
 }
 
 void
-#if __STDC__
 panic(const char *fmt, ...)
-#else
-panic(va_alist)
-	va_dcl
-#endif
 {
 	va_list ap;
 
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	const char *fmt;
-
-	va_start(ap);
-	fmt = va_arg(ap, const char *);
-#endif
 	vmsg(1, fmt, ap);
 	va_end(ap);
 	exit(8);
 }
 
 const char *
-unrawname(name)
-	const char *name;
+unrawname(const char *name)
 {
 	static char unrawbuf[32];
 	const char *dp;
@@ -230,8 +172,7 @@ unrawname(name)
 }
 
 const char *
-rawname(name)
-	const char *name;
+rawname(const char *name)
 {
 	static char rawbuf[32];
 	const char *dp;
@@ -243,8 +184,7 @@ rawname(name)
 }
 
 const char *
-devcheck(origname)
-	const char *origname;
+devcheck(const char *origname)
 {
 	struct stat stslash, stchar;
 
@@ -269,8 +209,7 @@ devcheck(origname)
  * Get the mount point information for name.
  */
 struct statfs *
-getmntpt(name)
-	const char *name;
+getmntpt(const char *name)
 {
 	struct stat devstat, mntdevstat;
 	char device[sizeof(_PATH_DEV) - 1 + MNAMELEN];
@@ -306,69 +245,9 @@ getmntpt(name)
 	return (statfsp);
 }
 
-#if 0
-/*
- * XXX this code is from NetBSD, but fails in FreeBSD because we
- * don't have blockdevs. I don't think its needed.
- */
-const char *
-blockcheck(origname)
-	const char *origname;
-{
-	struct stat stslash, stblock, stchar;
-	const char *newname, *raw;
-	struct fstab *fsp;
-	int retried = 0;
-
-	hot = 0;
-	if (stat("/", &stslash) < 0) {
-		perror("/");
-		printf("Can't stat root\n");
-		return (origname);
-	}
-	newname = origname;
-retry:
-	if (stat(newname, &stblock) < 0) {
-		perror(newname);
-		printf("Can't stat %s\n", newname);
-		return (origname);
-	}
-	if (S_ISBLK(stblock.st_mode)) {
-		if (stslash.st_dev == stblock.st_rdev)
-			hot++;
-		raw = rawname(newname);
-		if (stat(raw, &stchar) < 0) {
-			perror(raw);
-			printf("Can't stat %s\n", raw);
-			return (origname);
-		}
-		if (S_ISCHR(stchar.st_mode)) {
-			return (raw);
-		} else {
-			printf("%s is not a character device\n", raw);
-			return (origname);
-		}
-	} else if (S_ISCHR(stblock.st_mode) && !retried) {
-		newname = unrawname(newname);
-		retried++;
-		goto retry;
-	} else if ((fsp = getfsfile(newname)) != 0 && !retried) {
-		newname = fsp->fs_spec;
-		retried++;
-		goto retry;
-	}
-	/*
-	 * Not a block or character device, just return name and
-	 * let the user decide whether to use it.
-	 */
-	return (origname);
-}
-#endif
-
 
 void *
-emalloc(s)
-	size_t s;
+emalloc(size_t s)
 {
 	void *p;
 
@@ -380,9 +259,7 @@ emalloc(s)
 
 
 void *
-erealloc(p, s)
-	void *p;
-	size_t s;
+erealloc(void *p, size_t s)
 {
 	void *q;
 
@@ -394,8 +271,7 @@ erealloc(p, s)
 
 
 char *
-estrdup(s)
-	const char *s;
+estrdup(const char *s)
 {
 	char *p;
 
diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h
index 19f85fd..3950f55 100644
--- a/sbin/fsck/fsutil.h
+++ b/sbin/fsck/fsutil.h
@@ -31,28 +31,25 @@
  * $FreeBSD$
  */
 
-void perror __P((const char *));
-void errexit __P((const char *, ...))
+void perror(const char *);
+void errexit(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));  
-void pfatal __P((const char *, ...))
+void pfatal(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));  
-void pwarn __P((const char *, ...))
+void pwarn(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));  
-void panic __P((const char *, ...))
+void panic(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));  
-const char *rawname __P((const char *));
-const char *unrawname __P((const char *));
-#if 0
-const char *blockcheck __P((const char *));
-#endif
-const char *devcheck __P((const char *));
-const char *cdevname __P((void));
-void setcdevname __P((const char *, int));
-struct statfs *getmntpt __P((const char *));
-int  hotroot __P((void));
-void *emalloc __P((size_t));
-void *erealloc __P((void *, size_t));
-char *estrdup __P((const char *));
+const char *rawname(const char *);
+const char *unrawname(const char *);
+const char *devcheck(const char *);
+const char *cdevname(void);
+void setcdevname(const char *, int);
+struct statfs *getmntpt(const char *);
+int  hotroot(void);
+void *emalloc(size_t);
+void *erealloc(void *, size_t);
+char *estrdup(const char *);
 
 #define	CHECK_PREEN	0x0001
 #define	CHECK_VERBOSE	0x0002
@@ -61,5 +58,5 @@ char *estrdup __P((const char *));
 #define	DO_BACKGRD	0x0010
 
 struct fstab;
-int checkfstab __P((int, int (*)(struct fstab *), 
-    int (*) (const char *, const char *, const char *, char *, pid_t *)));
+int checkfstab(int, int (*)(struct fstab *), 
+    int (*) (const char *, const char *, const char *, char *, pid_t *));
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index ac15385..c26f23b 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -79,18 +79,15 @@ TAILQ_HEAD(disk, diskentry) diskh;
 
 static int nrun = 0, ndisks = 0;
 
-static struct diskentry *finddisk __P((const char *));
-static void addpart __P((const char *, const char *, const char *));
-static int startdisk __P((struct diskentry *, 
-    int (*)(const char *, const char *, const char *, char *, pid_t *)));
-static void printpart __P((void));
+static struct diskentry *finddisk(const char *);
+static void addpart(const char *, const char *, const char *);
+static int startdisk(struct diskentry *, 
+    int (*)(const char *, const char *, const char *, char *, pid_t *));
+static void printpart(void);
 
 int
-checkfstab(flags, docheck, checkit)
-	int flags;
-	int (*docheck) __P((struct fstab *));
-	int (*checkit) __P((const char *, const char *, const char *, char *,
-	    pid_t *));
+checkfstab(int flags, int (*docheck)(struct fstab *), 
+    int (*checkit)(const char *, const char *, const char *, char *, pid_t *))
 {
 	struct fstab *fs;
 	struct diskentry *d, *nextdisk;
@@ -247,8 +244,7 @@ checkfstab(flags, docheck, checkit)
 
 
 static struct diskentry *
-finddisk(name)
-	const char *name;
+finddisk(const char *name)
 {
 	const char *p;
 	size_t len = 0;
@@ -285,7 +281,7 @@ finddisk(name)
 
 
 static void
-printpart()
+printpart(void)
 {
 	struct diskentry *d;
 	struct partentry *p;
@@ -300,8 +296,7 @@ printpart()
 
 
 static void
-addpart(type, devname, mntpt)
-	const char *type, *devname, *mntpt;
+addpart(const char *type, const char *devname, const char *mntpt)
 {
 	struct diskentry *d = finddisk(devname);
 	struct partentry *p;
@@ -322,10 +317,8 @@ addpart(type, devname, mntpt)
 
 
 static int
-startdisk(d, checkit)
-	struct diskentry *d;
-	int (*checkit) __P((const char *, const char *, const char *, char *,
-	    pid_t *));
+startdisk(struct diskentry *d, int (*checkit)(const char *, const char *,
+    const char *, char *, pid_t *))
 {
 	struct partentry *p = TAILQ_FIRST(&d->d_part);
 	int rv;