From 22108e36a1b420cf7e2a7eb506b39275dbc6664e Mon Sep 17 00:00:00 2001 From: uvman Date: Mon, 30 Oct 2006 13:29:45 +0000 Subject: [PATCH] More big-endiness fixes. (zhanglinbao, Yuval) --- ChangeLog | 3 +-- libntfs/index.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25261c40..42d45149 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,8 +52,7 @@ xx/xx/2006 - x.xx.x - . - Allow ntfscp to create the destination file if it does not already exists by calling ntfs_create(). (Hil) - Fix GUID to string conversion. (Anton) - - Fix some byte-order conversion for u32 variables that used le16 - conversion macros. (zhanglinbao, Yuval) + - Multiple big-endiness fixes. (zhanglinbao, Yuval) - Spelling mistake fixes. (Yuval) - Remove inline keywords from static non-one-liners. (Szaka, Yuval) - Memory leak fixes. (Yura, Yuval) diff --git a/libntfs/index.c b/libntfs/index.c index 90d2c5cd..e5b834bd 100644 --- a/libntfs/index.c +++ b/libntfs/index.c @@ -789,7 +789,7 @@ done: return 0; } -static INDEX_BLOCK *ntfs_ib_alloc(VCN ib_vcn, int ib_size, +static INDEX_BLOCK *ntfs_ib_alloc(VCN ib_vcn, u32 ib_size, INDEX_HEADER_FLAGS node_type) { INDEX_BLOCK *ib; @@ -985,8 +985,8 @@ static INDEX_BLOCK *ntfs_ir_to_ia(INDEX_ROOT *ir, VCN ib_vcn) ntfs_log_trace("Entering.\n"); - ib = ntfs_ib_alloc(ib_vcn, ir->index_block_size, LEAF_NODE); - if (!ib) + if (!(ib = ntfs_ib_alloc(ib_vcn, le32_to_cpu(ir->index_block_size), + LEAF_NODE))) return NULL; ies_start = (char *)ntfs_ie_get_first(&ir->index);