From 5e303e25794f80f06996fbb1ea69844a7ac24985 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 12 Jan 2017 14:12:41 -0600 Subject: [PATCH] xfsprogs: fix a couple 32-bit build warnings mremap_f can't turn a long long into a pointer, and dump_dirent needs proper %llx for u64 printing. Signed-off-by: Eric Sandeen Reviewed-by: Brian Foster Signed-off-by: Eric Sandeen --- io/mmap.c | 4 ++-- io/readdir.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/io/mmap.c b/io/mmap.c index e2d8d5a92..7a8150e3d 100644 --- a/io/mmap.c +++ b/io/mmap.c @@ -628,8 +628,8 @@ mremap_f( switch (c) { case 'f': flags = MREMAP_FIXED|MREMAP_MAYMOVE; - new_addr = (void *)cvtnum(blocksize, sectsize, - optarg); + new_addr = (void *)(unsigned long)cvtnum(blocksize, + sectsize, optarg); break; case 'm': flags = MREMAP_MAYMOVE; diff --git a/io/readdir.c b/io/readdir.c index 2b56dc827..ca7a881d2 100644 --- a/io/readdir.c +++ b/io/readdir.c @@ -75,9 +75,10 @@ dump_dirent( long long offset, struct dirent *dirent) { - printf("%08llx: d_ino: 0x%08lx", offset, dirent->d_ino); + printf("%08llx: d_ino: 0x%08llx", offset, + (unsigned long long)dirent->d_ino); #ifdef _DIRENT_HAVE_D_OFF - printf(" d_off: 0x%08lx", dirent->d_off); + printf(" d_off: 0x%08llx", (unsigned long long)dirent->d_off); #endif #ifdef _DIRENT_HAVE_D_RECLEN printf(" d_reclen: 0x%x", dirent->d_reclen); -- 2.47.2