From 8338064665c98c56410b9b129c3ac2b185fdc5b7 Mon Sep 17 00:00:00 2001 From: Tyler Dauwalder Date: Thu, 31 Jul 2003 07:00:04 +0000 Subject: [PATCH] Conversion functions actually work now. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4158 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/udf/Utils.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/udf/Utils.cpp b/src/add-ons/kernel/file_systems/udf/Utils.cpp index 9be05cb516..b1e556eaad 100644 --- a/src/add-ons/kernel/file_systems/udf/Utils.cpp +++ b/src/add-ons/kernel/file_systems/udf/Utils.cpp @@ -17,17 +17,19 @@ namespace Udf { udf_long_address to_long_address(vnode_id id, uint32 length) { + DEBUG_INIT_ETC(CF_PUBLIC | CF_HELPER, NULL, ("vnode_id: %lld, length: %ld", id, length)); udf_long_address result; - result.set_block(id & 0xffff00); - result.set_partition(id & 0xff); + result.set_block((id >> 16) & 0xffffffff); + result.set_partition(id & 0xffff); result.set_length(length); + DUMP(result); return result; } vnode_id to_vnode_id(udf_long_address address) { - return (address.block() << 16) & (address.partition()); + return (address.block() << 16) | (address.partition()); } } // namespace Udf