gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Removed some redundant code.

Browse Source
This commit is contained in:
dan
2000-09-21 01:25:47 +00:00
parent ac4997e739
commit 40e67dfce0
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
WINGs/array.c
View File

@@ -159,20 +159,6 @@ WMReplaceInArray(WMArray *array, unsigned index, void *item)
} }
static void
deleteFromArray(WMArray *array, unsigned index)
{
/*wassertr(index < array->itemCount);*/
if (index < array->itemCount-1) {
memmove(array->items+index, array->items+index+1,
sizeof(void*)*(array->itemCount-index-1));
}
array->itemCount--;
}
int int
WMDeleteFromArray(WMArray *array, unsigned index) WMDeleteFromArray(WMArray *array, unsigned index)
{ {
@@ -183,7 +169,12 @@ WMDeleteFromArray(WMArray *array, unsigned index)
array->destructor(array->items[index]); array->destructor(array->items[index]);
} }
deleteFromArray(array, index); if (index < array->itemCount-1) {
memmove(array->items+index, array->items+index+1,
sizeof(void*)*(array->itemCount-index-1));
}
array->itemCount--;
return 1; return 1;
} }
@@ -217,11 +208,9 @@ WMGetFromArray(WMArray *array, unsigned index)
void* void*
WMPopFromArray(WMArray *array) WMPopFromArray(WMArray *array)
{ {
void *last = array->items[array->itemCount-1]; array->itemCount--;
deleteFromArray(array, array->itemCount-1); return array->items[array->itemCount];
return last;
} }