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 <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/io/mmap.c b/io/mmap.c
index e2d8d5a92326435c98ac3078b43ac02b6ad28ffb..7a8150e3d5175acc65cf930f8d1c3cc90558b01d 100644 (file)
--- 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 2b56dc827fce6f6152f398b1f03b22c2d76ec8a3..ca7a881d27e43fc27b6a962a74cf9748b2a634cd 100644 (file)
--- 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);