enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Remove some unused variables/dead assignments. 

Fix some formatting while I am here.



SVN revision: 50717
This commit is contained in:
Christopher Michael 2010-07-31 17:06:55 +00:00
parent b115cdf6b5
commit d061f6229c
1 changed files with 42 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
legacy/evas/src/lib/cache/evas_cache_image.c vendored
View File

@ -51,8 +51,7 @@ static void _evas_cache_image_entry_preload_remove(Image_Entry *ie, const void *
static void _evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie); static void _evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie);
static void static void
_evas_cache_image_make_dirty(Evas_Cache_Image *cache, _evas_cache_image_make_dirty(Evas_Cache_Image *cache, Image_Entry *im)
Image_Entry *im)
{ {
im->flags.cached = 1; im->flags.cached = 1;
im->flags.dirty = 1; im->flags.dirty = 1;
@ -75,8 +74,7 @@ _evas_cache_image_make_dirty(Evas_Cache_Image *cache,
static void static void
_evas_cache_image_make_activ(Evas_Cache_Image *cache, _evas_cache_image_make_activ(Evas_Cache_Image *cache,
Image_Entry *im, Image_Entry *im, const char *key)
const char *key)
{ {
/* FIXME: Handle case when image is being processed anyway and don't do a double decode. */ /* FIXME: Handle case when image is being processed anyway and don't do a double decode. */
im->cache_key = key; im->cache_key = key;
@ -102,8 +100,7 @@ _evas_cache_image_make_activ(Evas_Cache_Image *cache,
static void static void
_evas_cache_image_make_inactiv(Evas_Cache_Image *cache, _evas_cache_image_make_inactiv(Evas_Cache_Image *cache,
Image_Entry *im, Image_Entry *im, const char *key)
const char *key)
{ {
if (im->cache_key) if (im->cache_key)
{ {
@ -127,8 +124,7 @@ _evas_cache_image_make_inactiv(Evas_Cache_Image *cache,
} }
static void static void
_evas_cache_image_remove_lru_nodata(Evas_Cache_Image *cache, _evas_cache_image_remove_lru_nodata(Evas_Cache_Image *cache, Image_Entry *im)
Image_Entry *im)
{ {
if (im->flags.lru_nodata) if (im->flags.lru_nodata)
{ {
@ -145,8 +141,7 @@ _evas_cache_image_remove_lru_nodata(Evas_Cache_Image *cache,
} }
static void static void
_evas_cache_image_activ_lru_nodata(Evas_Cache_Image *cache, _evas_cache_image_activ_lru_nodata(Evas_Cache_Image *cache, Image_Entry *im)
Image_Entry *im)
{ {
im->flags.need_data = 0; im->flags.need_data = 0;
im->flags.lru_nodata = 1; im->flags.lru_nodata = 1;
@ -161,8 +156,7 @@ _evas_cache_image_activ_lru_nodata(Evas_Cache_Image *cache,
} }
static void static void
_evas_cache_image_remove_activ(Evas_Cache_Image *cache, _evas_cache_image_remove_activ(Evas_Cache_Image *cache, Image_Entry *ie)
Image_Entry *ie)
{ {
if (ie->flags.cached) if (ie->flags.cached)
{ {
@ -205,8 +199,7 @@ _evas_cache_image_remove_activ(Evas_Cache_Image *cache,
static void static void
_evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie) _evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie)
{ {
if (!ie) if (!ie) return;
return ;
if (cache->func.debug) if (cache->func.debug)
cache->func.debug("deleting", ie); cache->func.debug("deleting", ie);
@ -333,8 +326,7 @@ _evas_cache_image_entry_new(Evas_Cache_Image *cache,
static void static void
_evas_cache_image_entry_surface_alloc__locked(Evas_Cache_Image *cache, _evas_cache_image_entry_surface_alloc__locked(Evas_Cache_Image *cache,
Image_Entry *ie, Image_Entry *ie,
int wmin, int wmin, int hmin)
int hmin)
{ {
if (ie->allocated.w == wmin && ie->allocated.h == hmin) if (ie->allocated.w == wmin && ie->allocated.h == hmin)
return ; return ;
@ -353,9 +345,7 @@ _evas_cache_image_entry_surface_alloc__locked(Evas_Cache_Image *cache,
static void static void
_evas_cache_image_entry_surface_alloc(Evas_Cache_Image *cache, _evas_cache_image_entry_surface_alloc(Evas_Cache_Image *cache,
Image_Entry *ie, Image_Entry *ie, int w, int h)
int w,
int h)
{ {
int wmin; int wmin;
int hmin; int hmin;
@ -466,8 +456,7 @@ _evas_cache_image_async_cancel(void *data)
} }
static int static int
_evas_cache_image_entry_preload_add(Image_Entry *ie, _evas_cache_image_entry_preload_add(Image_Entry *ie, const void *target)
const void *target)
{ {
Evas_Cache_Target *tg; Evas_Cache_Target *tg;
@ -580,8 +569,7 @@ evas_cache_image_init(const Evas_Cache_Image_Func *cb)
Evas_Cache_Image *new; Evas_Cache_Image *new;
new = malloc(sizeof (Evas_Cache_Image)); new = malloc(sizeof (Evas_Cache_Image));
if (!new) if (!new) return NULL;
return NULL;
new->func = *cb; new->func = *cb;
@ -1021,11 +1009,10 @@ evas_cache_image_dirty(Image_Entry *im, int x, int y, int w, int h)
{ {
int error; int error;
im_dirty = evas_cache_image_copied_data im_dirty =
(cache, im->w, im->h, evas_cache_image_copied_data(cache, im->w, im->h,
evas_cache_image_pixels(im), evas_cache_image_pixels(im),
im->flags.alpha, im->flags.alpha, im->space);
im->space);
if (!im_dirty) goto on_error; if (!im_dirty) goto on_error;
if (cache->func.debug) if (cache->func.debug)
cache->func.debug("dirty-src", im); cache->func.debug("dirty-src", im);
@ -1308,10 +1295,7 @@ evas_cache_image_load_data(Image_Entry *im)
assert(im->cache); assert(im->cache);
cache = im->cache; cache = im->cache;
if (im->flags.loaded) if (im->flags.loaded) return;
{
return;
}
#ifdef BUILD_ASYNC_PRELOAD #ifdef BUILD_ASYNC_PRELOAD
if (im->preload) if (im->preload)
@ -1380,7 +1364,7 @@ evas_cache_image_unload_data(Image_Entry *im)
assert(im->cache); assert(im->cache);
cache = im->cache; cache = im->cache;
if (im->flags.in_progress) return ; if (im->flags.in_progress) return;
evas_cache_image_preload_cancel(im, NULL); evas_cache_image_preload_cancel(im, NULL);
@ -1433,8 +1417,6 @@ EAPI void
evas_cache_image_preload_data(Image_Entry *im, const void *target) evas_cache_image_preload_data(Image_Entry *im, const void *target)
{ {
#ifdef BUILD_ASYNC_PRELOAD #ifdef BUILD_ASYNC_PRELOAD
Evas_Cache_Image *cache;
assert(im); assert(im);
assert(im->cache); assert(im->cache);
@ -1444,8 +1426,6 @@ evas_cache_image_preload_data(Image_Entry *im, const void *target)
return; return;
} }
cache = im->cache;
if (!_evas_cache_image_entry_preload_add(im, target)) if (!_evas_cache_image_entry_preload_add(im, target))
evas_object_inform_call_image_preloaded((Evas_Object *)target); evas_object_inform_call_image_preloaded((Evas_Object *)target);
#else #else
@ -1458,7 +1438,6 @@ EAPI void
evas_cache_image_preload_cancel(Image_Entry *im, const void *target) evas_cache_image_preload_cancel(Image_Entry *im, const void *target)
{ {
#ifdef BUILD_ASYNC_PRELOAD #ifdef BUILD_ASYNC_PRELOAD
assert(im); assert(im);
assert(im->cache); assert(im->cache);