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

Switch evas internal use of evas_stringshare to eina_stringshare. 

SVN revision: 36674
This commit is contained in:
Cedric BAIL 2008-10-15 14:38:34 +00:00
parent 5b87d765b6
commit 1cec65e922
13 changed files with 144 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/cache/evas_cache.h vendored
View File

@ -61,7 +61,7 @@ struct _Evas_Cache_Image
struct _Evas_Cache_Engine_Image_Func
{
/* Must return a char* allocated with evas_stringshare_add. */
/* Must return a char* allocated with eina_stringshare_add. */
char* (*key)(Image_Entry *im, const char *file, const char *key, RGBA_Image_Loadopts *lo, int *error);
Engine_Image_Entry* (*alloc)(void);

8
legacy/evas/src/lib/cache/evas_cache_engine_image.c vendored
View File

@ -116,7 +116,7 @@ _evas_cache_engine_image_alloc(Evas_Cache_Engine_Image *cache,
on_error:
if (eim)
evas_cache_engine_image_drop(eim);
evas_stringshare_del(hkey);
eina_stringshare_del(hkey);
evas_cache_image_drop(ie);
return NULL;
}
@ -314,7 +314,7 @@ evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache,
if (cache->func.key)
ekey = cache->func.key(im, file, key, lo, data);
else
ekey = evas_stringshare_add(im->cache_key);
ekey = eina_stringshare_add(im->cache_key);
if (!ekey)
goto on_error;
@ -350,7 +350,7 @@ evas_cache_engine_image_request(Evas_Cache_Engine_Image *cache,
if (!eim)
{
if (im) evas_cache_image_drop(im);
if (ekey) evas_stringshare_del(ekey);
if (ekey) eina_stringshare_del(ekey);
}
else
{
@ -577,7 +577,7 @@ evas_cache_engine_image_size_set(Engine_Image_Entry *eim, int w, int h)
eim->src = NULL;
}
hkey = (eim->references > 1 ) ? evas_stringshare_add(eim->cache_key) : NULL;
hkey = (eim->references > 1 ) ? eina_stringshare_add(eim->cache_key) : NULL;
new = _evas_cache_engine_image_alloc(cache, im, hkey);
if (!new) goto on_error;

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

@ -27,7 +27,7 @@ static void* _evas_cache_background_load(void *);
#define FREESTRC(Var) \
if (Var) \
{ \
evas_stringshare_del(Var); \
eina_stringshare_del(Var); \
Var = NULL; \
}
@ -45,7 +45,7 @@ _evas_cache_image_make_dirty(Evas_Cache_Image *cache,
if (im->cache_key)
{
evas_stringshare_del(im->cache_key);
eina_stringshare_del(im->cache_key);
im->cache_key = NULL;
}
}
@ -156,7 +156,7 @@ _evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie)
if (ie->cache_key)
{
evas_stringshare_del(ie->cache_key);
eina_stringshare_del(ie->cache_key);
ie->cache_key = NULL;
}
@ -183,7 +183,7 @@ _evas_cache_image_entry_new(Evas_Cache_Image *cache,
if (!ie)
return NULL;
cache_key = hkey ? evas_stringshare_add(hkey) : NULL;
cache_key = hkey ? eina_stringshare_add(hkey) : NULL;
ie->flags.loaded = 0;
ie->flags.need_data = 1;
@ -199,8 +199,8 @@ _evas_cache_image_entry_new(Evas_Cache_Image *cache,
ie->references = 0;
ie->cache = cache;
ie->file = file ? evas_stringshare_add(file) : NULL;
ie->key = key ? evas_stringshare_add(key) : NULL;
ie->file = file ? eina_stringshare_add(file) : NULL;
ie->key = key ? eina_stringshare_add(key) : NULL;
ie->timestamp = timestamp;
ie->laststat = time(NULL);

42
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -73,7 +73,7 @@ evas_font_set_get(const char *name)
p = strchr(name, ',');
if (!p)
{
fonts = evas_list_append(fonts, evas_stringshare_add(name));
fonts = evas_list_append(fonts, eina_stringshare_add(name));
}
else
{
@ -86,10 +86,10 @@ evas_font_set_get(const char *name)
nm = alloca(p - pp + 1);
strncpy(nm, pp, p - pp);
nm[p - pp] = 0;
fonts = evas_list_append(fonts, evas_stringshare_add(nm));
fonts = evas_list_append(fonts, eina_stringshare_add(nm));
pp = p + 1;
p = strchr(pp, ',');
if (!p) fonts = evas_list_append(fonts, evas_stringshare_add(pp));
if (!p) fonts = evas_list_append(fonts, eina_stringshare_add(pp));
}
}
return fonts;
@ -124,8 +124,8 @@ evas_font_free(Evas *evas, void *font)
fd = evas_list_data(fonts_zero);
if (fd->ref != 0) break;
fonts_zero = evas_list_remove_list(fonts_zero, fonts_zero);
if (fd->name) evas_stringshare_del(fd->name);
if (fd->source) evas_stringshare_del(fd->source);
if (fd->name) eina_stringshare_del(fd->name);
if (fd->source) eina_stringshare_del(fd->source);
evas->engine.func->font_free(evas->engine.data.output, fd->font);
free(fd);
}
@ -303,7 +303,7 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
}
#endif
}
evas_stringshare_del(nm);
eina_stringshare_del(nm);
}
evas_list_free(fonts);
@ -350,8 +350,8 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
fd = calloc(1, sizeof(Fndat));
if (fd)
{
fd->name = evas_stringshare_add(name);
if (source) fd->source = evas_stringshare_add(source);
fd->name = eina_stringshare_add(name);
if (source) fd->source = eina_stringshare_add(source);
fd->size = size;
fd->font = font;
fd->ref = 1;
@ -400,7 +400,7 @@ evas_font_dir_available_list(const Evas *evas)
char *font;
font = (char *)FcNameUnparse(set->fonts[i]);
available = evas_list_append(available, evas_stringshare_add(font));
available = evas_list_append(available, eina_stringshare_add(font));
free(font);
}
@ -425,7 +425,7 @@ evas_font_dir_available_list(const Evas *evas)
Evas_Font_Alias *fa;
fa = ll->data;
available = evas_list_append(available, evas_stringshare_add((char *)fa->alias));
available = evas_list_append(available, eina_stringshare_add((char *)fa->alias));
}
}
}
@ -438,7 +438,7 @@ evas_font_dir_available_list_free(Evas_List *available)
{
while (available)
{
evas_stringshare_del(available->data);
eina_stringshare_del(available->data);
available = evas_list_remove(available, available->data);
}
}
@ -627,11 +627,11 @@ object_text_font_cache_dir_add(char *dir)
{
fn->type = 1;
for (i = 0; i < 14; i++)
fn->x.prop[i] = evas_stringshare_add(font_prop[i]);
fn->x.prop[i] = eina_stringshare_add(font_prop[i]);
tmp2 = evas_file_path_join(dir, fname);
if (tmp2)
{
fn->path = evas_stringshare_add(tmp2);
fn->path = eina_stringshare_add(tmp2);
free(tmp2);
}
fd->fonts = evas_list_append(fd->fonts, fn);
@ -663,11 +663,11 @@ object_text_font_cache_dir_add(char *dir)
strcpy(tmp2, fdir->data);
p = strrchr(tmp2, '.');
if (p) *p = 0;
fn->simple.name = evas_stringshare_add(tmp2);
fn->simple.name = eina_stringshare_add(tmp2);
tmp2 = evas_file_path_join(dir, fdir->data);
if (tmp2)
{
fn->path = evas_stringshare_add(tmp2);
fn->path = eina_stringshare_add(tmp2);
free(tmp2);
}
fd->fonts = evas_list_append(fd->fonts, fn);
@ -699,11 +699,11 @@ object_text_font_cache_dir_add(char *dir)
fa = calloc(1, sizeof(Evas_Font_Alias));
if (fa)
{
fa->alias = evas_stringshare_add(fname);
fa->alias = eina_stringshare_add(fname);
fa->fn = object_text_font_cache_font_find_x(fd, fdef);
if ((!fa->alias) || (!fa->fn))
{
if (fa->alias) evas_stringshare_del(fa->alias);
if (fa->alias) eina_stringshare_del(fa->alias);
free(fa);
}
else
@ -745,10 +745,10 @@ object_text_font_cache_dir_del(char *dir, Evas_Font_Dir *fd)
fd->fonts = evas_list_remove(fd->fonts, fn);
for (i = 0; i < 14; i++)
{
if (fn->x.prop[i]) evas_stringshare_del(fn->x.prop[i]);
if (fn->x.prop[i]) eina_stringshare_del(fn->x.prop[i]);
}
if (fn->simple.name) evas_stringshare_del(fn->simple.name);
if (fn->path) evas_stringshare_del(fn->path);
if (fn->simple.name) eina_stringshare_del(fn->simple.name);
if (fn->path) eina_stringshare_del(fn->path);
free(fn);
}
while (fd->aliases)
@ -757,7 +757,7 @@ object_text_font_cache_dir_del(char *dir, Evas_Font_Dir *fd)
fa = fd->aliases->data;
fd->aliases = evas_list_remove(fd->aliases, fa);
if (fa->alias) evas_stringshare_del(fa->alias);
if (fa->alias) eina_stringshare_del(fa->alias);
free(fa);
}
free(fd);

