From 5e255d61bb7bf6bf79af32fdd78d2a0ed7f68739 Mon Sep 17 00:00:00 2001
From: caro <caro>
Date: Tue, 24 Mar 2009 07:10:46 +0000
Subject: [PATCH] use variadic macros, as suggested by Gustavo

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@39663 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 src/lib/eina_array.c | 12 ++++++------
 src/lib/eina_hash.c  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/eina_array.c b/src/lib/eina_array.c
index c1cdfe3..5ae254e 100644
--- a/src/lib/eina_array.c
+++ b/src/lib/eina_array.c
@@ -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);
 }
 
diff --git a/src/lib/eina_hash.c b/src/lib/eina_hash.c
index a9d8742..2a450ab 100644
--- a/src/lib/eina_hash.c
+++ b/src/lib/eina_hash.c
@@ -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);
-- 
2.7.4