enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

fix some llvm report 

SVN revision: 39657
This commit is contained in:
Vincent Torri 2009-03-23 20:36:10 +00:00
parent 3e94ac52b6
commit 7e809db9c8
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,16 +170,22 @@
EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY); \
} while (0);
#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d) \
#define EINA_MAGIC_CHECK_ARRAY_ITERATOR(d, val) \
do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ITERATOR)) \
EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR); \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_ARRAY_ITERATOR); \
return val; \
} \
} while (0);
#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d) \
#define EINA_MAGIC_CHECK_ARRAY_ACCESSOR(d, val) \
do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_ARRAY_ACCESSOR)) \
EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR); \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_ACCESSOR); \
return val; \
} \
} while (0);
@ -215,7 +221,7 @@ 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);
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, EINA_FALSE);
if (!(it->index < eina_array_count_get(it->array)))
return EINA_FALSE;
@ -228,21 +234,21 @@ eina_array_iterator_next(Eina_Iterator_Array *it, void **data)
static Eina_Array *
eina_array_iterator_get_container(Eina_Iterator_Array *it)
{
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it);
EINA_MAGIC_CHECK_ARRAY_ITERATOR(it, NULL);
return (Eina_Array *) it->array;
}
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);
}
static Eina_Bool
eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **data)
{
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, EINA_FALSE);
if (!(index < eina_array_count_get(it->array)))
return EINA_FALSE;
@ -254,14 +260,14 @@ eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **d
static Eina_Array *
eina_array_accessor_get_container(Eina_Accessor_Array *it)
{
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it);
EINA_MAGIC_CHECK_ARRAY_ACCESSOR(it, NULL);
return (Eina_Array *) it->array;
}
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);
}

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

@ -49,10 +49,13 @@
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH); \
} while(0)
#define EINA_MAGIC_CHECK_HASH_ITERATOR(d) \
#define EINA_MAGIC_CHECK_HASH_ITERATOR(d, val) \
do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_HASH_ITERATOR)) \
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR); \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_HASH_ITERATOR); \
return val; \
} \
} while(0)
#define EINA_HASH_BUCKET_SIZE 8
@ -481,7 +484,7 @@ _eina_hash_iterator_data_get_content(Eina_Iterator_Hash *it)
{
Eina_Hash_El *stuff;
EINA_MAGIC_CHECK_HASH_ITERATOR(it);
EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
stuff = it->el;
@ -494,7 +497,7 @@ _eina_hash_iterator_key_get_content(Eina_Iterator_Hash *it)
{
Eina_Hash_El *stuff;
EINA_MAGIC_CHECK_HASH_ITERATOR(it);
EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
stuff = it->el;
@ -507,7 +510,7 @@ _eina_hash_iterator_tuple_get_content(Eina_Iterator_Hash *it)
{
Eina_Hash_El *stuff;
EINA_MAGIC_CHECK_HASH_ITERATOR(it);
EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
stuff = it->el;
@ -585,14 +588,14 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
static void *
_eina_hash_iterator_get_container(Eina_Iterator_Hash *it)
{
EINA_MAGIC_CHECK_HASH_ITERATOR(it);
EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
return (void *) it->hash;
}
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);