2
legacy/evas/src/lib/canvas/evas_main.c
View File

@ -9,6 +9,7 @@ evas_init(void)
{
if (initcount == 0)
{
eina_init();
evas_module_init();
evas_async_events_init();
}
@ -25,6 +26,7 @@ evas_shutdown(void)
evas_font_dir_cache_free();
evas_common_shutdown();
evas_module_shutdown();
eina_shutdown();
}
return initcount;
}

12
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -243,11 +243,11 @@ evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
if ((o->cur.key) && (key) && (!strcmp(o->cur.key, key)))
return;
}
if (o->cur.file) evas_stringshare_del(o->cur.file);
if (o->cur.key) evas_stringshare_del(o->cur.key);
if (file) o->cur.file = evas_stringshare_add(file);
if (o->cur.file) eina_stringshare_del(o->cur.file);
if (o->cur.key) eina_stringshare_del(o->cur.key);
if (file) o->cur.file = eina_stringshare_add(file);
else o->cur.file = NULL;
if (key) o->cur.key = evas_stringshare_add(key);
if (key) o->cur.key = eina_stringshare_add(key);
else o->cur.key = NULL;
o->prev.file = NULL;
o->prev.key = NULL;
@ -2040,8 +2040,8 @@ evas_object_image_free(Evas_Object *obj)
return;
MAGIC_CHECK_END();
/* free obj */
if (o->cur.file) evas_stringshare_del(o->cur.file);
if (o->cur.key) evas_stringshare_del(o->cur.key);
if (o->cur.file) eina_stringshare_del(o->cur.file);
if (o->cur.key) eina_stringshare_del(o->cur.key);
if (o->engine_data)
obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
o->engine_data);

