From 11dc480601ab886610b488f39a725275cc5e8552 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Tue, 17 Jan 2012 22:19:35 +0000 Subject: [PATCH] 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. --- sbin/growfs/growfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index 18b4a056c470..3e9ba1ae4a7a 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -374,7 +374,9 @@ initcg(int cylno, time_t modtime, int fso, unsigned int Nflag) 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 fso, unsigned int Nflag) 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++;