svn commit: r298679 - head/sbin/fsck_ffs

[Pedro F. Giffuni]

Author: pfg
Date: Wed Apr 27 01:32:11 2016
New Revision: 298679
URL: https://svnweb.freebsd.org/changeset/base/298679

Log:
  fsck_ffs: Revert partially the unsigned changes.
  
  Any value of uint16_t will be internally promoted to int so
  changing them to an unsigned value doesn't help.
  
  Make clear we want to use uint32_t for closedisk()
  
  X-MFC with:	r298551

Modified:
  head/sbin/fsck_ffs/suj.c

Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c	Wed Apr 27 00:10:32 2016	(r298678)
+++ head/sbin/fsck_ffs/suj.c	Wed Apr 27 01:32:11 2016	(r298679)
@@ -217,7 +217,7 @@ static void
 closedisk(const char *devnam)
 {
 	struct csum *cgsum;
-	u_int i;
+	uint32_t 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;
-	u_int i;
+	int i;
 
 	TAILQ_FOREACH(seg, &allsegs, ss_next) {
 		if (debug)
@@ -2540,7 +2540,7 @@ suj_read(void)
 	struct jsegrec *rec;
 	ufs2_daddr_t blk;
 	int readsize;
-	u_int blocks;
+	int blocks;
 	int recsize;
 	int size;
 	u_int i;