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

fix eet_dict locks and formatting. 

SVN revision: 71097
This commit is contained in:
Carsten Haitzler 2012-05-15 07:06:12 +00:00
parent 31bdf4d2c9
commit 9f800d8e21
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/eet/src/lib/eet_dictionary.c
View File

@ -64,7 +64,8 @@ _eet_dictionary_lookup(Eet_Dictionary *ed,
if (ed->all[current].len == len) if (ed->all[current].len == len)
{ {
if (ed->all[current].str && if (ed->all[current].str &&
(ed->all[current].str == string || strcmp(ed->all[current].str, string) == 0)) ((ed->all[current].str == string) ||
(!strcmp(ed->all[current].str, string))))
{ {
found = EINA_TRUE; found = EINA_TRUE;
break; break;
@ -75,7 +76,7 @@ _eet_dictionary_lookup(Eet_Dictionary *ed,
current = ed->all[current].next; current = ed->all[current].next;
} }
if (current == -1 && found) if ((current == -1) && found)
return prev; return prev;
return current; return current;
@ -90,6 +91,7 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
int hash; int hash;
int idx; int idx;
int len; int len;
int cnt;
if (!ed) if (!ed)
return -1; return -1;
@ -103,7 +105,9 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
if (idx != -1) if (idx != -1)
{ {
if (ed->all[idx].str && (ed->all[idx].str == string || strcmp(ed->all[idx].str, string) == 0)) if (ed->all[idx].str &&
((ed->all[idx].str == string) ||
(!strcmp(ed->all[idx].str, string))))
{ {
eina_lock_release(&ed->mutex); eina_lock_release(&ed->mutex);
return idx; return idx;
@ -156,8 +160,10 @@ eet_dictionary_string_add(Eet_Dictionary *ed,
ed->hash[hash] = ed->count; ed->hash[hash] = ed->count;
} }
ed->count++;
cnt = ed->count;
eina_lock_release(&ed->mutex); eina_lock_release(&ed->mutex);
return ed->count++; return cnt;
on_error: on_error:
eina_lock_release(&ed->mutex); eina_lock_release(&ed->mutex);