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

use variadic macros, as suggested by Gustavo 

SVN revision: 39663
This commit is contained in:
Vincent Torri 2009-03-24 07:10:46 +00:00
parent 7e809db9c8
commit 309606b2dd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/eina/src/lib/eina_array.c
View File

@ -170,21 +170,21 @@
EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY); \
} while (0);
#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d, val) \
#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d, ...) \
do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR)) \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR); \
return val; \
return __VA_ARGS__; \
} \
} while (0);
#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d, val) \
#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d, ...) \
do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR)) \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR); \
return val; \
return __VA_ARGS__; \
} \
} while (0);
@ -241,7 +241,7 @@ eina_array_iterator_get_container(Eina_Iterator_Array *it)
static void
eina_array_iterator_free(Eina_Iterator_Array *it)
{
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it,);
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it);
MAGIC_FREE(it);
}
@ -267,7 +267,7 @@ eina_array_accessor_get_container(Eina_Accessor_Array *it)
static void
eina_array_accessor_free(Eina_Accessor_Array *it)
{
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, );
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
MAGIC_FREE(it);
}

6
legacy/eina/src/lib/eina_hash.c
View File

@ -49,12 +49,12 @@
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH); \
} while(0)
#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, val) \
#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, ...) \
do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR)) \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR); \
return val; \
return __VA_ARGS__; \
} \
} while(0)
@ -595,7 +595,7 @@ _eina_hash_iterator_get_container(Eina_Iterator_Hash *it)
static void
_eina_hash_iterator_free(Eina_Iterator_Hash *it)
{
EINA_MAGIC_CHECK_HASH_ITERATOR(it, );
EINA_MAGIC_CHECK_HASH_ITERATOR(it);
if (it->current) eina_iterator_free(it->current);
if (it->list) eina_iterator_free(it->list);
free(it);