[svn merge] Changeset 51650 - Revert and reapply badnull patch

diff --git a/src/lib/cache/evas_cache_engine_image.c b/src/lib/cache/evas_cache_engine_image.c
index ca71fe8..4744cfa 100644 (file)
--- a/src/lib/cache/evas_cache_engine_image.c
+++ b/src/lib/cache/evas_cache_engine_image.c
@@ -144,7 +144,7 @@ _evas_cache_engine_image_dealloc(Evas_Cache_Engine_Image *cache, Engine_Image_En
 EAPI int
 evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 
    return cache->usage;
 }
@@ -152,7 +152,7 @@ evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache)
 EAPI int
 evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 
    return cache->limit;
 }
@@ -160,7 +160,7 @@ evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache)
 EAPI void
 evas_cache_engine_image_set(Evas_Cache_Engine_Image *cache, int limit)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 
    cache->limit = limit;
 }
@@ -247,7 +247,7 @@ _evas_cache_engine_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ co
 EAPI void
 evas_cache_engine_image_flush(Evas_Cache_Engine_Image *cache)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 
    while ((cache->lru) && (cache->limit < cache->usage))
      {
@@ -264,7 +264,7 @@ evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache)
    Engine_Image_Entry   *eim;
    Eina_List *delete_list = NULL;
 
-   assert(!!cache);
+   assert(cache != NULL);
 
    if (cache->func.debug) cache->func.debug("shutdown-engine", NULL);
 
@@ -303,7 +303,7 @@ evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache,
    Image_Entry          *im;
    const char          *ekey;
 
-   assert(!!cache);
+   assert(cache != NULL);
 
    *error = EVAS_LOAD_ERROR_NONE;
 

diff --git a/src/lib/cache/evas_cache_image.c b/src/lib/cache/evas_cache_image.c
index 117815d..bba2691 100644 (file)
--- a/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c
@@ -525,7 +525,7 @@ _evas_cache_image_entry_preload_remove(Image_Entry *ie, const void *target)
 EAPI int
 evas_cache_image_usage_get(Evas_Cache_Image *cache)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 
    return cache->usage;
 }
@@ -533,7 +533,7 @@ evas_cache_image_usage_get(Evas_Cache_Image *cache)
 EAPI int
 evas_cache_image_get(Evas_Cache_Image *cache)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 
    return cache->limit;
 }
@@ -541,7 +541,7 @@ evas_cache_image_get(Evas_Cache_Image *cache)
 EAPI void
 evas_cache_image_set(Evas_Cache_Image *cache, int limit)
 {
-   assert(!!cache);
+   assert(cache != NULL);
 #ifdef EVAS_FRAME_QUEUING
    LKL(cache->lock);
 #endif
@@ -698,7 +698,7 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
    size_t                key_length;
    struct stat           st;
 
-   assert(!!cache);
+   assert(cache != NULL);
 
    if ((!file) || ((!file) && (!key)))
      {

diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c
index 8ea3188..4acbc9f 100644 (file)
--- a/src/lib/engines/common/evas_font_load.c
+++ b/src/lib/engines/common/evas_font_load.c
@@ -131,7 +131,7 @@ evas_common_font_source_memory_load(const char *name, const void *data, int data
    int error;
    RGBA_Font_Source *fs;
 
-   assert(!!name);
+   assert(name != NULL);
 
    fs = calloc(1, sizeof(RGBA_Font_Source) + data_size);
    if (!fs) return NULL;
@@ -164,7 +164,7 @@ evas_common_font_source_load(const char *name)
 {
    RGBA_Font_Source *fs;
 
-   assert(!!name);
+   assert(name != NULL);
 
    fs = calloc(1, sizeof(RGBA_Font_Source));
    if (!fs) return NULL;

diff --git a/src/lib/include/evas_inline.x b/src/lib/include/evas_inline.x
index c08ee9a..d306565 100644 (file)
--- a/src/lib/include/evas_inline.x
+++ b/src/lib/include/evas_inline.x
@@ -175,8 +175,8 @@ evas_object_clip_recalc(Evas_Object *obj)
    int cx, cy, cw, ch, cvis, cr, cg, cb, ca;
    int nx, ny, nw, nh, nvis, nr, ng, nb, na;
 
-   if (!obj->cur.cache.clip.dirty &&
-       !(obj->cur.clipper == NULL || obj->cur.clipper->cur.cache.clip.dirty))
+   if ((!obj->cur.cache.clip.dirty) &&
+       !(!obj->cur.clipper || obj->cur.clipper->cur.cache.clip.dirty))
      return;
    if (obj->layer->evas->events_frozen > 0) return;
    evas_object_coords_recalc(obj);