o __P removed

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

1 files changed, 17 insertions, 81 deletions

diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 1067693..2595b16 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -62,8 +62,7 @@ static const char rcsid[] =
 long	diskreads, totalreads;	/* Disk cache statistics */
 
 int
-ftypeok(dp)
-	struct dinode *dp;
+ftypeok(struct dinode *dp)
 {
 	switch (dp->di_mode & IFMT) {
 
@@ -84,8 +83,7 @@ ftypeok(dp)
 }
 
 int
-reply(question)
-	char *question;
+reply(char *question)
 {
 	int persevere;
 	char c;
@@ -125,8 +123,7 @@ reply(question)
  * Look up state information for an inode.
  */
 struct inostat *
-inoinfo(inum)
-	ino_t inum;
+inoinfo(ino_t inum)
 {
 	static struct inostat unallocated = { USTATE, 0, 0 };
 	struct inostatlist *ilp;
@@ -145,7 +142,7 @@ inoinfo(inum)
  * Malloc buffers and set up cache.
  */
 void
-bufinit()
+bufinit(void)
 {
 	struct bufarea *bp;
 	long bufcnt, i;
@@ -183,9 +180,7 @@ bufinit()
  * Manage a cache of directory blocks.
  */
 struct bufarea *
-getdatablk(blkno, size)
-	ufs_daddr_t blkno;
-	long size;
+getdatablk(ufs_daddr_t blkno, long size)
 {
 	struct bufarea *bp;
 
@@ -212,10 +207,7 @@ foundit:
 }
 
 void
-getblk(bp, blk, size)
-	struct bufarea *bp;
-	ufs_daddr_t blk;
-	long size;
+getblk(struct bufarea *bp, ufs_daddr_t blk, long size)
 {
 	ufs_daddr_t dblk;
 
@@ -230,9 +222,7 @@ getblk(bp, blk, size)
 }
 
 void
-flush(fd, bp)
-	int fd;
-	struct bufarea *bp;
+flush(int fd, struct bufarea *bp)
 {
 	int i, j;
 
@@ -260,9 +250,7 @@ flush(fd, bp)
 }
 
 void
-rwerror(mesg, blk)
-	char *mesg;
-	ufs_daddr_t blk;
+rwerror(char *mesg, ufs_daddr_t blk)
 {
 
 	if (bkgrdcheck)
@@ -275,8 +263,7 @@ rwerror(mesg, blk)
 }
 
 void
-ckfini(markclean)
-	int markclean;
+ckfini(int markclean)
 {
 	struct bufarea *bp, *nbp;
 	int ofsmodified, cnt = 0;
@@ -348,11 +335,7 @@ ckfini(markclean)
 }
 
 int
-bread(fd, buf, blk, size)
-	int fd;
-	char *buf;
-	ufs_daddr_t blk;
-	long size;
+bread(int fd, char *buf, ufs_daddr_t blk, long size)
 {
 	char *cp;
 	int i, errs;
@@ -389,11 +372,7 @@ bread(fd, buf, blk, size)
 }
 
 void
-bwrite(fd, buf, blk, size)
-	int fd;
-	char *buf;
-	ufs_daddr_t blk;
-	long size;
+bwrite(int fd, char *buf, ufs_daddr_t blk, long size)
 {
 	int i;
 	char *cp;
@@ -427,8 +406,7 @@ bwrite(fd, buf, blk, size)
  * allocate a data block with the specified number of fragments
  */
 ufs_daddr_t
-allocblk(frags)
-	long frags;
+allocblk(long frags)
 {
 	int i, j, k, cg, baseblk;
 	struct cg *cgp = &cgrp;
@@ -471,9 +449,7 @@ allocblk(frags)
  * Free a previously allocated block
  */
 void
-freeblk(blkno, frags)
-	ufs_daddr_t blkno;
-	long frags;
+freeblk(ufs_daddr_t blkno, long frags)
 {
 	struct inodesc idesc;
 
@@ -486,9 +462,7 @@ freeblk(blkno, frags)
  * Find a pathname
  */
 void
-getpathname(namebuf, curdir, ino)
-	char *namebuf;
-	ino_t curdir, ino;
+getpathname(char *namebuf, ino_t curdir, ino_t ino)
 {
 	int len;
 	char *cp;
@@ -543,8 +517,7 @@ getpathname(namebuf, curdir, ino)
 }
 
 void
-catch(sig)
-	int sig;
+catch(int sig)
 {
 	if (!doinglevel2)
 		ckfini(0);
@@ -557,8 +530,7 @@ catch(sig)
  * so that reboot sequence may be interrupted.
  */
 void
-catchquit(sig)
-	int sig;
+catchquit(int sig)
 {
 	printf("returning to single-user after filesystem check\n");
 	returntosingle = 1;
@@ -569,9 +541,7 @@ catchquit(sig)
  * determine whether an inode should be fixed.
  */
 int
-dofix(idesc, msg)
-	struct inodesc *idesc;
-	char *msg;
+dofix(struct inodesc *idesc, char *msg)
 {
 
 	switch (idesc->id_fix) {
@@ -607,11 +577,7 @@ dofix(idesc, msg)
 	return (0);
 }
 
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 /*
  * An unexpected inconsistency occured.
@@ -619,20 +585,10 @@ dofix(idesc, msg)
  * otherwise just print message and continue.
  */
 void
-#if __STDC__
 pfatal(const char *fmt, ...)
-#else
-pfatal(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	if (!preen) {
 		(void)vfprintf(stdout, fmt, ap);
 		va_end(ap);
@@ -680,20 +636,10 @@ pfatal(fmt, va_alist)
  * protocol, or a warning (preceded by filename) when preening.
  */
 void
-#if __STDC__
 pwarn(const char *fmt, ...)
-#else
-pwarn(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	if (preen)
 		(void)fprintf(stdout, "%s: ", cdevname);
 	(void)vfprintf(stdout, fmt, ap);
@@ -704,20 +650,10 @@ pwarn(fmt, va_alist)
  * Stub for routines from kernel.
  */
 void
-#if __STDC__
 panic(const char *fmt, ...)
-#else
-panic(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	pfatal("INTERNAL INCONSISTENCY:");
 	(void)vfprintf(stdout, fmt, ap);
 	va_end(ap);