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

2/3 eina_model: properly eliminate duplicates. 

We must check for duplicates otherwise we'll have remaining entries
after topological sort.



SVN revision: 68033
This commit is contained in:
Gustavo Sverzut Barbieri 2012-02-16 19:31:56 +00:00
parent 769d2e2210
commit ca2db67b69
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
legacy/eina/src/lib/eina_model.c
View File

@ -524,7 +524,7 @@ _eina_model_description_ifaces_fix(Eina_Model_Description *desc)
unsigned int users;
Eina_List *deps;
} *nodes, **pending, **roots;
unsigned int n_nodes = desc->total.ifaces, n_pending = 0, n_roots = 0, i;
unsigned int n_nodes = desc->total.ifaces, n_pending = 0, n_roots = 0, i, j;
Eina_Bool ret = EINA_TRUE;
nodes = alloca(n_nodes * sizeof(struct node));
@ -532,15 +532,26 @@ _eina_model_description_ifaces_fix(Eina_Model_Description *desc)
roots = alloca(n_nodes * sizeof(struct node *));
/* populate */
for (i = 0; i < n_nodes; i++)
for (i = 0, j = 0; i < n_nodes; i++)
{
nodes[i].iface = desc->cache.ifaces[i];
nodes[i].users = 0;
nodes[i].deps = NULL;
unsigned int k;
for (k = 0; k < j; k++)
{
if (nodes[k].iface == desc->cache.ifaces[i])
break;
}
if (k < j)
continue; /* already exists */
nodes[j].iface = desc->cache.ifaces[i];
nodes[j].users = 0;
nodes[j].deps = NULL;
j++;
}
n_nodes = j;
for (i = 0; i < n_nodes; i++)
{
unsigned int j;
for (j = 0; j < n_nodes; j++)
{
if (i == j) continue;
@ -580,8 +591,6 @@ _eina_model_description_ifaces_fix(Eina_Model_Description *desc)
EINA_LIST_FREE(r->deps, d)
{
unsigned int j;
d->users--;
if (d->users > 0) continue;