From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Thu, 19 Oct 2006 21:22:13 +0000 (+0000)
Subject: WARNS6 cleanups for quotacheck.
X-Git-Tag: v2.0.1~4242
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/7e827f61ef829cab559104ac60f79bfde4eedcb7

WARNS6 cleanups for quotacheck.
---

diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 05df069161..8e2d1c8d87 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -32,7 +32,7 @@
  *
  * @(#)preen.c	8.5 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $
- * $DragonFly: src/sbin/fsck/preen.c,v 1.9 2005/11/06 12:13:53 swildner Exp $
+ * $DragonFly: src/sbin/fsck/preen.c,v 1.10 2006/10/19 21:22:13 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -70,7 +70,7 @@ static int startdisk(struct disk *dk,
 		int (*checkit)(char *, char *, long, int));
 
 int
-checkfstab(int preen, int maxrun, int (*docheck)(struct fstab *),
+checkfstab(int do_preen, int maxrun, int (*docheck)(struct fstab *),
            int (*chkit)(char *, char *, long, int))
 {
 	struct fstab *fsp;
@@ -90,13 +90,13 @@ checkfstab(int preen, int maxrun, int (*docheck)(struct fstab *),
 		while ((fsp = getfsent()) != 0) {
 			if ((auxdata = (*docheck)(fsp)) == 0)
 				continue;
-			if (preen == 0 ||
+			if (do_preen == 0 ||
 			    (passno == 1 && fsp->fs_passno == 1)) {
 				if ((name = blockcheck(fsp->fs_spec)) != 0) {
 					if ((sumstatus = (*chkit)(name,
 					    fsp->fs_file, auxdata, 0)) != 0)
 						return (sumstatus);
-				} else if (preen)
+				} else if (do_preen)
 					return (8);
 			} else if (passno == 2 && fsp->fs_passno > 1) {
 				if ((name = blockcheck(fsp->fs_spec)) == NULL) {
@@ -108,10 +108,10 @@ checkfstab(int preen, int maxrun, int (*docheck)(struct fstab *),
 				addpart(name, fsp->fs_file, auxdata);
 			}
 		}
-		if (preen == 0)
+		if (do_preen == 0)
 			return (0);
 	}
-	if (preen) {
+	if (do_preen) {
 		if (maxrun == 0)
 			maxrun = ndisks;
 		if (maxrun > ndisks)
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index 14d66f67e0..ea3d0cc84c 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD: src/sbin/quotacheck/Makefile,v 1.2.14.1 2001/04/25 10:58:46 ru Exp $
-# $DragonFly: src/sbin/quotacheck/Makefile,v 1.3 2006/10/17 00:55:43 pavalos Exp $
+# $DragonFly: src/sbin/quotacheck/Makefile,v 1.4 2006/10/19 21:22:13 pavalos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 PROG=	quotacheck
 SRCS=	quotacheck.c preen.c
 MAN=	quotacheck.8
 .PATH:	${.CURDIR}/../fsck
-WARNS?=	0
 
 .include <bsd.prog.mk>
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index a165bcf052..bf96adad75 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)quotacheck.c	8.3 (Berkeley) 1/29/94
  * $FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.11 1999/08/28 00:14:01 peter Exp $
- * $DragonFly: src/sbin/quotacheck/quotacheck.c,v 1.9 2006/04/03 01:58:49 dillon Exp $
+ * $DragonFly: src/sbin/quotacheck/quotacheck.c,v 1.10 2006/10/19 21:22:13 pavalos Exp $
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <string.h>
 #include <unistd.h>
 
-char *qfname = QUOTAFILENAME;
-char *qfextension[] = INITQFNAMES;
-char *quotagroup = QUOTAGROUP;
+const char *qfname = QUOTAFILENAME;
+const char *qfextension[] = INITQFNAMES;
+const char *quotagroup = QUOTAGROUP;
 
 union {
 	struct	fs	sblk;
@@ -70,7 +70,7 @@ union {
 } un;
 #define	sblock	un.sblk
 long dev_bsize = 1;
-long maxino;
+ino_t maxino;
 
 struct quotaname {
 	long	flags;
@@ -102,8 +102,8 @@ struct fileusage *
 	 addid(u_long, int, char *);
 char	*blockcheck(char *);
 void	 bread(daddr_t, char *, long);
-extern int checkfstab(int, int, int (*)(struct fstab *),
-				int (*)(char *, char *, long, int));
+extern int checkfstab(int, int, void * (*)(struct fstab *),
+				int (*)(char *, char *, struct quotaname *));
 int	 chkquota(char *, char *, struct quotaname *);
 void	 freeinodebuf(void);
 struct ufs1_dinode *
@@ -522,7 +522,7 @@ getnextinode(ino_t inumber)
 	static struct ufs1_dinode *dp;
 
 	if (inumber != nextino++ || inumber > maxino)
-		errx(1, "bad inode number %d to nextinode", inumber);
+		errx(1, "bad inode number %llu to nextinode", inumber);
 	if (inumber >= lastinum) {
 		readcnt++;
 		dblk = fsbtodb(&sblock, ino_to_fsba(&sblock, lastinum));