From 139718753266d4a45bb6b54df4202c4549be94a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 8 Jan 2006 13:59:37 +0000 Subject: [PATCH] Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15871 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/file_systems/bfs/BPlusTree.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp index 313f7e6c5c..286b5b212b 100644 --- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp +++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp @@ -746,8 +746,7 @@ BPlusTree::FindFreeDuplicateFragment(Transaction &transaction, const bplustree_node *fragment = cached.SetTo( bplustree_node::FragmentOffset(value), false); if (fragment == NULL) { - FATAL(("Could not get duplicate fragment at %Ld\n", - BFS_ENDIAN_TO_HOST_INT64(values[i]))); + FATAL(("Could not get duplicate fragment at %Ld\n", value)); continue; } @@ -812,7 +811,8 @@ BPlusTree::InsertDuplicate(Transaction &transaction, CachedNode &cached, offset = bplustree_node::FragmentOffset(oldValue); memmove(duplicate->DuplicateArray(), array, (NUM_FRAGMENT_VALUES + 1) * sizeof(off_t)); - duplicate->left_link = duplicate->right_link = HOST_ENDIAN_TO_BFS_INT64((uint64)BPLUSTREE_NULL); + duplicate->left_link = duplicate->right_link = HOST_ENDIAN_TO_BFS_INT64( + (uint64)BPLUSTREE_NULL); array = duplicate->DuplicateArray(); array->Insert(value); @@ -842,15 +842,14 @@ BPlusTree::InsertDuplicate(Transaction &transaction, CachedNode &cached, if (cached.MakeWritable(transaction) == NULL) return B_IO_ERROR; - values[index] = HOST_ENDIAN_TO_BFS_INT64(bplustree_node::MakeLink(BPLUSTREE_DUPLICATE_NODE, offset)); + values[index] = HOST_ENDIAN_TO_BFS_INT64(bplustree_node::MakeLink( + BPLUSTREE_DUPLICATE_NODE, offset)); } return B_OK; } - // // Put the value into a dedicated duplicate node - // // search for free space in the duplicate nodes of that key duplicate_array *array; @@ -897,10 +896,8 @@ BPlusTree::InsertDuplicate(Transaction &transaction, CachedNode &cached, return B_OK; } - // // Search for a free duplicate fragment or create a new one // to insert the duplicate value into - // uint32 fragmentIndex = 0; bplustree_node *fragment; @@ -920,7 +917,8 @@ BPlusTree::InsertDuplicate(Transaction &transaction, CachedNode &cached, if (cached.MakeWritable(transaction) == NULL) return B_IO_ERROR; - values[index] = HOST_ENDIAN_TO_BFS_INT64(bplustree_node::MakeLink(BPLUSTREE_DUPLICATE_FRAGMENT, offset, fragmentIndex)); + values[index] = HOST_ENDIAN_TO_BFS_INT64(bplustree_node::MakeLink( + BPLUSTREE_DUPLICATE_FRAGMENT, offset, fragmentIndex)); return B_OK; }