6
legacy/evas/src/lib/canvas/evas_object_smart.c
View File

@ -341,7 +341,7 @@ evas_object_smart_callback_add(Evas_Object *obj, const char *event, void (*func)
if (!event) return;
if (!func) return;
cb = calloc(1, sizeof(Evas_Smart_Callback));
cb->event = evas_stringshare_add(event);
cb->event = eina_stringshare_add(event);
cb->func = func;
cb->func_data = (void *)data;
o->callbacks = evas_list_prepend(o->callbacks, cb);
@ -614,7 +614,7 @@ evas_object_smart_callbacks_clear(Evas_Object *obj)
if (cb->delete_me)
{
o->callbacks = evas_list_remove(o->callbacks, cb);
if (cb->event) evas_stringshare_del(cb->event);
if (cb->event) eina_stringshare_del(cb->event);
free(cb);
}
}
@ -652,7 +652,7 @@ evas_object_smart_cleanup(Evas_Object *obj)
cb = o->callbacks->data;
o->callbacks = evas_list_remove(o->callbacks, cb);
if (cb->event) evas_stringshare_del(cb->event);
if (cb->event) eina_stringshare_del(cb->event);
free(cb);
}

24
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -122,8 +122,8 @@ evas_object_text_font_source_set(Evas_Object *obj, const char *font_source)
if ((o->cur.source) && (font_source) &&
(!strcmp(o->cur.source, font_source)))
return;
if (o->cur.source) evas_stringshare_del(o->cur.source);
if (font_source) o->cur.source = evas_stringshare_add(font_source);
if (o->cur.source) eina_stringshare_del(o->cur.source);
if (font_source) o->cur.source = eina_stringshare_add(font_source);
else o->cur.source = NULL;
}
@ -193,8 +193,8 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
}
if (!same_font)
{
if (o->cur.font) evas_stringshare_del(o->cur.font);
if (font) o->cur.font = evas_stringshare_add(font);
if (o->cur.font) eina_stringshare_del(o->cur.font);
if (font) o->cur.font = eina_stringshare_add(font);
else o->cur.font = NULL;
o->prev.font = NULL;
}
@ -315,8 +315,8 @@ evas_object_text_text_set(Evas_Object *obj, const char *text)
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
/* DO II */
if (o->cur.text) evas_stringshare_del(o->cur.text);
if ((text) && (*text)) o->cur.text = evas_stringshare_add(text);
if (o->cur.text) eina_stringshare_del(o->cur.text);
if ((text) && (*text)) o->cur.text = eina_stringshare_add(text);
else o->cur.text = NULL;
o->prev.text = NULL;
if ((o->engine_data) && (o->cur.text))
@ -959,7 +959,7 @@ evas_font_path_clear(Evas *e)
MAGIC_CHECK_END();
while (e->font_path)
{
evas_stringshare_del(e->font_path->data);
eina_stringshare_del(e->font_path->data);
e->font_path = evas_list_remove(e->font_path, e->font_path->data);
}
}
@ -978,7 +978,7 @@ evas_font_path_append(Evas *e, const char *path)
MAGIC_CHECK_END();
if (!path) return;
e->font_path = evas_list_append(e->font_path, evas_stringshare_add(path));
e->font_path = evas_list_append(e->font_path, eina_stringshare_add(path));
}
/**
@ -995,7 +995,7 @@ evas_font_path_prepend(Evas *e, const char *path)
MAGIC_CHECK_END();
if (!path) return;
e->font_path = evas_list_prepend(e->font_path, evas_stringshare_add(path));
e->font_path = evas_list_prepend(e->font_path, eina_stringshare_add(path));
}
/**
@ -1342,9 +1342,9 @@ evas_object_text_free(Evas_Object *obj)
return;
MAGIC_CHECK_END();
/* free obj */
if (o->cur.text) evas_stringshare_del(o->cur.text);
if (o->cur.font) evas_stringshare_del(o->cur.font);
if (o->cur.source) evas_stringshare_del(o->cur.source);
if (o->cur.text) eina_stringshare_del(o->cur.text);
if (o->cur.font) eina_stringshare_del(o->cur.font);
if (o->cur.source) eina_stringshare_del(o->cur.source);
if (o->engine_data) evas_font_free(obj->layer->evas, o->engine_data);
o->magic = 0;
free(o);

