forked from enlightenment/efl
fix bugs spotted by clang static analyser.
We had some problems with preload and after running LLVM's CLang Static Analyser we found out that current->target could be NULL after loop. Also fixed some GCC and CLang warnings, kudos to these wonderful tools that "Saved The Day". PS: we should put some CLang Static Analyser results so others can help fix other parts of E. SVN revision: 38293
This commit is contained in:
parent
fb238897e5
commit
586979c07b
|
@ -870,6 +870,7 @@ evas_cache_image_load_data(Image_Entry *im)
|
||||||
|
|
||||||
assert(im);
|
assert(im);
|
||||||
assert(im->cache);
|
assert(im->cache);
|
||||||
|
cache = im->cache;
|
||||||
|
|
||||||
if (im->flags.loaded) return ;
|
if (im->flags.loaded) return ;
|
||||||
|
|
||||||
|
@ -879,8 +880,6 @@ evas_cache_image_load_data(Image_Entry *im)
|
||||||
if (im->flags.loaded) return ;
|
if (im->flags.loaded) return ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cache = im->cache;
|
|
||||||
|
|
||||||
error = cache->func.load(im);
|
error = cache->func.load(im);
|
||||||
|
|
||||||
if (cache->func.debug)
|
if (cache->func.debug)
|
||||||
|
@ -908,7 +907,8 @@ evas_cache_image_preload_data(Image_Entry *im, const void *target)
|
||||||
|
|
||||||
if (im->flags.loaded)
|
if (im->flags.loaded)
|
||||||
{
|
{
|
||||||
evas_async_events_put(target, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, evas_object_event_callback_call);
|
evas_async_events_put(target, EVAS_CALLBACK_IMAGE_PRELOADED, NULL,
|
||||||
|
(void (*)(void*, Evas_Callback_Type, void*))evas_object_event_callback_call);
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -930,6 +930,7 @@ evas_cache_image_preload_cancel(Image_Entry *im)
|
||||||
|
|
||||||
assert(im);
|
assert(im);
|
||||||
assert(im->cache);
|
assert(im->cache);
|
||||||
|
cache = im->cache;
|
||||||
|
|
||||||
_evas_cache_image_entry_preload_remove(cache, im);
|
_evas_cache_image_entry_preload_remove(cache, im);
|
||||||
#else
|
#else
|
||||||
|
@ -1023,7 +1024,7 @@ evas_cache_private_set(Evas_Cache_Image *cache, const void *data)
|
||||||
{
|
{
|
||||||
assert(cache);
|
assert(cache);
|
||||||
|
|
||||||
cache->data = data;
|
cache->data = (void *)data;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI DATA32 *
|
EAPI DATA32 *
|
||||||
|
@ -1078,11 +1079,13 @@ _evas_cache_background_load(void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
current->flags.preload = 0;
|
current->flags.preload = 0;
|
||||||
|
|
||||||
|
evas_async_events_put(current->target, EVAS_CALLBACK_IMAGE_PRELOADED, NULL,
|
||||||
|
(void (*)(void*, Evas_Callback_Type, void*))evas_object_event_callback_call);
|
||||||
|
|
||||||
|
current = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
evas_async_events_put(current->target, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, evas_object_event_callback_call);
|
|
||||||
|
|
||||||
current = NULL;
|
|
||||||
pthread_cond_signal(&cond);
|
pthread_cond_signal(&cond);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue