Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Apr 2015 12:48:49 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r281929 - head/sbin/growfs
Message-ID:  <201504241248.t3OCmn5A065761@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Fri Apr 24 12:48:48 2015
New Revision: 281929
URL: https://svnweb.freebsd.org/changeset/base/281929

Log:
  Fix growfs(8) build with debug enabled (make -DGFSDBG).
  
  PR:		199641
  Submitted by:	Willem Jan Withagen <wjw at digiware dot nl>
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sbin/growfs/Makefile
  head/sbin/growfs/growfs.c

Modified: head/sbin/growfs/Makefile
==============================================================================
--- head/sbin/growfs/Makefile	Fri Apr 24 11:03:47 2015	(r281928)
+++ head/sbin/growfs/Makefile	Fri Apr 24 12:48:48 2015	(r281929)
@@ -4,8 +4,6 @@
 # $FreeBSD$
 #
 
-#GFSDBG=
-
 .include <src.opts.mk>
 
 .PATH:	${.CURDIR}/../mount
@@ -16,7 +14,9 @@ MAN=	growfs.8
 CFLAGS+=-I${.CURDIR}/../mount
 
 .if defined(GFSDBG)
-SRCS+=  debug.c
+SRCS+=	debug.c
+CFLAGS+= -DFS_DEBUG
+NO_WCAST_ALIGN= yes
 .endif  
 
 LIBADD=	util

Modified: head/sbin/growfs/growfs.c
==============================================================================
--- head/sbin/growfs/growfs.c	Fri Apr 24 11:03:47 2015	(r281928)
+++ head/sbin/growfs/growfs.c	Fri Apr 24 12:48:48 2015	(r281929)
@@ -161,7 +161,7 @@ growfs(int fsi, int fso, unsigned int Nf
 #ifdef FS_DEBUG
 	{
 		struct csum *dbg_csp;
-		int dbg_csc;
+		u_int32_t dbg_csc;
 		char dbg_line[80];
 
 		dbg_csp = fscs;
@@ -242,7 +242,7 @@ growfs(int fsi, int fso, unsigned int Nf
 #ifdef FS_DEBUG
 	{
 		struct csum	*dbg_csp;
-		int	dbg_csc;
+		u_int32_t	dbg_csc;
 		char	dbg_line[80];
 
 		dbg_csp = fscs;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504241248.t3OCmn5A065761>