From 6803fa4b7665b3420b0df110776af4a6fc074066 Mon Sep 17 00:00:00 2001 From: antona Date: Sat, 15 Oct 2005 23:44:57 +0000 Subject: [PATCH] Fix endianness bug in ntfsinfo. (Anton) --- ChangeLog | 1 + include/ntfs/layout.h | 6 ++---- ntfsprogs/ntfsinfo.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f61d5105..1b3dbaef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ xx/xx/2005 - 1.12.2-WIP - Fix endianness bug (le16 instead of le32 when accessing mft record bytes_in_use) in volume.c::ntfs_volume_write_flags() and ntfsfix.c::OLD_ntfs_volume_set_flags(). (Anton) + - Fix endianness bug in ntfsinfo. (Anton) 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs. diff --git a/include/ntfs/layout.h b/include/ntfs/layout.h index 1bb72b35..44608924 100644 --- a/include/ntfs/layout.h +++ b/include/ntfs/layout.h @@ -292,10 +292,8 @@ typedef enum { * The _LE versions are to be applied on little endian MFT_REFs. * Note: The _LE versions will return a CPU endian formatted value! */ -typedef enum { - MFT_REF_MASK_CPU = 0x0000ffffffffffffULL, - MFT_REF_MASK_LE = const_cpu_to_le64(0x0000ffffffffffffULL), -} MFT_REF_CONSTS; +#define MFT_REF_MASK_CPU 0x0000ffffffffffffULL +#define MFT_REF_MASK_LE const_cpu_to_le64(MFT_REF_MASK_CPU) typedef u64 MFT_REF; diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c index b5751796..24041cbd 100644 --- a/ntfsprogs/ntfsinfo.c +++ b/ntfsprogs/ntfsinfo.c @@ -1882,7 +1882,7 @@ int main(int argc, char **argv) if (opts.filename) { inode = ntfs_pathname_to_inode(vol, NULL, opts.filename); } else { - inode = ntfs_inode_open(vol, MK_LE_MREF(opts.inode, 0)); + inode = ntfs_inode_open(vol, MK_MREF(opts.inode, 0)); } /* dump the inode information */