enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Fix improved version of eina_array_remove. 

SVN revision: 35384
This commit is contained in:
Cedric BAIL 2008-08-07 17:12:06 +00:00
parent f84524b958
commit 81d520804e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/eina/src/lib/eina_array.c
View File

@ -110,6 +110,7 @@ EAPI void
eina_array_remove(Eina_Array *array, Eina_Bool (*keep)(void *data, void *gdata), void *gdata)
{
void **tmp;
void *data;
unsigned int total = 0;
unsigned int limit;
unsigned int i;
@ -118,22 +119,17 @@ eina_array_remove(Eina_Array *array, Eina_Bool (*keep)(void *data, void *gdata),
for (i = 0; i < array->count; ++i)
{
void *data;
data = _eina_array_get(array, i);
if (keep(data, gdata) == EINA_FALSE)
break;
if (keep(data, gdata) == EINA_FALSE) break;
}
limit = i;
if (i < array->count) ++i;
for (; i < array->count; ++i)
{
void *data;
data = _eina_array_get(array, i);
if (keep(data, gdata) == EINA_TRUE)
break;
if (keep(data, gdata) == EINA_TRUE) break;
}
/* Special case all objects that need to stay are at the beginning of the array. */
if (i == array->count)
@ -159,10 +155,15 @@ eina_array_remove(Eina_Array *array, Eina_Bool (*keep)(void *data, void *gdata),
memcpy(tmp, array->data, limit * sizeof(void*));
total = limit;
if (i < array->count)
{
tmp[total] = data;
total++;
++i;
}
for (; i < array->count; ++i)
{
void *data;
data = _eina_array_get(array, i);
if (keep(data, gdata))