From 9279c2e493b0af1ad995dc788802e4fa86eb1d47 Mon Sep 17 00:00:00 2001
From: jpandre <jpandre>
Date: Wed, 25 Nov 2009 14:29:08 +0000
Subject: [PATCH] Fixed inappropriate casts

---
 libntfs-3g/collate.c | 4 ++--
 libntfs-3g/volume.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libntfs-3g/collate.c b/libntfs-3g/collate.c
index c3e0d58b..856a07b8 100644
--- a/libntfs-3g/collate.c
+++ b/libntfs-3g/collate.c
@@ -184,8 +184,8 @@ static int ntfs_collate_ntofs_security_hash(ntfs_volume *vol __attribute__((unus
 		ntfs_log_error("data1_len or/and data2_len not equal to 8.\n");
 		return NTFS_COLLATION_ERROR;
 	}
-	p1 = (const u32*)data1;
-	p2 = (const u32*)data2;
+	p1 = (const le32*)data1;
+	p2 = (const le32*)data2;
 	d1 = le32_to_cpup(p1);
 	d2 = le32_to_cpup(p2);
 	if (d1 < d2)
diff --git a/libntfs-3g/volume.c b/libntfs-3g/volume.c
index b87ad9e6..fd25f331 100644
--- a/libntfs-3g/volume.c
+++ b/libntfs-3g/volume.c
@@ -1047,7 +1047,7 @@ ntfs_volume *ntfs_device_mount(struct ntfs_device *dev, unsigned long flags)
 			for (j = 0; j < (s32)u; j++) {
 				u16 uc = le16_to_cpu(vname[j]);
 				if (uc > 0xff)
-					uc = (ntfschar)'_';
+					uc = (u16)'_';
 				vol->vol_name[j] = (char)uc;
 			}
 			vol->vol_name[u] = '\0';