o __P has been reoved

o Old-style K&R declarations have been converted to new C89 style
o register has been removed
o prototype for main() has been removed (gcc3 makes it an error)
o int main(int argc, char *argv[]) is the preferred main definition.
o Attempt to not break style(9) conformance for declarations more than
  they already are.

Approved by: arch@, new style(9)

1 files changed, 23 insertions, 41 deletions

diff --git a/bin/df/df.c b/bin/df/df.c
index f244c26..9ed8442 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -96,27 +96,24 @@ typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t;
 
 int unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA };
 
-int	  bread __P((off_t, void *, int));
-int	  checkvfsname __P((const char *, char **));
-char	 *getmntpt __P((char *));
-int	  main __P((int, char *[]));
-char	 *makenetvfslist __P((void));
-char	**makevfslist __P((char *));
-void	  prthuman __P((struct statfs *, long));
-void	  prthumanval __P((double));
-void	  prtstat __P((struct statfs *, int));
-long	  regetmntinfo __P((struct statfs **, long, char **));
-int	  ufs_df __P((char *, int));
-unit_t	  unit_adjust __P((double *));
-void	  usage __P((void));
+int	  bread(off_t, void *, int);
+int	  checkvfsname(const char *, char **);
+char	 *getmntpt(char *);
+char	 *makenetvfslist(void);
+char	**makevfslist(char *);
+void	  prthuman(struct statfs *, long);
+void	  prthumanval(double);
+void	  prtstat(struct statfs *, int);
+long	  regetmntinfo(struct statfs **, long, char **);
+int	  ufs_df(char *, int);
+unit_t	  unit_adjust(double *);
+void	  usage(void);
 
 int	aflag = 0, hflag, iflag, nflag;
 struct	ufs_args mdev;
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	struct stat stbuf;
 	struct statfs statfsbuf, *mntbuf;
@@ -269,8 +266,7 @@ main(argc, argv)
 }
 
 char *
-getmntpt(name)
-	char *name;
+getmntpt(char *name)
 {
 	long mntsize, i;
 	struct statfs *mntbuf;
@@ -289,10 +285,7 @@ getmntpt(name)
  * current (not cached) info.  Returns the new count of valid statfs bufs.
  */
 long
-regetmntinfo(mntbufp, mntsize, vfslist)
-	struct statfs **mntbufp;
-	long mntsize;
-	char **vfslist;
+regetmntinfo(struct statfs **mntbufp, long mntsize, char **vfslist)
 {
 	int i, j;
 	struct statfs *mntbuf;
@@ -320,8 +313,7 @@ regetmntinfo(mntbufp, mntsize, vfslist)
  *
  */
 unit_t
-unit_adjust(val)
-	double *val;
+unit_adjust(double *val)
 {
 	double abval;
 	unit_t unit;
@@ -342,9 +334,7 @@ unit_adjust(val)
 }
 
 void
-prthuman(sfsp, used)
-	struct statfs *sfsp;
-	long used;
+prthuman(struct statfs *sfsp, long used)
 {
 
 	prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize);
@@ -353,8 +343,7 @@ prthuman(sfsp, used)
 }
 
 void
-prthumanval(bytes)
-	double bytes;
+prthumanval(double bytes)
 {
 
 	unit_t unit;
@@ -380,9 +369,7 @@ prthumanval(bytes)
  * Print out status about a filesystem.
  */
 void
-prtstat(sfsp, maxwidth)
-	struct statfs *sfsp;
-	int maxwidth;
+prtstat(struct statfs *sfsp, int maxwidth)
 {
 	static long blocksize;
 	static int headerlen, timesthrough;
@@ -447,9 +434,7 @@ union {
 int	rfd;
 
 int
-ufs_df(file, maxwidth)
-	char *file;
-	int maxwidth;
+ufs_df(char *file, int maxwidth)
 {
 	struct statfs statfsbuf;
 	struct statfs *sfsp;
@@ -491,10 +476,7 @@ ufs_df(file, maxwidth)
 }
 
 int
-bread(off, buf, cnt)
-	off_t off;
-	void *buf;
-	int cnt;
+bread(off_t off, void *buf, int cnt)
 {
 	ssize_t nr;
 
@@ -510,7 +492,7 @@ bread(off, buf, cnt)
 }
 
 void
-usage()
+usage(void)
 {
 
 	(void)fprintf(stderr,
@@ -519,7 +501,7 @@ usage()
 }
 
 char *
-makenetvfslist()
+makenetvfslist(void)
 {
 	char *str, *strptr, **listptr;
 	int mib[3], maxvfsconf, cnt=0, i;