i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some warnings, and some minor style issues.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2836 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-02-25 02:50:28 +00:00
parent 5d60085846
commit b4d14910f5
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
+8 -16
View File
@@ -529,8 +529,7 @@ status_t
BPlusTree::FindKey(bplustree_node *node, const uint8 *key, uint16 keyLength, uint16 *index, BPlusTree::FindKey(bplustree_node *node, const uint8 *key, uint16 keyLength, uint16 *index,
off_t *next) off_t *next)
{ {
if (node->all_key_count == 0) if (node->all_key_count == 0) {
{
if (index) if (index)
*index = 0; *index = 0;
if (next) if (next)
@@ -539,11 +538,10 @@ BPlusTree::FindKey(bplustree_node *node, const uint8 *key, uint16 keyLength, uin
} }
off_t *values = node->Values(); off_t *values = node->Values();
int16 saveIndex; int16 saveIndex = -1;
// binary search in the key array // binary search in the key array
for (int16 first = 0,last = node->all_key_count - 1;first <= last;) for (int16 first = 0, last = node->all_key_count - 1; first <= last;) {
{
uint16 i = (first + last) >> 1; uint16 i = (first + last) >> 1;
uint16 searchLength; uint16 searchLength;
@@ -555,17 +553,12 @@ BPlusTree::FindKey(bplustree_node *node, const uint8 *key, uint16 keyLength, uin
} }
int32 cmp = CompareKeys(key, keyLength, searchKey, searchLength); int32 cmp = CompareKeys(key, keyLength, searchKey, searchLength);
if (cmp < 0) if (cmp < 0) {
{
last = i - 1; last = i - 1;
saveIndex = i; saveIndex = i;
} } else if (cmp > 0) {
else if (cmp > 0)
{
saveIndex = first = i + 1; saveIndex = first = i + 1;
} } else {
else
{
if (index) if (index)
*index = i; *index = i;
if (next) if (next)
@@ -576,8 +569,7 @@ BPlusTree::FindKey(bplustree_node *node, const uint8 *key, uint16 keyLength, uin
if (index) if (index)
*index = saveIndex; *index = saveIndex;
if (next) if (next) {
{
if (saveIndex == node->all_key_count) if (saveIndex == node->all_key_count)
*next = node->overflow_link; *next = node->overflow_link;
else else
@@ -2020,7 +2012,7 @@ int32
bplustree_node::FragmentsUsed(uint32 nodeSize) bplustree_node::FragmentsUsed(uint32 nodeSize)
{ {
uint32 used = 0; uint32 used = 0;
for (int32 i = 0;i < nodeSize / ((NUM_FRAGMENT_VALUES + 1) * sizeof(off_t));i++) { for (uint32 i = 0; i < nodeSize / ((NUM_FRAGMENT_VALUES + 1) * sizeof(off_t)); i++) {
duplicate_array *array = FragmentAt(i); duplicate_array *array = FragmentAt(i);
if (array->count > 0 && ++used > 1) if (array->count > 0 && ++used > 1)
return used; return used;