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

Applied some parts of our style guide.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8864 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-09-06 17:33:33 +00:00
parent 4bccccda2e
commit cbe8d2b0fe
1 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/PointerList.cpp
+37 -25
View File
@@ -1,7 +1,7 @@
/* /*
** Copyright 2003-2004, Stefano Ceccherini ([email protected]). All rights reserved. ** Copyright 2003-2004, Stefano Ceccherini ([email protected]). All rights reserved.
** 2004, Michael Pfeiffer ([email protected]). ** 2004, Michael Pfeiffer ([email protected]).
** Distributed under the terms of the OpenBeOS License. ** Distributed under the terms of the Haiku License.
** **
** History ** History
** 2003-2004 Initial implementation by Stefano Ceccerini. ** 2003-2004 Initial implementation by Stefano Ceccerini.
@@ -53,8 +53,7 @@ protected:
}; };
#endif #endif
class AbstractPointerListHelper class AbstractPointerListHelper {
{
public: public:
AbstractPointerListHelper() {}; AbstractPointerListHelper() {};
@@ -104,7 +103,8 @@ private:
}; };
void AbstractPointerListHelper::Swap(void **items, int32 i, int32 j) void
AbstractPointerListHelper::Swap(void **items, int32 i, int32 j)
{ {
void *swap = items[i]; void *swap = items[i];
items[i] = items[j]; items[i] = items[j];
@@ -112,7 +112,8 @@ void AbstractPointerListHelper::Swap(void **items, int32 i, int32 j)
} }
int32 AbstractPointerListHelper::BinarySearchIndex(const void* key, const BList *list) int32
AbstractPointerListHelper::BinarySearchIndex(const void *key, const BList *list)
{ {
int32 index; int32 index;
const void **items = static_cast<const void**>(list->Items()); const void **items = static_cast<const void**>(list->Items());
@@ -121,7 +122,8 @@ int32 AbstractPointerListHelper::BinarySearchIndex(const void* key, const BList
} }
void* AbstractPointerListHelper::BinarySearch(const void* key, const BList *list) void *
AbstractPointerListHelper::BinarySearch(const void *key, const BList *list)
{ {
int32 index; int32 index;
const void **items = static_cast<const void**>(list->Items()); const void **items = static_cast<const void**>(list->Items());
@@ -129,14 +131,16 @@ void* AbstractPointerListHelper::BinarySearch(const void* key, const BList *list
} }
void AbstractPointerListHelper::SortItems(BList *list) void
AbstractPointerListHelper::SortItems(BList *list)
{ {
void **items = static_cast<void**>(list->Items()); void **items = static_cast<void**>(list->Items());
QuickSort(items, 0, list->CountItems()-1); QuickSort(items, 0, list->CountItems()-1);
} }
void AbstractPointerListHelper::HSortItems(BList *list) void
AbstractPointerListHelper::HSortItems(BList *list)
{ {
void **items = static_cast<void**>(list->Items()); void **items = static_cast<void**>(list->Items());
int32 numItems = list->CountItems(); int32 numItems = list->CountItems();
@@ -149,15 +153,17 @@ void AbstractPointerListHelper::HSortItems(BList *list)
} }
void* AbstractPointerListHelper::BinarySearch(const void* key, const void** items, int32 numItems, int32& index) void *
AbstractPointerListHelper::BinarySearch(const void *key, const void **items, int32 numItems, int32 &index)
{ {
int32 low = 0; int32 low = 0;
int32 high = numItems-1; int32 high = numItems-1;
int result = 0; int result = 0;
index = 0; index = 0;
while (low <= high) { while (low <= high) {
index = (low + high) / 2; index = (low + high) / 2;
const void* item = items[index]; const void *item = items[index];
result = Compare(key, item); result = Compare(key, item);
if (result < 0) { if (result < 0) {
// key < item // key < item
@@ -182,10 +188,11 @@ void* AbstractPointerListHelper::BinarySearch(const void* key, const void** item
} }
int32 AbstractPointerListHelper::ChoosePivot(void **items, int32 low, int32 high) int32
AbstractPointerListHelper::ChoosePivot(void **items, int32 low, int32 high)
{ {
if (kPivotThreshold <= kQuickSortThreshold || if (kPivotThreshold <= kQuickSortThreshold
high - low > kPivotThreshold) { || high - low > kPivotThreshold) {
assert(high - low > kPivotThreshold); assert(high - low > kPivotThreshold);
// choose the middle item of three items // choose the middle item of three items
int32 mid = (low + high) / 2; int32 mid = (low + high) / 2;
@@ -227,7 +234,8 @@ int32 AbstractPointerListHelper::ChoosePivot(void **items, int32 low, int32 high
} }
int32 AbstractPointerListHelper::Partition(void **items, int32 low, int32 high, bool& isSorted) int32
AbstractPointerListHelper::Partition(void **items, int32 low, int32 high, bool &isSorted)
{ {
assert(low < high); assert(low < high);
int32 left = low; int32 left = low;
@@ -256,10 +264,9 @@ int32 AbstractPointerListHelper::Partition(void **items, int32 low, int32 high,
isSorted = false; isSorted = false;
// pivot element has to be first element in list // pivot element has to be first element in list
if (low != pivot) { if (low != pivot)
Swap(items, low, pivot); Swap(items, low, pivot);
}
// now partion the array in a left part where item <= pivotItem // now partion the array in a left part where item <= pivotItem
// and a right part where item > pivotItem // and a right part where item > pivotItem
do { do {
@@ -286,7 +293,8 @@ int32 AbstractPointerListHelper::Partition(void **items, int32 low, int32 high,
} }
void AbstractPointerListHelper::InsertionSort(void **items, int32 numItems) void
AbstractPointerListHelper::InsertionSort(void **items, int32 numItems)
{ {
for (int32 i = 1; i < numItems; i ++) { for (int32 i = 1; i < numItems; i ++) {
// treat list[0 .. i-1] as sorted // treat list[0 .. i-1] as sorted
@@ -305,13 +313,15 @@ void AbstractPointerListHelper::InsertionSort(void **items, int32 numItems)
} }
void AbstractPointerListHelper::InsertionSort(void **items, int32 low, int32 high) void
AbstractPointerListHelper::InsertionSort(void **items, int32 low, int32 high)
{ {
InsertionSort(&items[low], high - low + 1); InsertionSort(&items[low], high - low + 1);
} }
void AbstractPointerListHelper::QuickSort(void **items, int32 low, int32 high) void
AbstractPointerListHelper::QuickSort(void **items, int32 low, int32 high)
{ {
if (low < high) { if (low < high) {
if (high - low < kQuickSortThreshold) { if (high - low < kQuickSortThreshold) {
@@ -328,8 +338,7 @@ void AbstractPointerListHelper::QuickSort(void **items, int32 low, int32 high)
} }
class PointerListHelper : public AbstractPointerListHelper class PointerListHelper : public AbstractPointerListHelper {
{
public: public:
PointerListHelper(_PointerList_::GenericCompareFunction compareFunc) PointerListHelper(_PointerList_::GenericCompareFunction compareFunc)
: fCompareFunc(compareFunc) : fCompareFunc(compareFunc)
@@ -337,7 +346,8 @@ public:
// nothing to do // nothing to do
} }
int Compare(const void *a, const void *b) { int Compare(const void *a, const void *b)
{
return fCompareFunc(a, b); return fCompareFunc(a, b);
} }
@@ -358,7 +368,8 @@ public:
// nothing to do // nothing to do
} }
int Compare(const void *a, const void *b) { int Compare(const void *a, const void *b)
{
return fCompareFunc(a, b, fState); return fCompareFunc(a, b, fState);
} }
@@ -378,7 +389,8 @@ public:
// nothing to do // nothing to do
} }
int Compare(const void *arg, const void *item) { int Compare(const void *arg, const void *item)
{
// need to adapt arguments and return value // need to adapt arguments and return value
return -fPredicate(item, const_cast<void *>(arg)); return -fPredicate(item, const_cast<void *>(arg));
} }