From owner-svn-src-all@FreeBSD.ORG Tue Jan 17 22:19:36 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0A816106567F;
Tue, 17 Jan 2012 22:19:36 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id ED9F58FC1C;
Tue, 17 Jan 2012 22:19:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0HMJZAM010136;
Tue, 17 Jan 2012 22:19:35 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0HMJZ0I010134;
Tue, 17 Jan 2012 22:19:35 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201201172219.q0HMJZ0I010134@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 17 Jan 2012 22:19:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r230289 - head/sbin/growfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2012 22:19:36 -0000
Author: ed
Date: Tue Jan 17 22:19:35 2012
New Revision: 230289
URL: http://svn.freebsd.org/changeset/base/230289
Log:
Allow growfs to be built with GCC 4.7 and -Werror.
The dp1 variable is only used when FSIRAND is defined. Just place the
variable behind #ifdefs entirely.
Modified:
head/sbin/growfs/growfs.c
Modified: head/sbin/growfs/growfs.c
==============================================================================
--- head/sbin/growfs/growfs.c Tue Jan 17 22:17:11 2012 (r230288)
+++ head/sbin/growfs/growfs.c Tue Jan 17 22:19:35 2012 (r230289)
@@ -374,7 +374,9 @@ initcg(int cylno, time_t modtime, int fs
static caddr_t iobuf;
long blkno, start;
ufs2_daddr_t i, cbase, dmax;
+#ifdef FSIRAND
struct ufs1_dinode *dp1;
+#endif
struct csum *cs;
uint d, dupper, dlower;
@@ -452,8 +454,8 @@ initcg(int cylno, time_t modtime, int fs
bzero(iobuf, sblock.fs_bsize);
for (i = 0; i < sblock.fs_ipg / INOPF(&sblock);
i += sblock.fs_frag) {
- dp1 = (struct ufs1_dinode *)(void *)iobuf;
#ifdef FSIRAND
+ dp1 = (struct ufs1_dinode *)(void *)iobuf;
for (j = 0; j < INOPB(&sblock); j++) {
dp1->di_gen = random();
dp1++;