From 0106f54ff0ecb3c40e1d2232d39e42ca18adc803 Mon Sep 17 00:00:00 2001
From: !uv <!uv>
Date: Fri, 20 Aug 2004 12:18:22 +0000
Subject: [PATCH] printf format fix.

(Logical change 1.507)
---
 libntfs/win32_io.c     | 8 +++++---
 ntfsprogs/ntfsclone.c  | 4 ++--
 ntfsprogs/ntfsresize.c | 8 +++++---
 ntfsprogs/ntfsrm.c     | 3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/libntfs/win32_io.c b/libntfs/win32_io.c
index 01325a04..091aa44a 100644
--- a/libntfs/win32_io.c
+++ b/libntfs/win32_io.c
@@ -696,7 +696,8 @@ static s64 ntfs_device_win32_read(struct ntfs_device *dev, void *buf, s64 count)
 	numtoread.QuadPart = ((count + offset.QuadPart - 1) | 0x1FF) + 1;
 
 	Dprintf("win32_read(fd=%p,b=%p,count=0x%llx)->(%llx+%llx:%llx)\n", fd,
-			buf, count, base, offset, numtoread);
+			buf, count, base.QuadPart, offset.QuadPart,
+			numtoread.QuadPart);
 
 #ifndef FORCE_ALIGNED_READ
 	if (((((long)buf) & ((s64)0x1FF)) == 0) && ((count & ((s64)0x1FF)) == 0)
@@ -834,7 +835,7 @@ static s64 ntfs_device_win32_write(struct ntfs_device *dev, const void *buf,
 	s64 bytes_written = 0;
 	HANDLE handle = ((win32_fd *)dev->d_private)->handle;
 
-	Dprintf("win32_write: Writing %ll bytes\n",count);
+	Dprintf("win32_write: Writing %lld bytes\n",count);
 	
 	if (NDevReadOnly(dev)) {
 		Dputs("win32_write: Device R/O, exiting.");
@@ -849,7 +850,8 @@ static s64 ntfs_device_win32_write(struct ntfs_device *dev, const void *buf,
 
 		if (WriteFile(handle, buf, cur_count, &cur_written, NULL) &&
 		    (cur_written==cur_count)) {
-			Dprintf("win32_write: Written %u bytes.",bytes_written);
+			Dprintf("win32_write: Written %lld bytes.\n",
+				bytes_written);
 			bytes_written += cur_written;
 			count -= cur_written;
 		} else {
diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index 6d778cf7..33967ed8 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -731,9 +731,9 @@ static void walk_runs(struct ntfs_walk_cluster *walk)
 		for (j = 0; j < lcn_length; j++) {
 			u64 k = (u64)lcn + j;
 			if (ntfs_bit_get_and_set(lcn_bitmap.bm, k, 1))
-				err_exit("Cluster %lu referenced twice!\n"
+				err_exit("Cluster %llu referenced twice!\n"
 					 "You didn't shutdown your Windows"
-					 "properly?\n", k);
+					 "properly?\n", (unsigned long long)k);
 		}
 
 		walk->image->inuse += lcn_length;
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index 7b0d9f99..8080dbd5 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -1140,10 +1140,12 @@ static void replace_attribute_runlist(ntfs_volume *vol,
 		
 		if (le32_to_cpu(ctx->mrec->bytes_in_use) + l >
 				le32_to_cpu(ctx->mrec->bytes_allocated))
-			err_exit("Extended record needed (%d > %d), not yet "
+			err_exit("Extended record needed (%u > %u), not yet "
 				 "supported!\nPlease try to free less space.\n",
-				 le32_to_cpu(ctx->mrec->bytes_in_use) + l,
-				 le32_to_cpu(ctx->mrec->bytes_allocated));
+				 (unsigned int)le32_to_cpu(ctx->mrec->
+					bytes_in_use) + l,
+				 (unsigned int)le32_to_cpu(ctx->mrec->
+					bytes_allocated));
 
 		memmove(next_attr + l, next_attr, remains_size);
 		ctx->mrec->bytes_in_use = cpu_to_le32(l +
diff --git a/ntfsprogs/ntfsrm.c b/ntfsprogs/ntfsrm.c
index a3ab1bf2..6457e439 100644
--- a/ntfsprogs/ntfsrm.c
+++ b/ntfsprogs/ntfsrm.c
@@ -3997,7 +3997,8 @@ static int ntfs_index_dump_alloc (ntfs_attr *attr, VCN vcn, int indent)
 			break;
 	}
 	printf ("%.*s", indent, space_line);
-	printf ("fill = %d/%d\n", block->index.index_length, block->index.allocated_size);
+	printf ("fill = %u/%u\n", (unsigned int)block->index.index_length,
+			(unsigned int)block->index.allocated_size);
 	return 0;
 }