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

Fix llvm report in eain_tiler. 

The remaining llvm reports, in eina_rbtree.c, are not correct, I think.


SVN revision: 39710
This commit is contained in:
Vincent Torri 2009-03-25 12:04:21 +00:00
parent 18258b5721
commit 46b3ef7d0c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/eina/src/lib/eina_tiler.c
View File

@ -108,17 +108,23 @@ struct _Eina_Tiler
splitter_t splitter; splitter_t splitter;
}; };
#define EINA_MAGIC_CHECK_TILER(d) \ #define EINA_MAGIC_CHECK_TILER(d, ...) \
do { \ do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER)) \ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER)) \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER); \ EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER); \
return __VA_ARGS__; \
} \
} while(0) } while(0)
#define EINA_MAGIC_CHECK_TILER_ITERATOR(d) \ #define EINA_MAGIC_CHECK_TILER_ITERATOR(d, ...) \
do { \ do { \
if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR)) \ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR)) \
{ \
EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR); \ EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR); \
return __VA_ARGS__; \
} \
} while(0) } while(0)
/* The Splitter algorithm */ /* The Splitter algorithm */
@ -1068,7 +1074,7 @@ static Eina_Bool _iterator_next(Eina_Iterator_Tiler *it, void **data)
static void * _iterator_get_container(Eina_Iterator_Tiler *it) static void * _iterator_get_container(Eina_Iterator_Tiler *it)
{ {
EINA_MAGIC_CHECK_TILER_ITERATOR(it); EINA_MAGIC_CHECK_TILER_ITERATOR(it, NULL);
return (void *)it->tiler; return (void *)it->tiler;
} }
@ -1132,7 +1138,7 @@ EAPI Eina_Bool eina_tiler_rect_add(Eina_Tiler *t, Eina_Rectangle *r)
{ {
Eina_Rectangle tmp; Eina_Rectangle tmp;
EINA_MAGIC_CHECK_TILER(t); EINA_MAGIC_CHECK_TILER(t, EINA_FALSE);
if ((r->w <= 0) || (r->h <= 0)) if ((r->w <= 0) || (r->h <= 0))
return EINA_FALSE; return EINA_FALSE;
tmp = *r; tmp = *r;
@ -1175,7 +1181,7 @@ EAPI Eina_Iterator * eina_tiler_iterator_new(const Eina_Tiler *t)
{ {
Eina_Iterator_Tiler *it; Eina_Iterator_Tiler *it;
EINA_MAGIC_CHECK_TILER(t); EINA_MAGIC_CHECK_TILER(t, NULL);
it = calloc(1, sizeof (Eina_Iterator_Tiler)); it = calloc(1, sizeof (Eina_Iterator_Tiler));
if (!it) return NULL; if (!it) return NULL;