and when deleting a hash item - if hash data != NULL delete EXACTLY that

entry (if there are duplicates... this will avoid removing the wrong one)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@36092 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/data/evas_hash.c b/src/lib/data/evas_hash.c
index 9d36648..17a0baa 100644 (file)
--- a/src/lib/data/evas_hash.c
+++ b/src/lib/data/evas_hash.c
@@ -249,15 +249,18 @@ evas_hash_del(Evas_Hash *hash, const char *key, const void *data)
             el = (Evas_Hash_El *)l;
             if (!strcmp(el->key, key))
               {
-                 hash->buckets[hash_num] = evas_object_list_remove(hash->buckets[hash_num], el);
-                 free(el);
-                 hash->population--;
-                 if (hash->population <= 0)
+                  if ((!data) || (el->data == data))
                    {
-                      free(hash);
-                      hash = NULL;
+                      hash->buckets[hash_num] = evas_object_list_remove(hash->buckets[hash_num], el);
+                      free(el);
+                      hash->population--;
+                      if (hash->population <= 0)
+                        {
+                           free(hash);
+                           hash = NULL;
+                        }
+                      return hash;
                    }
-                 return hash;
               }
          }
      }