From owner-svn-src-stable-9@FreeBSD.ORG  Sat Jun 23 18:54:25 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B44DA1065674;
	Sat, 23 Jun 2012 18:54:25 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E5568FC18;
	Sat, 23 Jun 2012 18:54:25 +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 q5NIsPM1058397;
	Sat, 23 Jun 2012 18:54:25 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5NIsP26058395;
	Sat, 23 Jun 2012 18:54:25 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201206231854.q5NIsP26058395@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 23 Jun 2012 18:54:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237496 - stable/9/sbin/growfs
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jun 2012 18:54:25 -0000

Author: trasz
Date: Sat Jun 23 18:54:24 2012
New Revision: 237496
URL: http://svn.freebsd.org/changeset/base/237496

Log:
  MFC r230289 by ed@:
  
  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:
  stable/9/sbin/growfs/growfs.c
Directory Properties:
  stable/9/sbin/growfs/   (props changed)

Modified: stable/9/sbin/growfs/growfs.c
==============================================================================
--- stable/9/sbin/growfs/growfs.c	Sat Jun 23 18:51:33 2012	(r237495)
+++ stable/9/sbin/growfs/growfs.c	Sat Jun 23 18:54:24 2012	(r237496)
@@ -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++;