From: Enlightenment S. <no-...@en...> - 2009-03-25 12:04:23
|
Log: Fix llvm report in eain_tiler. The remaining llvm reports, in eina_rbtree.c, are not correct, I think. Author: caro Date: 2009-03-25 05:04:21 -0700 (Wed, 25 Mar 2009) New Revision: 39710 Modified: trunk/eina/src/lib/eina_tiler.c Modified: trunk/eina/src/lib/eina_tiler.c =================================================================== --- trunk/eina/src/lib/eina_tiler.c 2009-03-25 11:58:23 UTC (rev 39709) +++ trunk/eina/src/lib/eina_tiler.c 2009-03-25 12:04:21 UTC (rev 39710) @@ -108,17 +108,23 @@ splitter_t splitter; }; -#define EINA_MAGIC_CHECK_TILER(d) \ +#define EINA_MAGIC_CHECK_TILER(d, ...) \ do { \ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER)) \ + { \ EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER); \ + return __VA_ARGS__; \ + } \ } while(0) -#define EINA_MAGIC_CHECK_TILER_ITERATOR(d) \ +#define EINA_MAGIC_CHECK_TILER_ITERATOR(d, ...) \ do { \ if (!EINA_MAGIC_CHECK(d, EINA_MAGIC_TILER_ITERATOR)) \ + { \ EINA_MAGIC_FAIL(d, EINA_MAGIC_TILER_ITERATOR); \ + return __VA_ARGS__; \ + } \ } while(0) /* The Splitter algorithm */ @@ -1068,7 +1074,7 @@ 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; } @@ -1132,7 +1138,7 @@ { Eina_Rectangle tmp; - EINA_MAGIC_CHECK_TILER(t); + EINA_MAGIC_CHECK_TILER(t, EINA_FALSE); if ((r->w <= 0) || (r->h <= 0)) return EINA_FALSE; tmp = *r; @@ -1175,7 +1181,7 @@ { Eina_Iterator_Tiler *it; - EINA_MAGIC_CHECK_TILER(t); + EINA_MAGIC_CHECK_TILER(t, NULL); it = calloc(1, sizeof (Eina_Iterator_Tiler)); if (!it) return NULL; |