diff options
| author | dim <dim@FreeBSD.org> | 2011-12-18 17:42:26 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-12-18 17:42:26 +0000 |
| commit | f0e45fd7759501ef8a95d542c1d70be3ddf200b6 (patch) | |
| tree | dfd8601a538689393bd5d58e432b7ab87a79ed30 /sbin | |
| parent | 50a0ec76972019d46a372f6db8c487475616832b (diff) | |
| download | FreeBSD-src-f0e45fd7759501ef8a95d542c1d70be3ddf200b6.zip FreeBSD-src-f0e45fd7759501ef8a95d542c1d70be3ddf200b6.tar.gz | |
Revert r228603, and add the workaround to sbin/fsdb/Makefile instead.
MFC after: 1 week
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/fsdb/Makefile | 4 | ||||
| -rw-r--r-- | sbin/fsdb/fsdbutil.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index 65333ef..038f82e 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -9,6 +9,10 @@ SRCS= fsdb.c fsdbutil.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c CFLAGS+= -I${.CURDIR}/../fsck_ffs WARNS?= 2 +.if ${CC:T:Mclang} == "clang" +# Work around a problem with format string warnings and ntohs macros. +NO_WFORMAT= +.endif LDADD= -ledit -ltermcap DPADD= ${LIBEDIT} ${LIBTERMCAP} .PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index 102d45c..7ed78a7 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -193,9 +193,8 @@ printstat(const char *cp, ino_t inum, union dinode *dp) blocks = DIP(dp, di_blocks); gen = DIP(dp, di_gen); - printf("LINKCNT=%hd FLAGS=%#x BLKCNT=%jx GEN=%jx\n", - (short)DIP(dp, di_nlink), DIP(dp, di_flags), (intmax_t)blocks, - (intmax_t)gen); + printf("LINKCNT=%hd FLAGS=%#x BLKCNT=%jx GEN=%jx\n", DIP(dp, di_nlink), + DIP(dp, di_flags), (intmax_t)blocks, (intmax_t)gen); } |
