eina: return NULL iterator in all case, not only when safety check is turned on. 36/67236/1
authorDuna Oh <duna.oh@samsung.com>
Tue, 26 Apr 2016 03:02:20 +0000 (12:02 +0900)
committerDuna Oh <duna.oh@samsung.com>
Tue, 26 Apr 2016 03:03:35 +0000 (12:03 +0900)
origin from upstream:
https://git.enlightenment.org/core/efl.git/commit/src/lib/eina/eina_hash.c?id=5aa6a73b3461af4d67ba2dfe369ee2da3e11c9b5

Signed-off-by: Duna Oh <duna.oh@samsung.com>
Change-Id: I329c710efe7d71b4dc0e28004add06f0754cba8e

src/lib/eina/eina_hash.c

index fe2ec51..f950b19 100644 (file)
@@ -1221,7 +1221,7 @@ eina_hash_iterator_data_new(const Eina_Hash *hash)
 {
    Eina_Iterator_Hash *it;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(hash, NULL);
+   if (!hash) return NULL;
    EINA_MAGIC_CHECK_HASH(hash);
 
    it = calloc(1, sizeof (Eina_Iterator_Hash));
@@ -1247,7 +1247,7 @@ eina_hash_iterator_key_new(const Eina_Hash *hash)
 {
    Eina_Iterator_Hash *it;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(hash, NULL);
+   if (!hash) return NULL;
    EINA_MAGIC_CHECK_HASH(hash);
 
    it = calloc(1, sizeof (Eina_Iterator_Hash));
@@ -1274,7 +1274,7 @@ eina_hash_iterator_tuple_new(const Eina_Hash *hash)
 {
    Eina_Iterator_Hash *it;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(hash, NULL);
+   if (!hash) return NULL;
    EINA_MAGIC_CHECK_HASH(hash);
 
    it = calloc(1, sizeof (Eina_Iterator_Hash));