From c6030c6511c69b69a216c893957b01bfc264d365 Mon Sep 17 00:00:00 2001
From: joerg <joerg@FreeBSD.org>
Date: Sun, 19 Mar 1995 13:29:28 +0000
Subject: You will find enclosed some changes to make gcc -Wall more happy in
 /usr/src/bin. Note that some patches are still needed in that directory.

I (Joerg) finished most of Philippe's cleanup.  /bin/sh will still
need *allot* of work, however.

Submitted by:	charnier@lirmm.fr (Philippe Charnier)
---
 bin/df/df.c | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'bin/df')

diff --git a/bin/df/df.c b/bin/df/df.c
index 5a53a34..6c42726 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: df.c,v 1.5 1994/09/24 02:55:11 davidg Exp $
  */
 
 #ifndef lint
@@ -76,29 +76,30 @@ struct typetab {
 	char *str;
 	long types;
 } typetab[] = {
-	"ufs",		MT(MOUNT_UFS),
-	"local",	MT_LOCAL,
-	"all",		MT_ALL,
-	"nfs",		MT(MOUNT_NFS),
-	"mfs",		MT(MOUNT_MFS),
-	"lfs",		MT(MOUNT_LFS),
-	"msdos",	MT(MOUNT_MSDOS),
-	"fdesc",	MT(MOUNT_FDESC),
-	"portal",	MT(MOUNT_PORTAL),
+	{"ufs",		MT(MOUNT_UFS)},
+	{"local",	MT_LOCAL},
+	{"all",		MT_ALL},
+	{"nfs",		MT(MOUNT_NFS)},
+	{"mfs",		MT(MOUNT_MFS)},
+	{"lfs",		MT(MOUNT_LFS)},
+	{"msdos",	MT(MOUNT_MSDOS)},
+	{"fdesc",	MT(MOUNT_FDESC)},
+	{"portal",	MT(MOUNT_PORTAL)},
 #if 0
 	/* return fsid of underlying FS */
-	"lofs",		MT(MOUNT_LOFS),
-	"null",		MT(MOUNT_NULL),
-	"umap",		MT(MOUNT_UMAP),
+	{"lofs",	MT(MOUNT_LOFS)},
+	{"null",	MT(MOUNT_NULL)},
+	{"umap",	MT(MOUNT_UMAP)},
 #endif
-	"kernfs",	MT(MOUNT_KERNFS),
-	"procfs",	MT(MOUNT_PROCFS),
-	"afs",		MT(MOUNT_AFS),
-	"iso9660fs",	MT(MOUNT_CD9660),
-	"cdfs",		MT(MOUNT_CD9660),
-	"misc",		MT(MOUNT_LOFS)|MT(MOUNT_FDESC)|MT(MOUNT_PORTAL)|
-			MT(MOUNT_KERNFS)|MT(MOUNT_PROCFS),
-	NULL,		0
+	{"kernfs",	MT(MOUNT_KERNFS)},
+	{"procfs",	MT(MOUNT_PROCFS)},
+	{"afs",		MT(MOUNT_AFS)},
+	{"iso9660fs",	MT(MOUNT_CD9660)},
+	{"cdfs",	MT(MOUNT_CD9660)},
+	{"misc",	MT(MOUNT_LOFS)|MT(MOUNT_FDESC)|MT(MOUNT_PORTAL)|
+			MT(MOUNT_KERNFS)|MT(MOUNT_PROCFS)},
+	{NULL,		0}
+	
 };
 
 long	addtype __P((long, char *));
@@ -124,6 +125,7 @@ main(argc, argv)
 	char *mntpt;
 
 	iflag = nflag = tflag = 0;
+	fsmask = MT_NONE;
 
 	while ((ch = getopt(argc, argv, "iknt:")) != EOF)
 		switch (ch) {
-- 
cgit v1.1