kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

API BREAK: eina_list_search_sorted_near_list() gets one more parameter. 

This should not impact anybody, at least in SVN I got no hits for this
function.

The new parameter contains the result of the last call to func(), so
we can know if the node is smaller, bigger or exactly the requested
value and don't need to call func() on node to know for sure.



SVN revision: 41623
This commit is contained in:
Gustavo Sverzut Barbieri 2009-08-06 19:01:47 +00:00
parent 638e79b91e
commit 4f39f6861a
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/eina/src/include/eina_list.h
View File

@ -100,7 +100,7 @@ EAPI Eina_List *eina_list_sort (Eina_List *list, unsigned int size, Eina_Compare
EAPI Eina_List *eina_list_merge (Eina_List *left, Eina_List *right) EINA_WARN_UNUSED_RESULT;
EAPI Eina_List *eina_list_sorted_merge(Eina_List *left, Eina_List *right, Eina_Compare_Cb func) EINA_ARG_NONNULL(3) EINA_WARN_UNUSED_RESULT;
EAPI Eina_List *eina_list_search_sorted_near_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);
EAPI Eina_List *eina_list_search_sorted_near_list(const Eina_List *list, Eina_Compare_Cb func, const void *data, int *result_cmp);
EAPI Eina_List *eina_list_search_sorted_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);
EAPI void *eina_list_search_sorted(const Eina_List *list, Eina_Compare_Cb func, const void *data);
EAPI Eina_List *eina_list_search_unsorted_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);

46
legacy/eina/src/lib/eina_list.c
View File

@ -1678,6 +1678,11 @@ eina_list_sorted_merge(Eina_List *left, Eina_List *right, Eina_Compare_Cb func)
* @param list The list to search for data, @b must be sorted.
* @param func A function pointer that can handle comparing the list data nodes.
* @param data reference value to search.
* @param result_cmp if provided returns the result of
* func(node->data, data) node being the last (returned) node. If node
* was found (exact match), then it is 0. If returned node is smaller
* than requested data, it is less than 0 and if it's bigger it's
* greater than 0. It is the last value returned by func().
* @return the nearest node, NULL if not found.
*
* This can be used to check if some value is inside the list and get
@ -1701,42 +1706,50 @@ eina_list_sorted_merge(Eina_List *left, Eina_List *right, Eina_Compare_Cb func)
* @see eina_list_sorted_merge()
*/
EAPI Eina_List *
eina_list_search_sorted_near_list(const Eina_List *list, Eina_Compare_Cb func, const void *data)
eina_list_search_sorted_near_list(const Eina_List *list, Eina_Compare_Cb func, const void *data, int *result_cmp)
{
const Eina_List *ct;
void *d;
unsigned int inf, sup, cur, tmp;
int part;
if (!list) return NULL;
if (!list)
{
if (result_cmp) *result_cmp = 0;
return NULL;
}
inf = 0;
sup = eina_list_count(list) ;
sup = list->accounting->count;
cur = sup >> 1;
ct = eina_list_nth_list(list, cur);
d = eina_list_data_get(ct);
for (tmp = 0, ct = list; tmp != cur; tmp++, ct = ct->next);
d = ct->data;
while ((part = func(d, data)))
{
if (inf == sup
|| (part < 0 && inf == cur)
|| (part > 0 && sup == cur))
return (Eina_List*) ct;
if (part < 0)
inf = (sup + inf) >> 1;
else
sup = (sup + inf) >> 1;
/* Faster to move directly from where we are to the new position than using eina_list_nth_list. */
goto end;
tmp = (sup + inf) >> 1;
if (part < 0)
inf = tmp;
else
sup = tmp;
/* Faster to move directly from where we are to the new position than using eina_list_nth_list. */
if (tmp < cur)
for (; cur != tmp; cur--, ct = eina_list_prev(ct))
for (; cur != tmp; cur--, ct = ct->prev)
;
else
for (; cur != tmp; cur++, ct = eina_list_next(ct))
for (; cur != tmp; cur++, ct = ct->next)
;
d = eina_list_data_get(ct);
d = ct->data;
}
end:
if (result_cmp) *result_cmp = part;
return (Eina_List*) ct;
}
@ -1772,11 +1785,12 @@ eina_list_search_sorted_list(const Eina_List *list, Eina_Compare_Cb func, const
{
Eina_List *lnear;
void *d;
int cmp;
lnear = eina_list_search_sorted_near_list(list, func, data);
lnear = eina_list_search_sorted_near_list(list, func, data, &cmp);
if (!lnear) return NULL;
d = eina_list_data_get(lnear);
if (!func(d, data))
if (cmp == 0)
return lnear;
return NULL;
}