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

add 2 list calls that well - i need for efficiency :) 

SVN revision: 24245
This commit is contained in:
Carsten Haitzler 2006-07-27 19:27:34 +00:00
parent ac8df12757
commit 6590dd220f
2 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/Evas.h
View File

@ -314,7 +314,9 @@ extern "C" {
EAPI Evas_List *evas_list_append (Evas_List *list, const void *data);
EAPI Evas_List *evas_list_prepend (Evas_List *list, const void *data);
EAPI Evas_List *evas_list_append_relative (Evas_List *list, const void *data, const void *relative);
EAPI Evas_List *evas_list_append_relative_list (Evas_List *list, const void *data, Evas_List *relative);
EAPI Evas_List *evas_list_prepend_relative (Evas_List *list, const void *data, const void *relative);
EAPI Evas_List *evas_list_prepend_relative_list (Evas_List *list, const void *data, Evas_List *relative);
EAPI Evas_List *evas_list_remove (Evas_List *list, const void *data);
EAPI Evas_List *evas_list_remove_list (Evas_List *list, Evas_List *remove_list);
EAPI void *evas_list_find (Evas_List *list, const void *data);

106
legacy/evas/src/lib/data/evas_list.c
View File

@ -199,40 +199,45 @@ evas_list_append_relative(Evas_List *list, const void *data, const void *relativ
{
Evas_List *l;
_evas_list_alloc_error = 0;
for (l = list; l; l = l->next)
{
if (l->data == relative)
{
Evas_List *new_l;
new_l = evas_mempool_malloc(&_evas_list_mempool, sizeof(Evas_List));
if (!new_l)
{
_evas_list_alloc_error = 1;
return list;
}
new_l->data = (void *)data;
if (l->next)
{
new_l->next = l->next;
l->next->prev = new_l;
}
else
new_l->next = NULL;
l->next = new_l;
new_l->prev = l;
new_l->accounting = list->accounting;
((Evas_List_Accounting *)(list->accounting))->count++;
if (!new_l->next)
((Evas_List_Accounting *)(new_l->accounting))->last = new_l;
return list;
}
return evas_list_append_relative_list(list, data, relative);
}
return evas_list_append(list, data);
}
EAPI Evas_List *
evas_list_append_relative_list(Evas_List *list, const void *data, Evas_List *relative)
{
Evas_List *new_l;
if ((!list) || (!relative)) return evas_list_append(list, data);
_evas_list_alloc_error = 0;
new_l = evas_mempool_malloc(&_evas_list_mempool, sizeof(Evas_List));
if (!new_l)
{
_evas_list_alloc_error = 1;
return list;
}
new_l->data = (void *)data;
if (relative->next)
{
new_l->next = relative->next;
relative->next->prev = new_l;
}
else
new_l->next = NULL;
relative->next = new_l;
new_l->prev = relative;
new_l->accounting = list->accounting;
((Evas_List_Accounting *)(list->accounting))->count++;
if (!new_l->next)
((Evas_List_Accounting *)(new_l->accounting))->last = new_l;
return list;
}
/**
* Prepend a data pointer to a linked list before the memeber specified
* @param list The list handle to prepend @p data too
@ -286,31 +291,36 @@ evas_list_prepend_relative(Evas_List *list, const void *data, const void *relati
for (l = list; l; l = l->next)
{
if (l->data == relative)
{
Evas_List *new_l;
new_l = evas_mempool_malloc(&_evas_list_mempool, sizeof(Evas_List));
if (!new_l)
{
_evas_list_alloc_error = 1;
return list;
}
new_l->data = (void *)data;
new_l->prev = l->prev;
new_l->next = l;
if (l->prev) l->prev->next = new_l;
l->prev = new_l;
new_l->accounting = list->accounting;
((Evas_List_Accounting *)(list->accounting))->count++;
if (new_l->prev)
return list;
else
return new_l;
}
return evas_list_prepend_relative_list(list, data, relative);
}
return evas_list_prepend(list, data);
}
EAPI Evas_List *
evas_list_prepend_relative_list(Evas_List *list, const void *data, Evas_List *relative)
{
Evas_List *new_l;
if ((!list) || (!relative)) return evas_list_prepend(list, data);
_evas_list_alloc_error = 0;
new_l = evas_mempool_malloc(&_evas_list_mempool, sizeof(Evas_List));
if (!new_l)
{
_evas_list_alloc_error = 1;
return list;
}
new_l->data = (void *)data;
new_l->prev = relative->prev;
new_l->next = relative;
if (relative->prev) relative->prev->next = new_l;
relative->prev = new_l;
new_l->accounting = list->accounting;
((Evas_List_Accounting *)(list->accounting))->count++;
if (new_l->prev)
return list;
return new_l;
}
/**
* @defgroup Evas_List_Remove_Group Linked List Remove Functions
*