From f0096a167c566a16489a532cb1ccff7db8ef680a Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Tue, 20 Jan 2009 16:47:19 +0000
Subject: [PATCH] 	* eina/src/include/eina_private.h: better use do {}
 while(0); 	* eina/src/lib/eina_array.c: Use gcc attribute to shutdown
 llvm warning.

SVN revision: 38666
---
 legacy/eina/src/include/eina_private.h | 10 ++++++----
 legacy/eina/src/lib/eina_array.c       | 15 +++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/legacy/eina/src/include/eina_private.h b/legacy/eina/src/include/eina_private.h
index 7215ab5fd4..e612190b0c 100644
--- a/legacy/eina/src/include/eina_private.h
+++ b/legacy/eina/src/include/eina_private.h
@@ -95,10 +95,12 @@
   } while(0);
 
 #define MAGIC_FREE(ptr)					\
-  if (ptr) {						\
-     EINA_MAGIC_SET(ptr, EINA_MAGIC_NONE);		\
-     FREE(ptr);						\
-  }
+  do {							\
+     if (ptr) {						\
+	EINA_MAGIC_SET(ptr, EINA_MAGIC_NONE);		\
+	FREE(ptr);					\
+     }							\
+  } while(0);
 
 #endif /* EINA_PRIVATE_H_ */
 
diff --git a/legacy/eina/src/lib/eina_array.c b/legacy/eina/src/lib/eina_array.c
index eec50d485c..8415b6e56d 100644
--- a/legacy/eina/src/lib/eina_array.c
+++ b/legacy/eina/src/lib/eina_array.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "eina_types.h"
 #include "eina_error.h"
 #include "eina_array.h"
 #include "eina_inline_array.x"
@@ -89,12 +90,19 @@ struct _Eina_Accessor_Array
 
 static int _eina_array_init_count = 0;
 
+static void eina_array_iterator_free(Eina_Iterator_Array *it) EINA_ARG_NONNULL(1);
+static Eina_Array *eina_array_iterator_get_container(Eina_Iterator_Array *it) EINA_ARG_NONNULL(1);
+static Eina_Bool eina_array_iterator_next(Eina_Iterator_Array *it, void **data) EINA_ARG_NONNULL(1);
+
+static Eina_Bool eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **data) EINA_ARG_NONNULL(1);
+static Eina_Array *eina_array_accessor_get_container(Eina_Accessor_Array *it) EINA_ARG_NONNULL(1);
+static void eina_array_accessor_free(Eina_Accessor_Array *it) EINA_ARG_NONNULL(1);
+
 static Eina_Bool
 eina_array_iterator_next(Eina_Iterator_Array *it, void **data)
 {
    EINA_MAGIC_CHECK_ARRAY_ITERATOR(it);
 
-   if (!it) return EINA_FALSE;
    if (!(it->index < eina_array_count_get(it->array)))
      return EINA_FALSE;
    if (data)
@@ -107,7 +115,7 @@ static Eina_Array *
 eina_array_iterator_get_container(Eina_Iterator_Array *it)
 {
    EINA_MAGIC_CHECK_ARRAY_ITERATOR(it);
-   return it ? (Eina_Array *) it->array : NULL;
+   return (Eina_Array *) it->array;
 }
 
 static void
@@ -122,7 +130,6 @@ eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **d
 {
    EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
 
-   if (!it) return EINA_FALSE;
    if (!(index < eina_array_count_get(it->array)))
      return EINA_FALSE;
    if (data)
@@ -134,7 +141,7 @@ static Eina_Array *
 eina_array_accessor_get_container(Eina_Accessor_Array *it)
 {
    EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
-   return it ? (Eina_Array *) it->array : NULL;
+   return (Eina_Array *) it->array;
 }
 
 static void