Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/cache
Modified Files:
evas_cache_engine_image.c evas_cache_image.c
Log Message:
As cache_key uses evas_stringshare, it should be const.
Don't free stringshare'd strings.
Formatting.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/cache/evas_cache_engine_image.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_cache_engine_image.c 16 Jul 2007 07:25:33 -0000 1.1
+++ evas_cache_engine_image.c 13 Aug 2007 05:30:17 -0000 1.2
@@ -5,7 +5,7 @@
#include "evas_private.h"
EAPI int
-evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image* cache)
+evas_cache_engine_image_usage_get(Evas_Cache_Engine_Image *cache)
{
assert(cache != NULL);
@@ -13,7 +13,7 @@
}
EAPI int
-evas_cache_engine_image_get(Evas_Cache_Engine_Image* cache)
+evas_cache_engine_image_get(Evas_Cache_Engine_Image *cache)
{
assert(cache != NULL);
@@ -21,17 +21,17 @@
}
EAPI void
-evas_cache_engine_image_set(Evas_Cache_Engine_Image* cache, int limit)
+evas_cache_engine_image_set(Evas_Cache_Engine_Image *cache, int limit)
{
assert(cache != NULL);
cache->limit = limit;
}
-EAPI Evas_Cache_Engine_Image*
+EAPI Evas_Cache_Engine_Image *
evas_cache_engine_image_init(const Evas_Cache_Engine_Image_Func *cb,
Evas_Cache_Image *parent)
{
- Evas_Cache_Engine_Image* new;
+ Evas_Cache_Engine_Image *new;
new = malloc(sizeof (Evas_Cache_Engine_Image));
if (!new)
@@ -54,9 +54,9 @@
static Evas_Bool
_evas_cache_engine_image_free_cb(Evas_Hash *hash, const char *key, void *data,
void *fdata)
{
- Evas_Cache_Engine_Image* cache = fdata;
- RGBA_Engine_Image* eim = data;
- RGBA_Image* im;
+ Evas_Cache_Engine_Image *cache = fdata;
+ RGBA_Engine_Image *eim = data;
+ RGBA_Image *im;
if (cache->func.debug)
cache->func.debug("shutdown-engine-activ", eim);
@@ -73,17 +73,17 @@
}
EAPI void
-evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image* cache)
+evas_cache_engine_image_shutdown(Evas_Cache_Engine_Image *cache)
{
- RGBA_Engine_Image* eim;
- RGBA_Image* im;
+ RGBA_Engine_Image *eim;
+ RGBA_Image *im;
assert(cache != NULL);
/* This is mad, I am about to destroy image still alive, but we need to
prevent leak. */
while (cache->dirty)
{
- eim = (RGBA_Engine_Image*) cache->dirty;
+ eim = (RGBA_Engine_Image *) cache->dirty;
im = eim->src;
cache->dirty = evas_object_list_remove(cache->dirty, eim);
@@ -99,13 +99,13 @@
evas_hash_free(cache->activ);
}
-EAPI RGBA_Engine_Image*
+EAPI RGBA_Engine_Image *
evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache, const char
*file, const char *key,
RGBA_Image_Loadopts *lo, void *data, int
*error)
{
- RGBA_Engine_Image* eim;
- RGBA_Image* im;
- const char* ekey;
+ RGBA_Engine_Image *eim;
+ RGBA_Image *im;
+ const char *ekey;
assert(cache != NULL);
@@ -162,7 +162,7 @@
}
static void
-_evas_cache_engine_image_free(Evas_Cache_Engine_Image* cache,
RGBA_Engine_Image *eim)
+_evas_cache_engine_image_free(Evas_Cache_Engine_Image *cache,
RGBA_Engine_Image *eim)
{
int size;
@@ -180,7 +180,7 @@
EAPI void
evas_cache_engine_image_drop(RGBA_Engine_Image *eim)
{
- Evas_Cache_Engine_Image* cache;
+ Evas_Cache_Engine_Image *cache;
assert(eim);
assert(eim->cache);
@@ -205,13 +205,13 @@
}
}
-EAPI RGBA_Engine_Image*
+EAPI RGBA_Engine_Image *
evas_cache_engine_image_dirty(RGBA_Engine_Image *eim, int x, int y, int w, int
h)
{
- RGBA_Engine_Image* eim_dirty = eim;
- RGBA_Image* im;
- RGBA_Image* im_dirty;
- Evas_Cache_Engine_Image* cache;
+ RGBA_Engine_Image *eim_dirty = eim;
+ RGBA_Image *im;
+ RGBA_Image *im_dirty;
+ Evas_Cache_Engine_Image *cache;
assert(eim);
assert(eim->cache);
@@ -227,7 +227,7 @@
{
if (eim->references == 1)
{
- const char* hkey;
+ const char *hkey;
hkey = eim->cache_key;
cache->activ = evas_hash_del(cache->activ, hkey, eim);
@@ -289,8 +289,8 @@
return NULL;
}
-static RGBA_Engine_Image*
-_evas_cache_engine_image_push_dirty(Evas_Cache_Engine_Image *cache, RGBA_Image
*im, void* engine_data)
+static RGBA_Engine_Image *
+_evas_cache_engine_image_push_dirty(Evas_Cache_Engine_Image *cache, RGBA_Image
*im, void *engine_data)
{
RGBA_Engine_Image *eim;
int error;
@@ -323,8 +323,8 @@
return NULL;
}
-EAPI RGBA_Engine_Image*
-evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int
h, DATA32 *image_data, int alpha, int cspace, void* engine_data)
+EAPI RGBA_Engine_Image *
+evas_cache_engine_image_copied_data(Evas_Cache_Engine_Image *cache, int w, int
h, DATA32 *image_data, int alpha, int cspace, void *engine_data)
{
RGBA_Image *im;
@@ -335,8 +335,8 @@
return _evas_cache_engine_image_push_dirty(cache, im, engine_data);
}
-EAPI RGBA_Engine_Image*
-evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h,
DATA32 *image_data, int alpha, int cspace, void* engine_data)
+EAPI RGBA_Engine_Image *
+evas_cache_engine_image_data(Evas_Cache_Engine_Image *cache, int w, int h,
DATA32 *image_data, int alpha, int cspace, void *engine_data)
{
RGBA_Image *im;
@@ -347,12 +347,12 @@
return _evas_cache_engine_image_push_dirty(cache, im, engine_data);
}
-EAPI RGBA_Engine_Image*
+EAPI RGBA_Engine_Image *
evas_cache_engine_image_size_set(RGBA_Engine_Image *eim, int w, int h)
{
- Evas_Cache_Engine_Image* cache;
- RGBA_Engine_Image* new;
- RGBA_Image* im;
+ Evas_Cache_Engine_Image *cache;
+ RGBA_Engine_Image *new;
+ RGBA_Image *im;
int error;
assert(eim);
@@ -396,7 +396,7 @@
}
else
{
- char* cache_key = NULL;
+ const char *cache_key = NULL;
cache_key = eim->cache_key ? evas_stringshare_add(eim->cache_key) :
NULL;
new->cache_key = cache_key;
@@ -422,7 +422,7 @@
EAPI void
evas_cache_engine_image_load_data(RGBA_Engine_Image *eim)
{
- Evas_Cache_Engine_Image* cache;
+ Evas_Cache_Engine_Image *cache;
int size;
assert(eim);
@@ -445,10 +445,10 @@
eim->flags.loaded = 1;
}
-EAPI RGBA_Engine_Image*
+EAPI RGBA_Engine_Image *
evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void
*engine_data)
{
- RGBA_Engine_Image* eim;
+ RGBA_Engine_Image *eim;
int error;
eim = malloc(sizeof(RGBA_Engine_Image));
@@ -481,9 +481,9 @@
}
EAPI void
-evas_cache_engine_image_colorspace(RGBA_Engine_Image* eim, int cspace, void*
engine_data)
+evas_cache_engine_image_colorspace(RGBA_Engine_Image *eim, int cspace, void
*engine_data)
{
- Evas_Cache_Engine_Image* cache = eim->cache;
+ Evas_Cache_Engine_Image *cache = eim->cache;
assert(cache);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/cache/evas_cache_image.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_cache_image.c 11 Aug 2007 12:22:43 -0000 1.6
+++ evas_cache_image.c 13 Aug 2007 05:30:17 -0000 1.7
@@ -29,10 +29,10 @@
cache->limit = limit;
}
-EAPI Evas_Cache_Image*
+EAPI Evas_Cache_Image *
evas_cache_image_init(const Evas_Cache_Image_Func *cb)
{
- Evas_Cache_Image* new;
+ Evas_Cache_Image *new;
new = malloc(sizeof (Evas_Cache_Image));
if (!new)
@@ -56,14 +56,17 @@
static Evas_Bool
_evas_cache_image_free_cb(Evas_Hash *hash, const char *key, void *data, void
*fdata)
{
- Evas_Cache_Image* cache = fdata;
- RGBA_Image* im = data;
+ Evas_Cache_Image *cache = fdata;
+ RGBA_Image *im = data;
if (cache->func.debug)
cache->func.debug("shutdown-activ", im);
- free(im->cache_key);
- im->cache_key = NULL;
+ if (im->cache_key)
+ {
+ evas_stringshare_del(im->cache_key);
+ im->cache_key = NULL;
+ }
cache->func.destructor(im);
evas_common_image_delete(im);
@@ -73,7 +76,7 @@
EAPI void
evas_cache_image_shutdown(Evas_Cache_Image *cache)
{
- RGBA_Image* im;
+ RGBA_Image *im;
assert(cache != NULL);
cache->references--;
@@ -83,11 +86,14 @@
while (cache->lru)
{
- im = (RGBA_Image*) cache->lru;
+ im = (RGBA_Image *) cache->lru;
cache->lru = evas_object_list_remove(cache->lru, im);
- free(im->cache_key);
- im->cache_key = NULL;
+ if (im->cache_key)
+ {
+ evas_stringshare_del(im->cache_key);
+ im->cache_key = NULL;
+ }
if (cache->func.debug)
cache->func.debug("shutdown-lru", im);
@@ -98,7 +104,7 @@
/* This is mad, I am about to destroy image still alive, but we need to
prevent leak. */
while (cache->dirty)
{
- im = (RGBA_Image*) cache->dirty;
+ im = (RGBA_Image *) cache->dirty;
cache->dirty = evas_object_list_remove(cache->dirty, im);
if (cache->func.debug)
@@ -114,15 +120,15 @@
free(cache);
}
-EAPI RGBA_Image*
+EAPI RGBA_Image *
evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char
*key, RGBA_Image_Loadopts *lo, int *error)
{
- const char* format;
- char* hkey;
- RGBA_Image* im;
- Evas_Image_Load_Opts prevent;
- int size;
- struct stat st;
+ const char *format;
+ char *hkey;
+ RGBA_Image *im;
+ Evas_Image_Load_Opts prevent;
+ int size;
+ struct stat st;
assert(cache != NULL);
@@ -243,7 +249,7 @@
EAPI void
evas_cache_image_drop(RGBA_Image *im)
{
- Evas_Cache_Image* cache;
+ Evas_Cache_Image *cache;
assert(im);
assert(im->cache);
@@ -278,11 +284,11 @@
}
}
-EAPI RGBA_Image*
+EAPI RGBA_Image *
evas_cache_image_dirty(RGBA_Image *im, int x, int y, int w, int h)
{
- RGBA_Image* im_dirty = im;
- Evas_Cache_Image* cache;
+ RGBA_Image *im_dirty = im;
+ Evas_Cache_Image *cache;
assert(im);
assert(im->cache);
@@ -342,12 +348,11 @@
return NULL;
}
-EAPI RGBA_Image*
+EAPI RGBA_Image *
evas_cache_image_alone(RGBA_Image *im)
{
- RGBA_Image* im_dirty = im;
- Evas_Cache_Image* cache;
- char* hkey;
+ RGBA_Image *im_dirty = im;
+ Evas_Cache_Image *cache;
assert(im);
assert(im->cache);
@@ -407,8 +412,8 @@
return NULL;
}
-static RGBA_Image*
-_evas_cache_image_push_dirty(Evas_Cache_Image *cache, RGBA_Image* im)
+static RGBA_Image *
+_evas_cache_image_push_dirty(Evas_Cache_Image *cache, RGBA_Image *im)
{
cache->dirty = evas_object_list_prepend(cache->dirty, im);
@@ -422,10 +427,10 @@
return im;
}
-EAPI RGBA_Image*
+EAPI RGBA_Image *
evas_cache_image_copied_data(Evas_Cache_Image *cache, int w, int h, DATA32
*image_data, int alpha, int cspace)
{
- RGBA_Image* im;
+ RGBA_Image *im;
assert(cache);
@@ -445,10 +450,10 @@
return _evas_cache_image_push_dirty(cache, im);
}
-EAPI RGBA_Image*
+EAPI RGBA_Image *
evas_cache_image_data(Evas_Cache_Image *cache, int w, int h, DATA32
*image_data, int alpha, int cspace)
{
- RGBA_Image* im;
+ RGBA_Image *im;
assert(cache);
@@ -470,11 +475,11 @@
return _evas_cache_image_push_dirty(cache, im);
}
-EAPI RGBA_Image*
+EAPI RGBA_Image *
evas_cache_image_size_set(RGBA_Image *im, int w, int h)
{
- Evas_Cache_Image* cache;
- RGBA_Image* new;
+ Evas_Cache_Image *cache;
+ RGBA_Image *new;
int error;
assert(im);
@@ -533,8 +538,7 @@
EAPI void
evas_cache_image_load_data(RGBA_Image *im)
{
- Evas_Cache_Image* cache;
- int size;
+ Evas_Cache_Image *cache;
assert(im);
assert(im->image);
@@ -562,9 +566,9 @@
while ((cache->lru) && (cache->limit < cache->usage))
{
- RGBA_Image* im;
+ RGBA_Image *im;
- im = (RGBA_Image*) cache->lru->last;
+ im = (RGBA_Image *) cache->lru->last;
cache->lru = evas_object_list_remove(cache->lru, im);
cache->inactiv = evas_hash_del(cache->inactiv, im->cache_key, im);
cache->usage -= cache->func.mem_size_get(im);
@@ -580,10 +584,10 @@
return cache->usage;
}
-EAPI RGBA_Image*
-evas_cache_image_empty(Evas_Cache_Image* cache)
+EAPI RGBA_Image *
+evas_cache_image_empty(Evas_Cache_Image *cache)
{
- RGBA_Image* new;
+ RGBA_Image *new;
new = evas_common_image_new();
if (!new) goto on_error;
@@ -606,7 +610,7 @@
}
EAPI void
-evas_cache_image_colorspace(RGBA_Image* im, int cspace)
+evas_cache_image_colorspace(RGBA_Image *im, int cspace)
{
if (!im) return ;
if (im->cs.space == cspace) return ;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
