From: Nathan Scott <nathans@sgi.com>
Date: Fri, 30 Apr 2004 03:07:10 +0000 (+0000)
Subject: Trivial fixes to compiler warnings on 64 bit platforms.
X-Git-Tag: v2.7.0~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8373571150226ecb9ef5d7ae64c3e18200ef5bd8;p=thirdparty%2Fxfsprogs-dev.git

Trivial fixes to compiler warnings on 64 bit platforms.
---

diff --git a/io/mmap.c b/io/mmap.c
index 087c89f27..b6a32ca45 100644
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -737,19 +737,21 @@ mincore_f(
 				previous = start + (i * pagesize);
 			}
 		} else if (previous) {		/* print end and page count */
-			printf(_("0x%lx  %u pages (%llu : %lu)\n"),
+			printf(_("0x%lx  %lu pages (%llu : %lu)\n"),
 				(unsigned long)current,
-				(current - previous) / pagesize,
-				(unsigned long long)offset + (previous - start),
+				(unsigned long)(current - previous) / pagesize,
+				(unsigned long long)offset +
+					(unsigned long long)(previous - start),
 				(unsigned long)(current - previous));
 			previous = NULL;
 		}
 	}
 	if (previous)
-		printf(_("0x%lx  %u pages (%llu : %lu)\n"),
+		printf(_("0x%lx  %lu pages (%llu : %lu)\n"),
 			(unsigned long)current,
-			(current - previous) / pagesize,
-			(unsigned long long)offset + (previous - start),
+			(unsigned long)(current - previous) / pagesize,
+			(unsigned long long)offset +
+				(unsigned long long)(previous - start),
 			(unsigned long)(current - previous));
 
 	free(vec);
diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index bb5ed24a9..85beff01a 100644
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -2091,9 +2091,9 @@ xfs_da_do_buf(
 					cmn_err(CE_ALERT,
 						"[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d\n",
 						i,
-						mapp[i].br_startoff,
-						mapp[i].br_startblock,
-						mapp[i].br_blockcount,
+						(long long)mapp[i].br_startoff,
+						(long long)mapp[i].br_startblock,
+						(long long)mapp[i].br_blockcount,
 						mapp[i].br_state);
 				}
 			}
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index c691d628d..395a7f85f 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -1437,7 +1437,9 @@ loop:
 	if (blkno >= logBBsize) {
 	    if (cleared) {
 		printf("%s: skipped %d cleared blocks in range: %lld - %lld\n",
-			progname, cleared, cleared_blkno, cleared + cleared_blkno - 1);
+			progname, cleared,
+			(long long)(cleared_blkno),
+			(long long)(cleared + cleared_blkno - 1));
 		if (cleared == logBBsize)
 		    printf("%s: totally cleared log\n", progname);
 
@@ -1445,7 +1447,9 @@ loop:
 	    }
 	    if (zeroed) {
 		printf("%s: skipped %d zeroed blocks in range: %lld - %lld\n",
-			progname, zeroed, zeroed_blkno, zeroed + zeroed_blkno - 1);
+			progname, zeroed,
+			(long long)(zeroed_blkno),
+			(long long)(zeroed + zeroed_blkno - 1));
 		if (zeroed == logBBsize)
 		    printf("%s: totally zeroed log\n", progname);