svn commit: r232749 - head/sbin/fsdb

[Dimitry Andric]

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);
 }