From owner-svn-src-all@FreeBSD.ORG  Fri Mar  9 21:02:40 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1B244106566B;
	Fri,  9 Mar 2012 21:02:40 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 076768FC12;
	Fri,  9 Mar 2012 21:02:40 +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 q29L2dj9025157;
	Fri, 9 Mar 2012 21:02:39 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q29L2d3T025154;
	Fri, 9 Mar 2012 21:02:39 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203092102.q29L2d3T025154@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 9 Mar 2012 21:02:39 +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: r232749 - head/sbin/fsdb
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 &quot;
	user&quot; and &quot; projects&quot; \)" <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: Fri, 09 Mar 2012 21:02:40 -0000

Author: dim
Date: Fri Mar  9 21:02:39 2012
New Revision: 232749
URL: http://svn.freebsd.org/changeset/base/232749

Log:
  Partially undo r228693, by removing NO_WFORMAT.clang in fsdb's Makefile,
  and fixing the format string in sbin/fsdb/fsdbutil.c instead.
  
  Note the remark "Work around a problem with format string warnings and
  ntohs macros" was actually incorrect.  The DIP(dp, di_nlink) macro
  invocation actually returned an int, due to its ternary expression, even
  though the di_nlink members of struct ufs1_dinode and struct ufs2_dinode
  are both defined as int16_t.
  
  MFC after:	2 weeks

Modified:
  head/sbin/fsdb/Makefile
  head/sbin/fsdb/fsdbutil.c

Modified: head/sbin/fsdb/Makefile
==============================================================================
--- head/sbin/fsdb/Makefile	Fri Mar  9 20:50:15 2012	(r232748)
+++ head/sbin/fsdb/Makefile	Fri Mar  9 21:02:39 2012	(r232749)
@@ -9,8 +9,6 @@ SRCS=	fsdb.c fsdbutil.c \
 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
 CFLAGS+= -I${.CURDIR}/../fsck_ffs
 WARNS?= 2
-# Work around a problem with format string warnings and ntohs macros.
-NO_WFORMAT.clang=
 LDADD=	-ledit -ltermcap
 DPADD=	${LIBEDIT} ${LIBTERMCAP}
 .PATH:	${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs

Modified: head/sbin/fsdb/fsdbutil.c
==============================================================================
--- head/sbin/fsdb/fsdbutil.c	Fri Mar  9 20:50:15 2012	(r232748)
+++ head/sbin/fsdb/fsdbutil.c	Fri Mar  9 21:02:39 2012	(r232749)
@@ -193,7 +193,7 @@ printstat(const char *cp, ino_t inum, un
 
     blocks = DIP(dp, di_blocks);
     gen = DIP(dp, di_gen);
-    printf("LINKCNT=%hd FLAGS=%#x BLKCNT=%jx GEN=%jx\n", DIP(dp, di_nlink),
+    printf("LINKCNT=%d FLAGS=%#x BLKCNT=%jx GEN=%jx\n", DIP(dp, di_nlink),
 	DIP(dp, di_flags), (intmax_t)blocks, (intmax_t)gen);
 }