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

* 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
This commit is contained in:
Cedric BAIL 2009-01-20 16:47:19 +00:00
parent 7554db7669
commit f0096a167c
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/eina/src/include/eina_private.h
View File

@ -95,10 +95,12 @@
} while(0); } while(0);
#define MAGIC_FREE(ptr) \ #define MAGIC_FREE(ptr) \
if (ptr) { \ do { \
EINA_MAGIC_SET(ptr, EINA_MAGIC_NONE); \ if (ptr) { \
FREE(ptr); \ EINA_MAGIC_SET(ptr, EINA_MAGIC_NONE); \
} FREE(ptr); \
} \
} while(0);
#endif /* EINA_PRIVATE_H_ */ #endif /* EINA_PRIVATE_H_ */

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

@ -35,6 +35,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "eina_types.h"
#include "eina_error.h" #include "eina_error.h"
#include "eina_array.h" #include "eina_array.h"
#include "eina_inline_array.x" #include "eina_inline_array.x"
@ -89,12 +90,19 @@ struct _Eina_Accessor_Array
static int _eina_array_init_count = 0; 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 static Eina_Bool
eina_array_iterator_next(Eina_Iterator_Array *it, void **data) eina_array_iterator_next(Eina_Iterator_Array *it, void **data)
{ {
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it); EINA_MAGIC_CHECK_ARRAY_ITERATOR(it);
if (!it) return EINA_FALSE;
if (!(it->index < eina_array_count_get(it->array))) if (!(it->index < eina_array_count_get(it->array)))
return EINA_FALSE; return EINA_FALSE;
if (data) if (data)
@ -107,7 +115,7 @@ static Eina_Array *
eina_array_iterator_get_container(Eina_Iterator_Array *it) eina_array_iterator_get_container(Eina_Iterator_Array *it)
{ {
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it); EINA_MAGIC_CHECK_ARRAY_ITERATOR(it);
return it ? (Eina_Array *) it->array : NULL; return (Eina_Array *) it->array;
} }
static void 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); EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
if (!it) return EINA_FALSE;
if (!(index < eina_array_count_get(it->array))) if (!(index < eina_array_count_get(it->array)))
return EINA_FALSE; return EINA_FALSE;
if (data) if (data)
@ -134,7 +141,7 @@ static Eina_Array *
eina_array_accessor_get_container(Eina_Accessor_Array *it) eina_array_accessor_get_container(Eina_Accessor_Array *it)
{ {
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it); EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
return it ? (Eina_Array *) it->array : NULL; return (Eina_Array *) it->array;
} }
static void static void