From: Nathan Scott <nathans@debian.org>
Date: Sat, 3 May 2014 06:09:03 +0000 (+1000)
Subject: Fix 32 bit build warning in libxfs, xfs_daddr_t printing
X-Git-Tag: v3.2.0-rc3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b47c8cae3637a81c50a7f1e42938fc20d947f3aa;p=thirdparty%2Fxfsprogs-dev.git

Fix 32 bit build warning in libxfs, xfs_daddr_t printing

Add the usual type casts to resolve the following warnings:
rdwr.c: In function 'libxfs_getbufr_map':
rdwr.c:499:4: warning: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'xfs_daddr_t' [-Wformat]
rdwr.c:499:4: warning: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'xfs_daddr_t' [-Wformat]

Signed-off-by: Nathan Scott <nathans@debian.org>
---

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index ea4bdfd58..57c12c1d4 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -495,8 +495,9 @@ libxfs_getbufr_map(struct xfs_buftarg *btp, xfs_daddr_t blkno, int bblen,
 
 	if (blkno != map[0].bm_bn) {
 		fprintf(stderr,
-			_("%s: %s map blkno %lx doesn't match key %lx\n"),
-			progname, __FUNCTION__, map[0].bm_bn, blkno);
+			_("%s: %s map blkno 0x%llx doesn't match key 0x%llx\n"),
+			progname, __FUNCTION__, (long long)map[0].bm_bn,
+			(long long)blkno);
 		exit(1);
 	}