From owner-svn-src-head@freebsd.org  Sun Apr 24 20:31:23 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C002B1BAB9;
 Sun, 24 Apr 2016 20:31:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DCB217B7;
 Sun, 24 Apr 2016 20:31:23 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OKVMaW048970;
 Sun, 24 Apr 2016 20:31:22 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OKVMFC048969;
 Sun, 24 Apr 2016 20:31:22 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201604242031.u3OKVMFC048969@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sun, 24 Apr 2016 20:31:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298551 - head/sbin/fsck_ffs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Apr 2016 20:31:23 -0000

Author: pfg
Date: Sun Apr 24 20:31:22 2016
New Revision: 298551
URL: https://svnweb.freebsd.org/changeset/base/298551

Log:
  fsck_ffs: Adopt some type safety for the journalling checks.
  
  fs_ncg is of type uint32, and we were indexing it with an int.
  Fixed this using an unsigned type and adopt some other unsigned
  indexes to remind us when we are dealing with unsigned numbers.
  
  Reviewed by:	mckusick
  MFC after:	5 days

Modified:
  head/sbin/fsck_ffs/suj.c

Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c	Sun Apr 24 19:25:11 2016	(r298550)
+++ head/sbin/fsck_ffs/suj.c	Sun Apr 24 20:31:22 2016	(r298551)
@@ -217,7 +217,7 @@ static void
 closedisk(const char *devnam)
 {
 	struct csum *cgsum;
-	int i;
+	u_int i;
 
 	/*
 	 * Recompute the fs summary info from correct cs summaries.
@@ -2252,7 +2252,7 @@ suj_build(void)
 	struct suj_seg *seg;
 	union jrec *rec;
 	int off;
-	int i;
+	u_int i;
 
 	TAILQ_FOREACH(seg, &allsegs, ss_next) {
 		if (debug)
@@ -2540,10 +2540,10 @@ suj_read(void)
 	struct jsegrec *rec;
 	ufs2_daddr_t blk;
 	int readsize;
-	int blocks;
+	u_int blocks;
 	int recsize;
 	int size;
-	int i;
+	u_int i;
 
 	/*
 	 * Read records until we exhaust the journal space.  If we find