132
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -407,9 +407,9 @@ _format_free(const Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
{
fmt->ref--;
if (fmt->ref > 0) return;
if (fmt->font.name) evas_stringshare_del(fmt->font.name);
if (fmt->font.fallbacks) evas_stringshare_del(fmt->font.fallbacks);
if (fmt->font.source) evas_stringshare_del(fmt->font.source);
if (fmt->font.name) eina_stringshare_del(fmt->font.name);
if (fmt->font.fallbacks) eina_stringshare_del(fmt->font.fallbacks);
if (fmt->font.source) eina_stringshare_del(fmt->font.source);
evas_font_free(obj->layer->evas, fmt->font.font);
free(fmt);
}
@ -433,7 +433,7 @@ _line_free(const Evas_Object *obj, Evas_Object_Textblock_Line *ln)
fi = (Evas_Object_Textblock_Format_Item *)ln->format_items;
ln->format_items = evas_object_list_remove(ln->format_items, ln->format_items);
if (fi->item) evas_stringshare_del(fi->item);
if (fi->item) eina_stringshare_del(fi->item);
free(fi);
}
if (ln) free(ln);
@ -903,57 +903,57 @@ static const char *tabstopsstr;
static void
_format_command_init(void)
{
fontstr = evas_stringshare_add("font");
font_fallbacksstr = evas_stringshare_add("font_fallbacks");
font_sizestr = evas_stringshare_add("font_size");
font_sourcestr = evas_stringshare_add("font_source");
colorstr = evas_stringshare_add("color");
underline_colorstr = evas_stringshare_add("underline_color");
underline2_colorstr = evas_stringshare_add("underline2_color");
outline_colorstr = evas_stringshare_add("outline_color");
shadow_colorstr = evas_stringshare_add("shadow_color");
glow_colorstr = evas_stringshare_add("glow_color");
glow2_colorstr = evas_stringshare_add("glow2_color");
backing_colorstr = evas_stringshare_add("backing_color");
strikethrough_colorstr = evas_stringshare_add("strikethrough_color");
alignstr = evas_stringshare_add("align");
valignstr = evas_stringshare_add("valign");
wrapstr = evas_stringshare_add("wrap");
left_marginstr = evas_stringshare_add("left_margin");
right_marginstr = evas_stringshare_add("right_margin");
underlinestr = evas_stringshare_add("underline");
strikethroughstr = evas_stringshare_add("strikethrough");
backingstr = evas_stringshare_add("backing");
stylestr = evas_stringshare_add("style");
tabstopsstr = evas_stringshare_add("tabstops");
fontstr = eina_stringshare_add("font");
font_fallbacksstr = eina_stringshare_add("font_fallbacks");
font_sizestr = eina_stringshare_add("font_size");
font_sourcestr = eina_stringshare_add("font_source");
colorstr = eina_stringshare_add("color");
underline_colorstr = eina_stringshare_add("underline_color");
underline2_colorstr = eina_stringshare_add("underline2_color");
outline_colorstr = eina_stringshare_add("outline_color");
shadow_colorstr = eina_stringshare_add("shadow_color");
glow_colorstr = eina_stringshare_add("glow_color");
glow2_colorstr = eina_stringshare_add("glow2_color");
backing_colorstr = eina_stringshare_add("backing_color");
strikethrough_colorstr = eina_stringshare_add("strikethrough_color");
alignstr = eina_stringshare_add("align");
valignstr = eina_stringshare_add("valign");
wrapstr = eina_stringshare_add("wrap");
left_marginstr = eina_stringshare_add("left_margin");
right_marginstr = eina_stringshare_add("right_margin");
underlinestr = eina_stringshare_add("underline");
strikethroughstr = eina_stringshare_add("strikethrough");
backingstr = eina_stringshare_add("backing");
stylestr = eina_stringshare_add("style");
tabstopsstr = eina_stringshare_add("tabstops");
}
static void
_format_command_shutdown(void)
{
evas_stringshare_del(fontstr);
evas_stringshare_del(font_fallbacksstr);
evas_stringshare_del(font_sizestr);
evas_stringshare_del(font_sourcestr);
evas_stringshare_del(colorstr);
evas_stringshare_del(underline_colorstr);
evas_stringshare_del(underline2_colorstr);
evas_stringshare_del(outline_colorstr);
evas_stringshare_del(shadow_colorstr);
evas_stringshare_del(glow_colorstr);
evas_stringshare_del(glow2_colorstr);
evas_stringshare_del(backing_colorstr);
evas_stringshare_del(strikethrough_colorstr);
evas_stringshare_del(alignstr);
evas_stringshare_del(valignstr);
evas_stringshare_del(wrapstr);
evas_stringshare_del(left_marginstr);
evas_stringshare_del(right_marginstr);
evas_stringshare_del(underlinestr);
evas_stringshare_del(strikethroughstr);
evas_stringshare_del(backingstr);
evas_stringshare_del(stylestr);
evas_stringshare_del(tabstopsstr);
eina_stringshare_del(fontstr);
eina_stringshare_del(font_fallbacksstr);
eina_stringshare_del(font_sizestr);
eina_stringshare_del(font_sourcestr);
eina_stringshare_del(colorstr);
eina_stringshare_del(underline_colorstr);
eina_stringshare_del(underline2_colorstr);
eina_stringshare_del(outline_colorstr);
eina_stringshare_del(shadow_colorstr);
eina_stringshare_del(glow_colorstr);
eina_stringshare_del(glow2_colorstr);
eina_stringshare_del(backing_colorstr);
eina_stringshare_del(strikethrough_colorstr);
eina_stringshare_del(alignstr);
eina_stringshare_del(valignstr);
eina_stringshare_del(wrapstr);
eina_stringshare_del(left_marginstr);
eina_stringshare_del(right_marginstr);
eina_stringshare_del(underlinestr);
eina_stringshare_del(strikethroughstr);
eina_stringshare_del(backingstr);
eina_stringshare_del(stylestr);
eina_stringshare_del(tabstopsstr);
}
static void
@ -985,8 +985,8 @@ _format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char
if ((!fmt->font.name) ||
((fmt->font.name) && (strcmp(fmt->font.name, tmp_param))))
{
if (fmt->font.name) evas_stringshare_del(fmt->font.name);
fmt->font.name = evas_stringshare_add(tmp_param);
if (fmt->font.name) eina_stringshare_del(fmt->font.name);
fmt->font.name = eina_stringshare_add(tmp_param);
new_font = 1;
}
}
@ -998,8 +998,8 @@ _format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char
/* policy - when we say "fallbacks" do we prepend and use prior
* fallbacks... or should we replace. for now we replace
*/
if (fmt->font.fallbacks) evas_stringshare_del(fmt->font.fallbacks);
fmt->font.fallbacks = evas_stringshare_add(tmp_param);
if (fmt->font.fallbacks) eina_stringshare_del(fmt->font.fallbacks);
fmt->font.fallbacks = eina_stringshare_add(tmp_param);
new_font = 1;
}
}
@ -1019,8 +1019,8 @@ _format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char
if ((!fmt->font.source) ||
((fmt->font.source) && (strcmp(fmt->font.source, tmp_param))))
{
if (fmt->font.source) evas_stringshare_del(fmt->font.source);
fmt->font.source = evas_stringshare_add(tmp_param);
if (fmt->font.source) eina_stringshare_del(fmt->font.source);
fmt->font.source = eina_stringshare_add(tmp_param);
new_font = 1;
}
}
@ -1254,11 +1254,11 @@ _format_param_parse(char *item, const char **key, const char **val)
p = strchr(item, '=');
*p = '\0';
k = evas_stringshare_add(item);
k = eina_stringshare_add(item);
*key = k;
*p = '=';
p++;
v = evas_stringshare_add(p);
v = eina_stringshare_add(p);
*val = v;
}
@ -1319,8 +1319,8 @@ _format_fill(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, char *str)
_format_param_parse(item, &key, &val);
_format_command(obj, fmt, key, val);
evas_stringshare_del(key);
evas_stringshare_del(val);
eina_stringshare_del(key);
eina_stringshare_del(val);
}
else
{
@ -1339,9 +1339,9 @@ _format_dup(Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
fmt2 = calloc(1, sizeof(Evas_Object_Textblock_Format));
memcpy(fmt2, fmt, sizeof(Evas_Object_Textblock_Format));
fmt2->ref = 1;
if (fmt->font.name) fmt2->font.name = evas_stringshare_add(fmt->font.name);
if (fmt->font.fallbacks) fmt2->font.fallbacks = evas_stringshare_add(fmt->font.fallbacks);
if (fmt->font.source) fmt2->font.source = evas_stringshare_add(fmt->font.source);
if (fmt->font.name) fmt2->font.name = eina_stringshare_add(fmt->font.name);
if (fmt->font.fallbacks) fmt2->font.fallbacks = eina_stringshare_add(fmt->font.fallbacks);
if (fmt->font.source) fmt2->font.source = eina_stringshare_add(fmt->font.source);
if ((fmt2->font.name) && (fmt2->font.fallbacks))
{
@ -1459,8 +1459,8 @@ _layout_format_value_handle(Ctxt *c, Evas_Object_Textblock_Format *fmt, char *it
_format_param_parse(item, &key, &val);
if ((key) && (val)) _format_command(c->obj, fmt, key, val);
if (key) evas_stringshare_del(key);
if (val) evas_stringshare_del(val);
if (key) eina_stringshare_del(key);
if (val) eina_stringshare_del(val);
c->align = fmt->halign;
c->marginl = fmt->margin.l;
c->marginr = fmt->margin.r;
@ -2014,7 +2014,7 @@ _layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node *n, char *item)
Evas_Object_Textblock_Format_Item *fi;
fi = calloc(1, sizeof(Evas_Object_Textblock_Format_Item));
fi->item = evas_stringshare_add(item);
fi->item = eina_stringshare_add(item);
fi->source_node = n;
c->ln->format_items = evas_object_list_append(c->ln->format_items, fi);
return fi;

6
legacy/evas/src/lib/engines/common/evas_font_load.c
View File

@ -33,7 +33,7 @@ evas_common_font_source_memory_load(const char *name, const void *data, int data
free(fs);
return NULL;
}
fs->name = evas_stringshare_add(name);
fs->name = eina_stringshare_add(name);
fs->file = NULL;
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
fs->ft.orig_upem = fs->ft.face->units_per_EM;
@ -54,7 +54,7 @@ evas_common_font_source_load(const char *name)
fs->current_size = 0;
fs->ft.face = NULL;
fs->name = evas_stringshare_add(name);
fs->name = eina_stringshare_add(name);
fs->file = fs->name;
fs->ft.orig_upem = 0;
@ -119,7 +119,7 @@ evas_common_font_source_free(RGBA_Font_Source *fs)
fonts_src = evas_object_list_remove(fonts_src, fs);
FT_Done_Face(fs->ft.face);
if (fs->charmap) evas_array_hash_free(fs->charmap);
if (fs->name) evas_stringshare_del(fs->name);
if (fs->name) eina_stringshare_del(fs->name);
free(fs);
}

8
legacy/evas/src/lib/include/evas_private.h
View File

@ -97,26 +97,26 @@ if (_r) \
#define EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o) \
if ((o)->cur.file) \
{ \
evas_stringshare_del((o)->cur.file); \
eina_stringshare_del((o)->cur.file); \
if ((o)->prev.file == (o)->cur.file) \
(o)->prev.file = NULL; \
(o)->cur.file = NULL; \
} \
if ((o)->cur.key) \
{ \
evas_stringshare_del((o)->cur.key); \
eina_stringshare_del((o)->cur.key); \
if ((o)->prev.key == (o)->cur.key) \
(o)->prev.key = NULL; \
(o)->cur.key = NULL; \
} \
if ((o)->prev.file) \
{ \
evas_stringshare_del((o)->prev.file); \
eina_stringshare_del((o)->prev.file); \
(o)->prev.file = NULL; \
} \
if ((o)->prev.key) \
{ \
evas_stringshare_del((o)->prev.key); \
eina_stringshare_del((o)->prev.key); \
(o)->prev.key = NULL; \
}

16
legacy/evas/src/modules/engines/xrender_x11/evas_engine_image.c
View File

@ -104,14 +104,14 @@ _xre_image_load(Ximage_Info *xinf, const char *file, const char *key, Evas_Image
im->xinf->references++;
im->cs.space = EVAS_COLORSPACE_ARGB8888;
im->fkey = strdup(buf);
im->file = evas_stringshare_add(file);
if (key) im->key = evas_stringshare_add(key);
im->file = eina_stringshare_add(file);
if (key) im->key = eina_stringshare_add(key);
im->w = im->im->cache_entry.w;
im->h = im->im->cache_entry.h;
im->references = 1;
if (lo) im->load_opts = *lo;
if (im->im->info.comment) im->comment = evas_stringshare_add(im->im->info.comment);
// if (im->im->info.format == 1) im->format = evas_stringshare_add("png");
if (im->im->info.comment) im->comment = eina_stringshare_add(im->im->info.comment);
// if (im->im->info.format == 1) im->format = eina_stringshare_add("png");
if (im->im->cache_entry.flags.alpha) im->alpha = 1;
_xr_image_hash = evas_hash_direct_add(_xr_image_hash, im->fkey, im);
return im;
@ -232,15 +232,15 @@ __xre_image_real_free(XR_Image *im)
{
if (!im->cs.no_free) free(im->cs.data);
}
if (im->file) evas_stringshare_del(im->file);
if (im->key) evas_stringshare_del(im->key);
if (im->file) eina_stringshare_del(im->file);
if (im->key) eina_stringshare_del(im->key);
if (im->fkey) free(im->fkey);
if (im->im) evas_cache_image_drop(&im->im->cache_entry);
if ((im->data) && (im->dirty)) __xre_image_dirty_hash_del(im);
if ((im->free_data) && (im->data)) free(im->data);
if (im->surface) _xr_render_surface_free(im->surface);
if (im->format) evas_stringshare_del(im->format);
if (im->comment) evas_stringshare_del(im->comment);
if (im->format) eina_stringshare_del(im->format);
if (im->comment) eina_stringshare_del(im->comment);
if (im->updates) evas_common_tilebuf_free(im->updates);
_xr_image_info_free(im->xinf);
free(im);

16
legacy/evas/src/modules/engines/xrender_xcb/evas_engine_image.c
View File

@ -103,14 +103,14 @@ _xre_image_load(Xcb_Image_Info *xcbinf, const char *file, const char *key, Evas_
im->xcbinf = xcbinf;
im->xcbinf->references++;
im->fkey = strdup(buf);
im->file = (char *)evas_stringshare_add(file);
if (key) im->key = (char *)evas_stringshare_add(key);
im->file = (char *)eina_stringshare_add(file);
if (key) im->key = (char *)eina_stringshare_add(key);
im->w = im->im->cache_entry.w;
im->h = im->im->cache_entry.h;
im->references = 1;
if (lo) im->load_opts = *lo;
if (im->im->info.comment) im->comment = (char *)evas_stringshare_add(im->im->info.comment);
/* if (im->im->info.format == 1) im->format = evas_stringshare_add("png"); */
if (im->im->info.comment) im->comment = (char *)eina_stringshare_add(im->im->info.comment);
/* if (im->im->info.format == 1) im->format = eina_stringshare_add("png"); */
if (im->im->cache_entry.flags.alpha) im->alpha = 1;
_xr_image_hash = evas_hash_direct_add(_xr_image_hash, im->fkey, im);
return im;
@ -196,15 +196,15 @@ _xre_image_new(Xcb_Image_Info *xcbinf, int w, int h)
static void
__xre_image_real_free(XR_Image *im)
{
if (im->file) evas_stringshare_del(im->file);
if (im->key) evas_stringshare_del(im->key);
if (im->file) eina_stringshare_del(im->file);
if (im->key) eina_stringshare_del(im->key);
if (im->fkey) free(im->fkey);
if (im->im) evas_cache_image_drop(&im->im->cache_entry);
if ((im->data) && (im->dirty)) __xre_image_dirty_hash_del(im);
if ((im->free_data) && (im->data)) free(im->data);
if (im->surface) _xr_render_surface_free(im->surface);
if (im->format) evas_stringshare_del(im->format);
if (im->comment) evas_stringshare_del(im->comment);
if (im->format) eina_stringshare_del(im->format);
if (im->comment) eina_stringshare_del(im->comment);
if (im->updates) evas_common_tilebuf_free(im->updates);
_xr_image_info_free(im->xcbinf);
free(im);