Log:
fix some llvm report
Author: caro
Date: 2009-03-23 13:36:10 -0700 (Mon, 23 Mar 2009)
New Revision: 39657
Modified:
trunk/eina/src/lib/eina_array.c trunk/eina/src/lib/eina_hash.c
Modified: trunk/eina/src/lib/eina_array.c
===================================================================
--- trunk/eina/src/lib/eina_array.c 2009-03-23 13:49:36 UTC (rev 39656)
+++ trunk/eina/src/lib/eina_array.c 2009-03-23 20:36:10 UTC (rev 39657)
@@ -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 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 @@
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 @@
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);
}
Modified: trunk/eina/src/lib/eina_hash.c
===================================================================
--- trunk/eina/src/lib/eina_hash.c 2009-03-23 13:49:36 UTC (rev 39656)
+++ trunk/eina/src/lib/eina_hash.c 2009-03-23 20:36:10 UTC (rev 39657)
@@ -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_El *stuff;
- EINA_MAGIC_CHECK_HASH_ITERATOR(it);
+ EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
stuff = it->el;
@@ -494,7 +497,7 @@
{
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_El *stuff;
- EINA_MAGIC_CHECK_HASH_ITERATOR(it);
+ EINA_MAGIC_CHECK_HASH_ITERATOR(it, NULL);
stuff = it->el;
@@ -585,14 +588,14 @@
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);
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
enlightenment-svn mailing list
enlightenment-...@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
