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

* cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27882 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich
2008-10-05 22:41:36 +00:00
parent 8f30a89d1c
commit 68f40fccf7
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/List.cpp
+29 -29
View File
@@ -224,7 +224,7 @@ bool
BList::ReplaceItem(int32 index, void *newItem) BList::ReplaceItem(int32 index, void *newItem)
{ {
bool result = false; bool result = false;
if (index >= 0 && index < fItemCount) { if (index >= 0 && index < fItemCount) {
fObjectList[index] = newItem; fObjectList[index] = newItem;
result = true; result = true;
@@ -257,44 +257,44 @@ bool
BList::SwapItems(int32 indexA, int32 indexB) BList::SwapItems(int32 indexA, int32 indexB)
{ {
bool result = false; bool result = false;
if (indexA >= 0 && indexA < fItemCount if (indexA >= 0 && indexA < fItemCount
&& indexB >= 0 && indexB < fItemCount) { && indexB >= 0 && indexB < fItemCount) {
void *tmpItem = fObjectList[indexA]; void *tmpItem = fObjectList[indexA];
fObjectList[indexA] = fObjectList[indexB]; fObjectList[indexA] = fObjectList[indexB];
fObjectList[indexB] = tmpItem; fObjectList[indexB] = tmpItem;
result = true; result = true;
} }
return result; return result;
} }
//MoveItem // MoveItem
//This moves a list item from posititon a to position b, moving the appropriate block of // This moves a list item from posititon a to position b, moving the appropriate
// list elements to make up for the move. For example, in the array: // block of list elements to make up for the move. For example, in the array:
// A B C D E F G H I J // A B C D E F G H I J
// Moveing 1(B)->6(G) would result in this: // Moveing 1(B)->6(G) would result in this:
// A C D E F G B H I J // A C D E F G B H I J
bool bool
BList::MoveItem(int32 fromIndex, int32 toIndex) BList::MoveItem(int32 fromIndex, int32 toIndex)
{ {
if ((fromIndex >= fItemCount) || (toIndex >= fItemCount) || (fromIndex < 0) || (toIndex < 0)) if ((fromIndex >= fItemCount) || (toIndex >= fItemCount) || (fromIndex < 0)
|| (toIndex < 0))
return false; return false;
if (fromIndex < toIndex) if (fromIndex < toIndex) {
{ void * tmpMover = fObjectList[fromIndex];
void * tmp_mover = fObjectList[fromIndex]; memmove(fObjectList + fromIndex + 1, fObjectList + fromIndex,
memmove(fObjectList + fromIndex + 1, fObjectList + fromIndex, (toIndex - fromIndex) * sizeof(void *)); (toIndex - fromIndex) * sizeof(void *));
fObjectList[toIndex] = tmp_mover; fObjectList[toIndex] = tmpMover;
} } else if (fromIndex > toIndex) {
else if (fromIndex > toIndex) void * tmpMover = fObjectList[fromIndex];
{ memmove(fObjectList + toIndex + 1, fObjectList + toIndex,
void * tmp_mover = fObjectList[fromIndex]; (fromIndex - toIndex) * sizeof(void *));
memmove(fObjectList + toIndex + 1, fObjectList + toIndex, (fromIndex - toIndex) * sizeof(void *)); fObjectList[toIndex] = tmpMover;
fObjectList[toIndex] = tmp_mover;
}; };
return true; return true;
} }
@@ -390,7 +390,7 @@ BList::IsEmpty() const
/* Iterating over the list. */ /* Iterating over the list. */
//iterate a function over the whole list. If the function outputs a true //iterate a function over the whole list. If the function outputs a true
//value, then the process is terminated. //value, then the process is terminated.
void void
BList::DoForEach(bool (*func)(void *)) BList::DoForEach(bool (*func)(void *))
{ {
@@ -415,7 +415,7 @@ BList::DoForEach(bool (*func)(void *, void*), void * arg)
if (func != NULL) if (func != NULL)
{ {
while ((!terminate) && (index < fItemCount)) while ((!terminate) && (index < fItemCount))
{ {
terminate = func(fObjectList[index], arg); terminate = func(fObjectList[index], arg);
index++; index++;
}; };
@@ -478,9 +478,9 @@ BList::_ResizeArray(int32 count)
if (newObjectList) { if (newObjectList) {
fObjectList = newObjectList; fObjectList = newObjectList;
fPhysicalSize = newSize; fPhysicalSize = newSize;
// set our lower bound to either 1/4 // set our lower bound to either 1/4
//of the current physical size, or 0 //of the current physical size, or 0
fResizeThreshold = fPhysicalSize >> 2 >= fBlockSize fResizeThreshold = fPhysicalSize >> 2 >= fBlockSize
? fPhysicalSize >> 2 : 0; ? fPhysicalSize >> 2 : 0;
} else } else
result = false; result = false;