kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: Removed unnecessary null checks. 

As all efl public free apis  and free function get null as valid parameter,
we do not need to check null. I also used ELM_SAFE_FREE if necessary.
After this job code got cleaner.

This is a continue of a commit e3372339.
This commit is contained in:
Daniel Juyung Seo 2014-01-22 11:14:23 +09:00
parent b6b90d7c83 3e45b920ee
commit ae9cb7e40f
54 changed files with 267 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/elementary/src/lib/elc_ctxpopup.c
View File

@ -786,7 +786,7 @@ _elm_ctxpopup_smart_content_set(Eo *obj, void *_pd, va_list *list)
if (content == sd->content) goto end;
if (sd->content) evas_object_del(sd->content);
evas_object_del(sd->content);
if (sd->content == sd->list) sd->list = NULL;
evas_object_size_hint_weight_set
@ -1040,10 +1040,7 @@ _list_resize_cb(void *data,
static void
_list_del(Elm_Ctxpopup_Smart_Data *sd)
{
if (!sd->list) return;
evas_object_del(sd->list);
sd->list = NULL;
ELM_SAFE_FREE(sd->list, evas_object_del);
}
static Eina_Bool
@ -1158,11 +1155,8 @@ _elm_ctxpopup_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_parent_detach(obj);
elm_ctxpopup_clear(obj);
evas_object_del(sd->arrow);
sd->arrow = NULL; /* stops _sizing_eval() from going on on deletion */
evas_object_del(sd->bg);
sd->bg = NULL;
ELM_SAFE_FREE(sd->arrow, evas_object_del); /* stops _sizing_eval() from going on on deletion */
ELM_SAFE_FREE(sd->bg, evas_object_del);
EINA_LIST_FREE(sd->items, it)
elm_widget_item_free(it);

12
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -46,9 +46,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
static void
_elm_fileselector_smart_del_do(Elm_Fileselector_Smart_Data *sd)
{
if (sd->path) eina_stringshare_del(sd->path);
if (sd->selection) eina_stringshare_del(sd->selection);
if (sd->populate_idler) free(ecore_idler_del(sd->populate_idler));
eina_stringshare_del(sd->path);
eina_stringshare_del(sd->selection);
free(ecore_idler_del(sd->populate_idler));
eo_do_super(sd->obj, MY_CLASS, evas_obj_smart_del());
}
@ -1583,10 +1583,8 @@ _buttons_ok_cancel_set(Eo *obj, void *_pd, va_list *list)
}
else if (!visible)
{
evas_object_del(sd->cancel_button);
sd->cancel_button = NULL;
evas_object_del(sd->ok_button);
sd->ok_button = NULL;
ELM_SAFE_FREE(sd->cancel_button, evas_object_del);
ELM_SAFE_FREE(sd->ok_button, evas_object_del);
}
}

6
legacy/elementary/src/lib/elc_fileselector_button.c
View File

@ -201,9 +201,9 @@ _elm_fileselector_button_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED
{
Elm_Fileselector_Button_Smart_Data *sd = _pd;
if (sd->window_title) eina_stringshare_del(sd->window_title);
if (sd->fsd.path) eina_stringshare_del(sd->fsd.path);
if (sd->fsw) evas_object_del(sd->fsw);
eina_stringshare_del(sd->window_title);
eina_stringshare_del(sd->fsd.path);
evas_object_del(sd->fsw);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}

4
legacy/elementary/src/lib/elc_fileselector_entry.c
View File

@ -397,7 +397,7 @@ _elm_fileselector_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Fileselector_Entry_Smart_Data *sd = _pd;
if (sd->path) free(sd->path);
free(sd->path);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}
@ -569,7 +569,7 @@ _path_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
const char **ret = va_arg(*list, const char **);
Elm_Fileselector_Entry_Smart_Data *sd = _pd;
if (sd->path) free(sd->path);
free(sd->path);
sd->path = elm_entry_markup_to_utf8(elm_object_text_get(sd->entry));
*ret = sd->path;
}

3
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -449,8 +449,7 @@ _hover_end(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
VIEW(it) = NULL;
}
evas_object_del(sd->hover);
sd->hover = NULL;
ELM_SAFE_FREE(sd->hover, evas_object_del);
evas_object_smart_callback_call(obj, SIG_DISMISSED, NULL);
}

10
legacy/elementary/src/lib/elc_multibuttonentry.c
View File

@ -1530,12 +1530,12 @@ _elm_multibuttonentry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
sd->selected_it = NULL;
if (sd->label_str) eina_stringshare_del(sd->label_str);
if (sd->guide_text_str) eina_stringshare_del(sd->guide_text_str);
eina_stringshare_del(sd->label_str);
eina_stringshare_del(sd->guide_text_str);
evas_object_del(sd->entry);
if (sd->label) evas_object_del(sd->label);
if (sd->guide_text) evas_object_del(sd->guide_text);
if (sd->end) evas_object_del(sd->end);
evas_object_del(sd->label);
evas_object_del(sd->guide_text);
evas_object_del(sd->end);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}

8
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -548,7 +548,7 @@ _item_content_set(Elm_Naviframe_Item *it,
{
if (it->content == content) return;
if (it->content) evas_object_del(it->content);
evas_object_del(it->content);
it->content = content;
if (!content) return;
@ -565,7 +565,7 @@ _item_title_prev_btn_set(Elm_Naviframe_Item *it,
Evas_Object *btn)
{
if (it->title_prev_btn == btn) return;
if (it->title_prev_btn) evas_object_del(it->title_prev_btn);
evas_object_del(it->title_prev_btn);
it->title_prev_btn = btn;
if (!btn) return;
@ -582,7 +582,7 @@ _item_title_next_btn_set(Elm_Naviframe_Item *it,
Evas_Object *btn)
{
if (it->title_next_btn == btn) return;
if (it->title_next_btn) evas_object_del(it->title_next_btn);
evas_object_del(it->title_next_btn);
it->title_next_btn = btn;
if (!btn) return;
@ -598,7 +598,7 @@ _item_title_icon_set(Elm_Naviframe_Item *it,
Evas_Object *icon)
{
if (it->title_icon == icon) return;
if (it->title_icon) evas_object_del(it->title_icon);
evas_object_del(it->title_icon);
it->title_icon = icon;
if (!icon) return;

3
legacy/elementary/src/lib/elc_player.c
View File

@ -563,8 +563,7 @@ _elm_player_smart_content_set(Eo *obj, void *_pd, va_list *list)
if (!_elm_video_check(content)) return;
if (sd->video == content) goto end;
if (sd->video) evas_object_del(sd->video);
evas_object_del(sd->video);
sd->video = content;
if (!content) goto end;

22
legacy/elementary/src/lib/elc_popup.c
View File

@ -188,11 +188,10 @@ _list_del(Elm_Popup_Smart_Data *sd)
evas_object_event_callback_del
(sd->scr, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb);
evas_object_del(sd->tbl);
ELM_SAFE_FREE(sd->tbl, evas_object_del);
sd->scr = NULL;
sd->box = NULL;
sd->spacer = NULL;
sd->tbl = NULL;
}
static void
@ -229,8 +228,7 @@ _elm_popup_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
if (sd->buttons[i])
{
evas_object_del(sd->buttons[i]->btn);
free(sd->buttons[i]);
sd->buttons[i] = NULL;
ELM_SAFE_FREE(sd->buttons[i], free);
}
}
if (sd->items)
@ -580,8 +578,7 @@ _button_remove(Evas_Object *obj,
if (!sd->last_button_number)
{
_visuals_set(obj);
evas_object_del(sd->action_area);
sd->action_area = NULL;
ELM_SAFE_FREE(sd->action_area, evas_object_del);
edje_object_message_signal_process(wd->resize_obj);
}
else
@ -728,9 +725,7 @@ _item_icon_set(Elm_Popup_Item *it,
{
if (it->icon == icon) return;
if (it->icon)
evas_object_del(it->icon);
evas_object_del(it->icon);
it->icon = icon;
if (it->icon)
{
@ -829,9 +824,7 @@ _item_del_pre_hook(Elm_Object_Item *item)
ELM_POPUP_ITEM_CHECK_OR_RETURN(it);
ELM_POPUP_DATA_GET(WIDGET(it), sd);
if (it->icon)
evas_object_del(it->icon);
evas_object_del(it->icon);
eina_stringshare_del(it->label);
sd->items = eina_list_remove(sd->items, it);
if (!eina_list_count(sd->items))
@ -1048,7 +1041,7 @@ _title_icon_set(Evas_Object *obj,
if (sd->title_icon == icon) return EINA_TRUE;
title_visibility_old = (sd->title_text) || (sd->title_icon);
if (sd->title_icon) evas_object_del(sd->title_icon);
evas_object_del(sd->title_icon);
sd->title_icon = icon;
title_visibility_current = (sd->title_text) || (sd->title_icon);
@ -1914,8 +1907,7 @@ _item_append(Eo *obj, void *_pd, va_list *list)
{
prev_content = elm_layout_content_get
(sd->content_area, CONTENT_PART);
if (prev_content)
evas_object_del(prev_content);
evas_object_del(prev_content);
}
//The first item is appended.

10
legacy/elementary/src/lib/elm_access.c
View File

@ -68,7 +68,7 @@ _access_action_callback_call(Evas_Object *obj,
if (a && (a->fn[type].cb))
ret = a->fn[type].cb(a->fn[type].user_data, obj, action_info);
if (ai) free(ai);
free(ai);
return ret;
}
@ -210,7 +210,7 @@ _access_add_set(Elm_Access_Info *ac, int type)
{
if (!ai->func)
{
if (ai->data) eina_stringshare_del(ai->data);
eina_stringshare_del(ai->data);
}
ai->func = NULL;
ai->data = NULL;
@ -571,7 +571,7 @@ _elm_access_clear(Elm_Access_Info *ac)
{
if (!ai->func)
{
if (ai->data) eina_stringshare_del(ai->data);
eina_stringshare_del(ai->data);
}
free(ai);
}
@ -738,7 +738,7 @@ _elm_access_read(Elm_Access_Info *ac, int type, const Evas_Object *obj)
}
}
}
if (txt) free(txt);
free(txt);
}
EAPI void
@ -1118,7 +1118,7 @@ _elm_access_object_unregister(Evas_Object *obj, Evas_Object *hoverobj)
Action_Info *a;
a = evas_object_data_get(obj, "_elm_access_action_info");
evas_object_data_del(obj, "_elm_access_action_info");
if (a) free(a);
free(a);
}
EAPI void

4
legacy/elementary/src/lib/elm_atspi_object.c
View File

@ -212,8 +212,8 @@ _destructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
{
Atspi_Object_Data *ad = _pd;
if (ad->name) eina_stringshare_del(ad->name);
if (ad->description) eina_stringshare_del(ad->description);
eina_stringshare_del(ad->name);
eina_stringshare_del(ad->description);
eo_do_super(obj, ELM_ATSPI_CLASS, eo_destructor());
}

6
legacy/elementary/src/lib/elm_bg.c
View File

@ -177,11 +177,7 @@ _file_set(Eo *obj, void *_pd, va_list *list)
const char *p;
Eina_Bool int_ret;
if (sd->img)
{
evas_object_del(sd->img);
sd->img = NULL;
}
ELM_SAFE_FREE(sd->img, evas_object_del);
if (!file)
{
ELM_SAFE_FREE(sd->file, eina_stringshare_del);

14
legacy/elementary/src/lib/elm_clock.c
View File

@ -352,18 +352,8 @@ _time_update(Evas_Object *obj)
Evas_Coord mw, mh;
for (i = 0; i < 6; i++)
{
if (sd->digit[i])
{
evas_object_del(sd->digit[i]);
sd->digit[i] = NULL;
}
}
if (sd->am_pm_obj)
{
evas_object_del(sd->am_pm_obj);
sd->am_pm_obj = NULL;
}
ELM_SAFE_FREE(sd->digit[i], evas_object_del);
ELM_SAFE_FREE(sd->am_pm_obj, evas_object_del);
if ((sd->seconds) && (sd->am_pm))
{

26
legacy/elementary/src/lib/elm_cnp.c
View File

@ -936,7 +936,7 @@ _x11_notify_handler_uri(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *
cnp_debug("Couldn't find a file\n");
return 0;
}
if (savedtypes.imgfile) free(savedtypes.imgfile);
free(savedtypes.imgfile);
if (savedtypes.textreq)
{
savedtypes.textreq = 0;
@ -1270,7 +1270,7 @@ _x11_dnd_enter(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
cnp_debug("Types\n");
savedtypes.ntypes = enter->num_types;
if (savedtypes.types) free(savedtypes.types);
free(savedtypes.types);
savedtypes.types = malloc(sizeof(char *) * enter->num_types);
if (!savedtypes.types) return EINA_FALSE;
@ -1284,8 +1284,7 @@ _x11_dnd_enter(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
/* Request it, so we know what it is */
cnp_debug("Sending uri request\n");
savedtypes.textreq = 1;
if (savedtypes.imgfile) free(savedtypes.imgfile);
savedtypes.imgfile = NULL;
ELM_SAFE_FREE(savedtypes.imgfile, free);
ecore_x_selection_xdnd_request(enter->win, text_uri);
}
}
@ -2303,7 +2302,7 @@ _wl_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
ecore_wl_dnd_selection_set(ecore_wl_input_get(), types);
if (sel->selbuf) free(sel->selbuf);
free(sel->selbuf);
sel->buflen = buflen;
sel->selbuf = strdup((char*)selbuf);
@ -2658,8 +2657,7 @@ _wl_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
{
drops = eina_list_remove(drops, dropable);
eo_do(obj, eo_base_data_del("__elm_dropable"));
free(dropable);
dropable = NULL;
ELM_SAFE_FREE(dropable, free);
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
_all_drop_targets_cbs_del);
}
@ -2708,7 +2706,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format EINA_UNUSED, const ch
ecore_wl_dnd_drag_types_set(ecore_wl_input_get(), types);
/* set the drag data used when a drop occurs */
if (wl_cnp_selection.selbuf) free(wl_cnp_selection.selbuf);
free(wl_cnp_selection.selbuf);
wl_cnp_selection.selbuf = strdup((char*)data);
wl_cnp_selection.buflen = strlen(wl_cnp_selection.selbuf);
@ -2801,7 +2799,7 @@ _wl_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
if ((!ev->num_types) || (!ev->types)) return ECORE_CALLBACK_PASS_ON;
savedtypes.ntypes = ev->num_types;
if (savedtypes.types) free(savedtypes.types);
free(savedtypes.types);
savedtypes.types = malloc(sizeof(char *) * ev->num_types);
if (!savedtypes.types) return EINA_FALSE;
@ -2811,8 +2809,7 @@ _wl_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
if (savedtypes.types[i] == text_uri)
{
savedtypes.textreq = 1;
if (savedtypes.imgfile) free(savedtypes.imgfile);
savedtypes.imgfile = NULL;
ELM_SAFE_FREE(savedtypes.imgfile, free);
}
}
@ -3376,8 +3373,7 @@ _local_elm_cnp_selection_set(Evas_Object *obj EINA_UNUSED,
const void *selbuf, size_t buflen)
{
_local_elm_cnp_init();
if (_local_selinfo[selection].sel.buf)
free(_local_selinfo[selection].sel.buf);
free(_local_selinfo[selection].sel.buf);
_local_selinfo[selection].format = format;
_local_selinfo[selection].sel.buf = malloc(buflen + 1);
if (_local_selinfo[selection].sel.buf)
@ -3407,9 +3403,7 @@ _local_elm_object_cnp_selection_clear(Evas_Object *obj EINA_UNUSED,
Elm_Sel_Type selection)
{
_local_elm_cnp_init();
if (_local_selinfo[selection].sel.buf)
free(_local_selinfo[selection].sel.buf);
_local_selinfo[selection].sel.buf = NULL;
ELM_SAFE_FREE(_local_selinfo[selection].sel.buf, free);
_local_selinfo[selection].sel.size = 0;
return EINA_TRUE;
}

31
legacy/elementary/src/lib/elm_colorselector.c
View File

@ -1113,23 +1113,14 @@ _elm_colorselector_smart_theme(Eo *obj, void *_pd, va_list *list)
{
if (sd->cb_data[i])
{
evas_object_del(sd->cb_data[i]->colorbar);
sd->cb_data[i]->colorbar = NULL;
evas_object_del(sd->cb_data[i]->bar);
sd->cb_data[i]->bar = NULL;
evas_object_del(sd->cb_data[i]->lbt);
sd->cb_data[i]->lbt = NULL;
evas_object_del(sd->cb_data[i]->rbt);
sd->cb_data[i]->rbt = NULL;
ELM_SAFE_FREE(sd->cb_data[i]->colorbar, evas_object_del);
ELM_SAFE_FREE(sd->cb_data[i]->bar, evas_object_del);
ELM_SAFE_FREE(sd->cb_data[i]->lbt, evas_object_del);
ELM_SAFE_FREE(sd->cb_data[i]->rbt, evas_object_del);
if (i != 0)
{
evas_object_del(sd->cb_data[i]->bg_rect);
sd->cb_data[i]->bg_rect = NULL;
}
evas_object_del(sd->cb_data[i]->arrow);
sd->cb_data[i]->arrow = NULL;
evas_object_del(sd->cb_data[i]->touch_area);
sd->cb_data[i]->touch_area = NULL;
ELM_SAFE_FREE(sd->cb_data[i]->bg_rect, evas_object_del);
ELM_SAFE_FREE(sd->cb_data[i]->arrow, evas_object_del);
ELM_SAFE_FREE(sd->cb_data[i]->touch_area, evas_object_del);
}
}
@ -1587,12 +1578,12 @@ _elm_colorselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_OUT, _mouse_out_canvas, obj);
ecore_timer_del(sd->longpress_timer);
if (sd->palette_name) eina_stringshare_del(sd->palette_name);
eina_stringshare_del(sd->palette_name);
#ifdef HAVE_ELEMENTARY_X
if (sd->grab.mouse_motion) ecore_event_handler_del(sd->grab.mouse_motion);
if (sd->grab.mouse_up) ecore_event_handler_del(sd->grab.mouse_up);
if (sd->grab.key_up) ecore_event_handler_del(sd->grab.key_up);
ecore_event_handler_del(sd->grab.mouse_motion);
ecore_event_handler_del(sd->grab.mouse_up);
ecore_event_handler_del(sd->grab.key_up);
#endif
_items_del(sd);

31
legacy/elementary/src/lib/elm_config.c
View File

@ -213,7 +213,7 @@ _prop_change_delay_cb(void *data EINA_UNUSED)
s = ecore_x_window_prop_string_get(_config_win, _atom[ATOM_E_PROFILE]);
if (s)
{
if (_elm_profile) free(_elm_profile);
free(_elm_profile);
_elm_profile = s;
}
}
@ -651,7 +651,7 @@ _elm_config_font_overlay_set(const char *text_class,
if (strcmp(efd->text_class, text_class))
continue;
if (efd->font) eina_stringshare_del(efd->font);
eina_stringshare_del(efd->font);
efd->font = eina_stringshare_add(font);
efd->size = size;
_elm_config->font_overlays =
@ -686,7 +686,7 @@ _elm_config_font_overlay_remove(const char *text_class)
_elm_config->font_overlays =
eina_list_remove_list(_elm_config->font_overlays, l);
eina_stringshare_del(efd->text_class);
if (efd->font) eina_stringshare_del(efd->font);
eina_stringshare_del(efd->font);
free(efd);
return;
@ -968,25 +968,25 @@ _config_free(Elm_Config *cfg)
{
eina_stringshare_del(fontdir);
}
if (cfg->engine) eina_stringshare_del(cfg->engine);
eina_stringshare_del(cfg->engine);
EINA_LIST_FREE(cfg->font_overlays, fo)
{
if (fo->text_class) eina_stringshare_del(fo->text_class);
if (fo->font) eina_stringshare_del(fo->font);
eina_stringshare_del(fo->text_class);
eina_stringshare_del(fo->font);
free(fo);
}
EINA_LIST_FREE(cfg->color_palette, palette)
{
if (palette->palette_name) eina_stringshare_del(palette->palette_name);
eina_stringshare_del(palette->palette_name);
EINA_LIST_FREE(palette->color_list, color) free(color);
free(palette);
}
if (cfg->theme) eina_stringshare_del(cfg->theme);
if (cfg->modules) eina_stringshare_del(cfg->modules);
if (cfg->indicator_service_0) eina_stringshare_del(cfg->indicator_service_0);
if (cfg->indicator_service_90) eina_stringshare_del(cfg->indicator_service_90);
if (cfg->indicator_service_180) eina_stringshare_del(cfg->indicator_service_180);
if (cfg->indicator_service_270) eina_stringshare_del(cfg->indicator_service_270);
eina_stringshare_del(cfg->theme);
eina_stringshare_del(cfg->modules);
eina_stringshare_del(cfg->indicator_service_0);
eina_stringshare_del(cfg->indicator_service_90);
eina_stringshare_del(cfg->indicator_service_180);
eina_stringshare_del(cfg->indicator_service_270);
free(cfg);
}
@ -1436,7 +1436,7 @@ _config_update(void)
}
if (s)
{
if (_elm_config->modules) eina_stringshare_del(_elm_config->modules);
eina_stringshare_del(_elm_config->modules);
_elm_config->modules = s;
}
IFCFGEND;
@ -2685,8 +2685,7 @@ _elm_config_shutdown(void)
#undef ENGINE_COMPARE
{
#ifdef HAVE_ELEMENTARY_X
ecore_event_handler_del(_prop_change_handler);
_prop_change_handler = NULL;
ELM_SAFE_FREE(_prop_change_handler, ecore_event_handler_del);
#endif
}
ELM_SAFE_FREE(_elm_config, _config_free);

2
legacy/elementary/src/lib/elm_conform.c
View File

@ -924,7 +924,7 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Elm_Conformant_Smart_Data *sd = _pd;
#ifdef HAVE_ELEMENTARY_X
if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl);
ecore_event_handler_del(sd->prop_hdl);
#endif
ecore_job_del(sd->show_region_job);

6
legacy/elementary/src/lib/elm_dbus_menu.c
View File

@ -920,12 +920,10 @@ _elm_dbus_menu_unregister(Eo *obj)
_elm_dbus_menu_app_menu_unregister(obj);
eldbus_service_interface_unregister(sd->dbus_menu->iface);
eldbus_connection_unref(sd->dbus_menu->bus);
if (sd->dbus_menu->signal_idler)
ecore_idler_del(sd->dbus_menu->signal_idler);
ecore_idler_del(sd->dbus_menu->signal_idler);
eina_hash_free(sd->dbus_menu->elements);
free(sd->dbus_menu);
sd->dbus_menu = NULL;
ELM_SAFE_FREE(sd->dbus_menu, free);
}
void

25
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -226,11 +226,7 @@ _string_check(void *data)
Evas_Object *obj = data;
ELM_DISKSELECTOR_DATA_GET(obj, sd);
if (sd->string_check_idle_enterer)
{
ecore_idle_enterer_del(sd->string_check_idle_enterer);
sd->string_check_idle_enterer = NULL;
}
ELM_SAFE_FREE(sd->string_check_idle_enterer, ecore_idle_enterer_del);
// call string check idle enterer directly
_string_check_idle_enterer_cb(data);
@ -337,9 +333,7 @@ _item_del(Elm_Diskselector_Item *item)
ELM_DISKSELECTOR_DATA_GET(WIDGET(item), sd);
sd->item_count -= 1;
eina_stringshare_del(item->label);
if (item->icon)
evas_object_del(item->icon);
evas_object_del(item->icon);
}
static void
@ -492,7 +486,7 @@ _item_icon_set(Elm_Diskselector_Item *it,
{
if (it->icon == icon) return;
if (it->icon) evas_object_del(it->icon);
evas_object_del(it->icon);
it->icon = icon;
if (VIEW(it))
@ -1421,17 +1415,8 @@ _elm_diskselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
}
sd->r_items = eina_list_free(sd->r_items);
if (sd->scroller_move_idle_enterer)
{
ecore_idle_enterer_del(sd->scroller_move_idle_enterer);
sd->scroller_move_idle_enterer = NULL;
}
if (sd->string_check_idle_enterer)
{
ecore_idle_enterer_del(sd->string_check_idle_enterer);
sd->string_check_idle_enterer = NULL;
}
ELM_SAFE_FREE(sd->scroller_move_idle_enterer, ecore_idle_enterer_del);
ELM_SAFE_FREE(sd->string_check_idle_enterer, ecore_idle_enterer_del);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}

49
legacy/elementary/src/lib/elm_entry.c
View File

@ -121,8 +121,7 @@ _file_load(const char *file)
if (eina_file_map_faulted(f, tmp))
{
free(text);
text = NULL;
ELM_SAFE_FREE(text, free);
}
on_error:
@ -347,7 +346,7 @@ _filter_free(Elm_Entry_Markup_Filter *tf)
{
Elm_Entry_Filter_Limit_Size *lim = tf->data;
if (lim) free(lim);
free(lim);
}
else if (tf->func == elm_entry_filter_accept_set)
{
@ -355,8 +354,8 @@ _filter_free(Elm_Entry_Markup_Filter *tf)
if (as)
{
if (as->accepted) eina_stringshare_del(as->accepted);
if (as->rejected) eina_stringshare_del(as->rejected);
eina_stringshare_del(as->accepted);
eina_stringshare_del(as->rejected);
free(as);
}
@ -1419,9 +1418,9 @@ _magnifier_create(void *data)
Evas *e;
Evas_Coord w, h, mw, mh;
if (sd->mgf_proxy) evas_object_del(sd->mgf_proxy);
if (sd->mgf_bg) evas_object_del(sd->mgf_bg);
if (sd->mgf_clip) evas_object_del(sd->mgf_clip);
evas_object_del(sd->mgf_proxy);
evas_object_del(sd->mgf_bg);
evas_object_del(sd->mgf_clip);
e = evas_object_evas_get(data);
@ -1867,8 +1866,7 @@ _entry_selection_cleared_signal_cb(void *data,
(data, ELM_SEL_TYPE_PRIMARY, ELM_SEL_FORMAT_MARKUP,
sd->cut_sel, eina_stringshare_strlen(sd->cut_sel));
eina_stringshare_del(sd->cut_sel);
sd->cut_sel = NULL;
ELM_SAFE_FREE(sd->cut_sel, eina_stringshare_del);
}
else
{
@ -2125,8 +2123,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
!elm_layout_content_get(sd->anchor_hover.hover, "top") &&
!elm_layout_content_get(sd->anchor_hover.hover, "bottom"))
{
evas_object_del(sd->anchor_hover.hover);
sd->anchor_hover.hover = NULL;
ELM_SAFE_FREE(sd->anchor_hover.hover, evas_object_del);
}
else
evas_object_show(sd->anchor_hover.hover);
@ -2568,19 +2565,16 @@ _chars_add_till_limit(Evas_Object *obj,
unit_size = strlen(utfstr);
else if (unit == LENGTH_UNIT_CHAR)
unit_size = evas_string_char_len_get(utfstr);
free(utfstr);
utfstr = NULL;
ELM_SAFE_FREE(utfstr, free);
}
free(markup);
markup = NULL;
ELM_SAFE_FREE(markup, free);
}
if (can_add < unit_size)
{
if (!i)
{
evas_object_smart_callback_call(obj, SIG_MAX_LENGTH, NULL);
free(*text);
*text = NULL;
ELM_SAFE_FREE(*text, free);
return;
}
can_add = 0;
@ -2752,8 +2746,7 @@ _elm_entry_smart_text_set(Eo *obj, void *_pd, va_list *list)
if (sd->append_text_idler)
{
ecore_idler_del(sd->append_text_idler);
free(sd->append_text_left);
sd->append_text_left = NULL;
ELM_SAFE_FREE(sd->append_text_left, free);
sd->append_text_idler = NULL;
}
@ -3412,8 +3405,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
if (sd->append_text_idler)
{
ecore_idler_del(sd->append_text_idler);
free(sd->append_text_left);
sd->append_text_left = NULL;
ELM_SAFE_FREE(sd->append_text_left, free);
sd->append_text_idler = NULL;
}
ecore_timer_del(sd->longpress_timer);
@ -3433,8 +3425,8 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_filter_free(tf);
}
ELM_SAFE_FREE(sd->delay_write, ecore_timer_del);
if (sd->input_panel_imdata) free(sd->input_panel_imdata);
if (sd->anchor_hover.hover_style) eina_stringshare_del(sd->anchor_hover.hover_style);
free(sd->input_panel_imdata);
eina_stringshare_del(sd->anchor_hover.hover_style);
evas_event_thaw(evas_object_evas_get(obj));
evas_event_thaw_eval(evas_object_evas_get(obj));
@ -4702,8 +4694,7 @@ elm_entry_filter_limit_size(void *data,
if ((len >= lim->max_char_count) && (newlen > 0))
{
evas_object_smart_callback_call(entry, SIG_MAX_LENGTH, NULL);
free(*text);
*text = NULL;
ELM_SAFE_FREE(*text, free);
free(current);
free(utfstr);
return;
@ -4719,8 +4710,7 @@ elm_entry_filter_limit_size(void *data,
if ((len >= lim->max_byte_count) && (newlen > 0))
{
evas_object_smart_callback_call(entry, SIG_MAX_LENGTH, NULL);
free(*text);
*text = NULL;
ELM_SAFE_FREE(*text, free);
free(current);
free(utfstr);
return;
@ -5509,8 +5499,7 @@ _input_panel_imdata_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
int len = va_arg(*list, int);
Elm_Entry_Smart_Data *sd = _pd;
if (sd->input_panel_imdata)
free(sd->input_panel_imdata);
free(sd->input_panel_imdata);
sd->input_panel_imdata = calloc(1, len);
sd->input_panel_imdata_len = len;

2
legacy/elementary/src/lib/elm_factory.c
View File

@ -253,7 +253,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
if (wd->content == content) return;
prev_content = _content_unset_hook(obj, part);
if (prev_content) evas_object_del(prev_content);
evas_object_del(prev_content);
wd->content = content;
if (!content) return;

5
legacy/elementary/src/lib/elm_flip.c
View File

@ -679,8 +679,7 @@ _state_update(Evas_Object *obj)
sd->slices2 = calloc(sd->slices_w * sd->slices_h, sizeof(Slice *));
if (!sd->slices2)
{
free(sd->slices);
sd->slices = NULL;
ELM_SAFE_FREE(sd->slices, free);
return 0;
}
}
@ -1749,7 +1748,7 @@ _flip_content_set(Evas_Object *obj,
if (*cont == content) return EINA_TRUE;
if (*cont) evas_object_del(*cont);
evas_object_del(*cont);
*cont = content;
if (content)

8
legacy/elementary/src/lib/elm_font.c
View File

@ -108,9 +108,9 @@ _elm_font_properties_free(Elm_Font_Properties *efp)
const char *str;
EINA_LIST_FREE(efp->styles, str)
if (str) eina_stringshare_del(str);
eina_stringshare_del(str);
if (efp->name) eina_stringshare_del(efp->name);
eina_stringshare_del(efp->name);
free(efp);
}
@ -147,8 +147,8 @@ elm_font_properties_free(Elm_Font_Properties *efp)
EINA_SAFETY_ON_NULL_RETURN(efp);
EINA_LIST_FREE(efp->styles, str)
if (str) eina_stringshare_del(str);
if (efp->name) eina_stringshare_del(efp->name);
eina_stringshare_del(str);
eina_stringshare_del(efp->name);
free(efp);
}

2
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -2262,7 +2262,7 @@ _elm_gengrid_clear(Evas_Object *obj,
sd->clear_me = EINA_FALSE;
sd->pan_changed = EINA_TRUE;
ELM_SAFE_FREE(sd->calc_job, ecore_job_del);
if (sd->selected) sd->selected = eina_list_free(sd->selected);
sd->selected = eina_list_free(sd->selected);
if (sd->clear_cb) sd->clear_cb(sd);
sd->pan_x = 0;
sd->pan_y = 0;

26
legacy/elementary/src/lib/elm_genlist.c
View File

@ -793,7 +793,7 @@ _item_tree_effect_finish(Elm_Genlist_Smart_Data *sd)
evas_object_lower(sd->alpha_bg);
evas_object_hide(sd->alpha_bg);
sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
if (sd->move_items) sd->move_items = eina_list_free(sd->move_items);
sd->move_items = eina_list_free(sd->move_items);
evas_object_smart_callback_call(sd->pan_obj, "changed", NULL);
evas_object_smart_callback_call
@ -1252,8 +1252,8 @@ _item_cache_clean(Elm_Genlist_Smart_Data *sd)
sd->item_cache = eina_inlist_remove
(sd->item_cache, sd->item_cache->last);
sd->item_cache_count--;
if (itc->spacer) evas_object_del(itc->spacer);
if (itc->base_view) evas_object_del(itc->base_view);
evas_object_del(itc->spacer);
evas_object_del(itc->base_view);
eina_stringshare_del(itc->item_style);
free(itc);
}
@ -1265,8 +1265,8 @@ _item_cache_clean(Elm_Genlist_Smart_Data *sd)
static void
_item_cache_free(Item_Cache *itc)
{
if (itc->spacer) evas_object_del(itc->spacer);
if (itc->base_view) evas_object_del(itc->base_view);
evas_object_del(itc->spacer);
evas_object_del(itc->base_view);
eina_stringshare_del(itc->item_style);
free(itc);
}
@ -1293,8 +1293,7 @@ _item_cache_add(Elm_Gen_Item *it)
evas_event_freeze(evas_object_evas_get(obj));
if (sd->item_cache_max <= 0)
{
evas_object_del(VIEW(it));
VIEW(it) = NULL;
ELM_SAFE_FREE(VIEW(it), evas_object_del);
ELM_SAFE_FREE(it->spacer, evas_object_del);
evas_event_thaw(evas_object_evas_get(obj));
@ -4012,7 +4011,7 @@ _item_idle_enterer(void *data)
static void
_requeue_idle_enterer(Elm_Genlist_Smart_Data *sd)
{
if (sd->queue_idle_enterer) ecore_idle_enterer_del(sd->queue_idle_enterer);
ecore_idle_enterer_del(sd->queue_idle_enterer);
sd->queue_idle_enterer = ecore_idle_enterer_add(_item_idle_enterer, sd->obj);
}
@ -4472,8 +4471,7 @@ _item_unrealize_cb(Elm_Gen_Item *it)
if (it->item->nocache_once || it->item->nocache)
{
evas_object_del(VIEW(it));
VIEW(it) = NULL;
ELM_SAFE_FREE(VIEW(it), evas_object_del);
ELM_SAFE_FREE(it->spacer, evas_object_del);
}
else
@ -4988,10 +4986,7 @@ _elm_genlist_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
sd->queue = eina_list_free(sd->queue);
elm_genlist_clear(obj);
for (i = 0; i < 2; i++)
{
evas_object_del(sd->stack[i]);
sd->stack[i] = NULL;
}
ELM_SAFE_FREE(sd->stack[i], evas_object_del);
eo_unref(sd->pan_obj);
ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
@ -6513,8 +6508,7 @@ elm_genlist_item_fields_update(Elm_Object_Item *item,
{
Evas_Object* eobj;
Eina_List* l;
eina_list_free(it->item_focus_chain);
it->item_focus_chain = NULL;
it->item_focus_chain = eina_list_free(it->item_focus_chain);
EINA_LIST_FOREACH(it->content_objs, l, eobj)
if (elm_object_focus_allow_get(eobj))
it->item_focus_chain = eina_list_append(it->item_focus_chain, eobj);

11
legacy/elementary/src/lib/elm_glview.c
View File

@ -171,12 +171,8 @@ _set_render_policy_callback(Evas_Object *obj)
switch (sd->render_policy)
{
case ELM_GLVIEW_RENDER_POLICY_ON_DEMAND:
// Delete idle_enterer if it for some reason is around
if (sd->render_idle_enterer)
{
ecore_idle_enterer_del(sd->render_idle_enterer);
sd->render_idle_enterer = NULL;
}
// Delete idle_enterer if it for some reason is around
ELM_SAFE_FREE(sd->render_idle_enterer, ecore_idle_enterer_del);
// Set pixel getter callback
evas_object_image_pixels_get_callback_set
@ -267,8 +263,7 @@ _elm_glview_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
sd->del_func(obj);
}
if (sd->render_idle_enterer)
ecore_idle_enterer_del(sd->render_idle_enterer);
ecore_idle_enterer_del(sd->render_idle_enterer);
if (sd->surface) evas_gl_surface_destroy(sd->evasgl, sd->surface);
if (sd->context) evas_gl_context_destroy(sd->evasgl, sd->context);

8
legacy/elementary/src/lib/elm_hover.c
View File

@ -398,13 +398,7 @@ static void
_elm_hover_subs_del(Elm_Hover_Smart_Data *sd)
{
ELM_HOVER_PARTS_FOREACH
{
if (sd->subs[i].obj)
{
evas_object_del(sd->subs[i].obj);
sd->subs[i].obj = NULL;
}
}
ELM_SAFE_FREE(sd->subs[i].obj, evas_object_del);
}
static void

12
legacy/elementary/src/lib/elm_icon.c
View File

@ -381,14 +381,12 @@ _elm_icon_smart_file_set(Eo *obj, void *_pd, va_list *list)
/* parent's edje file setting path replicated here (we got .eet
* extension, so bypassing it) */
if (id->prev_img)
evas_object_del(id->prev_img);
id->prev_img = NULL;
ELM_SAFE_FREE(id->prev_img, evas_object_del);
if (!id->edje)
{
pclip = evas_object_clip_get(id->img);
if (id->img) evas_object_del(id->img);
evas_object_del(id->img);
/* Edje object instead */
id->img = edje_object_add(evas_object_evas_get(obj));
@ -591,7 +589,7 @@ _elm_icon_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Icon_Smart_Data *sd = _pd;
if (sd->stdicon) eina_stringshare_del(sd->stdicon);
eina_stringshare_del(sd->stdicon);
if (sd->thumb.request)
{
@ -603,9 +601,7 @@ _elm_icon_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eina_stringshare_del(sd->thumb.file.key);
eina_stringshare_del(sd->thumb.thumb.path);
eina_stringshare_del(sd->thumb.thumb.key);
if (sd->thumb.eeh)
ecore_event_handler_del(sd->thumb.eeh);
ecore_event_handler_del(sd->thumb.eeh);
_edje_signals_free(sd);

14
legacy/elementary/src/lib/elm_image.c
View File

@ -204,7 +204,7 @@ _elm_image_edje_file_set(Evas_Object *obj,
if (!sd->edje)
{
pclip = evas_object_clip_get(sd->img);
if (sd->img) evas_object_del(sd->img);
evas_object_del(sd->img);
/* Edje object instead */
sd->img = edje_object_add(evas_object_evas_get(obj));
@ -919,7 +919,7 @@ _elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf
size_t length;
Eina_Bool ret = EINA_FALSE;
if (sd->remote_data) free(sd->remote_data);
free(sd->remote_data);
length = eina_binbuf_length_get(download);
sd->remote_data = eina_binbuf_string_steal(download);
f = eina_file_virtualize(_elm_url_get(url),
@ -948,8 +948,7 @@ _elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf
}
sd->remote = NULL;
eina_stringshare_del(sd->key);
sd->key = NULL;
ELM_SAFE_FREE(sd->key, eina_stringshare_del);
}
static void
@ -962,8 +961,7 @@ _elm_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error
evas_object_smart_callback_call(obj, SIG_DOWNLOAD_ERROR, &err);
sd->remote = NULL;
eina_stringshare_del(sd->key);
sd->key = NULL;
ELM_SAFE_FREE(sd->key, eina_stringshare_del);
}
static void
@ -1411,7 +1409,7 @@ _elm_image_smart_orient_set(Eo *obj, void *_pd, va_list *list)
default:
ERR("unknown orient %d", orient);
evas_object_image_data_set(sd->img, data); // give it back
if (data2) free(data2);
free(data2);
return;
}
@ -1427,7 +1425,7 @@ _elm_image_smart_orient_set(Eo *obj, void *_pd, va_list *list)
}
to += hw;
}
if (data2) free(data2);
free(data2);
evas_object_image_data_set(sd->img, data);
evas_object_image_data_update_add(sd->img, 0, 0, iw, ih);

21
legacy/elementary/src/lib/elm_index.c
View File

@ -81,11 +81,8 @@ _index_box_clear(Evas_Object *obj,
EINA_LIST_FOREACH(sd->items, l, it)
{
if (!VIEW(it)) continue;
if (it->level != level) continue;
evas_object_del(VIEW(it));
VIEW(it) = NULL;
ELM_SAFE_FREE(VIEW(it), evas_object_del);
}
sd->level_active[level] = EINA_FALSE;
@ -362,11 +359,9 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
}
elm_layout_content_set(obj, "elm.swallow.index.1", sd->bx[1]);
}
else if (sd->bx[1])
{
evas_object_del(sd->bx[1]);
sd->bx[1] = NULL;
}
else
ELM_SAFE_FREE(sd->bx[1], evas_object_del);
if (edje_object_part_exists
(wd->resize_obj, "elm.swallow.event.1"))
{
@ -380,11 +375,9 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
elm_layout_content_set(obj, "elm.swallow.event.1", sd->event_rect[1]);
evas_object_size_hint_min_set(sd->event_rect[1], minw, minh);
}
else if (sd->event_rect[1])
{
evas_object_del(sd->event_rect[1]);
sd->event_rect[1] = NULL;
}
else
ELM_SAFE_FREE(sd->event_rect[1], evas_object_del);
edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj);

28
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -1461,10 +1461,7 @@ _elm_scroll_bounce_eval(Elm_Scrollable_Smart_Interface_Data *sid)
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.hold_enterer)
{
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
}
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
@ -1790,10 +1787,7 @@ _elm_scroll_content_region_show_internal(Evas_Object *obj,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.hold_enterer)
{
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
}
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
if (sid->down.momentum_animator)
{
ELM_SAFE_FREE(sid->down.momentum_animator, ecore_animator_del);
@ -2639,10 +2633,7 @@ _elm_scroll_mouse_up_event_cb(void *data,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.hold_enterer)
{
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
}
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
if (sid->down.scroll)
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL;
@ -2729,10 +2720,7 @@ _elm_scroll_mouse_down_event_cb(void *data,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.hold_enterer)
{
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
}
ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
if (sid->down.momentum_animator)
{
ELM_SAFE_FREE(sid->down.momentum_animator, ecore_animator_del);
@ -3047,7 +3035,7 @@ _elm_scroll_hold_animator(void *data)
{
Elm_Scrollable_Smart_Interface_Data *sid = data;
if (sid->down.hold_enterer) ecore_idle_enterer_del(sid->down.hold_enterer);
ecore_idle_enterer_del(sid->down.hold_enterer);
sid->down.hold_enterer =
ecore_idle_enterer_before_add(_elm_scroll_hold_enterer, sid);
return ECORE_CALLBACK_RENEW;
@ -3857,11 +3845,7 @@ _elm_scroll_extern_pan_set(Eo *obj, void *_pd, va_list *list)
}
else
{
if (sid->pan_obj)
{
evas_object_del(sid->pan_obj);
sid->pan_obj = NULL;
}
ELM_SAFE_FREE(sid->pan_obj, evas_object_del);
}
if (!pan)
{

6
legacy/elementary/src/lib/elm_list.c
View File

@ -1396,11 +1396,7 @@ _item_content_set_hook(Elm_Object_Item *it,
evas_object_rectangle_add(evas_object_evas_get(WIDGET(item)));
evas_object_color_set(content, 0, 0, 0, 0);
}
if (*icon_p)
{
evas_object_del(*icon_p);
*icon_p = NULL;
}
evas_object_del(*icon_p);
*icon_p = content;
if (VIEW(item))

32
legacy/elementary/src/lib/elm_main.c
View File

@ -174,19 +174,13 @@ static void
_prefix_shutdown(void)
{
if (app_pfx) eina_prefix_free(app_pfx);
if (app_domain) eina_stringshare_del(app_domain);
if (app_checkfile) eina_stringshare_del(app_checkfile);
if (app_compile_bin_dir) eina_stringshare_del(app_compile_bin_dir);
if (app_compile_lib_dir) eina_stringshare_del(app_compile_lib_dir);
if (app_compile_data_dir) eina_stringshare_del(app_compile_data_dir);
if (app_compile_locale_dir) eina_stringshare_del(app_compile_locale_dir);
ELM_SAFE_FREE(app_domain, eina_stringshare_del);
ELM_SAFE_FREE(app_checkfile, eina_stringshare_del);
ELM_SAFE_FREE(app_compile_bin_dir, eina_stringshare_del);
ELM_SAFE_FREE(app_compile_lib_dir, eina_stringshare_del);
ELM_SAFE_FREE(app_compile_data_dir, eina_stringshare_del);
ELM_SAFE_FREE(app_compile_locale_dir, eina_stringshare_del);
app_mainfunc = NULL;
app_domain = NULL;
app_checkfile = NULL;
app_compile_bin_dir = NULL;
app_compile_lib_dir = NULL;
app_compile_data_dir = NULL;
app_compile_locale_dir = NULL;
app_prefix_dir = NULL;
app_bin_dir = NULL;
app_lib_dir = NULL;
@ -332,10 +326,8 @@ elm_shutdown(void)
_elm_init_count--;
if (_elm_init_count > 0) return _elm_init_count;
if (system_handlers[0])
ecore_event_handler_del(system_handlers[0]);
if (system_handlers[1])
ecore_event_handler_del(system_handlers[1]);
ecore_event_handler_del(system_handlers[0]);
ecore_event_handler_del(system_handlers[1]);
_elm_win_shutdown();
while (_elm_win_deferred_free) ecore_main_loop_iterate();
@ -844,10 +836,7 @@ elm_quicklaunch_prepare(int argc,
strcat(p, exename);
strcat(p, LIBEXT);
if (access(exe2, R_OK | X_OK) != 0)
{
free(exe2);
exe2 = NULL;
}
ELM_SAFE_FREE(exe2, free);
/* Try linking to executable first. Works with PIE files. */
qr_handle = dlopen(exe, RTLD_NOW | RTLD_GLOBAL);
@ -952,8 +941,7 @@ elm_quicklaunch_fork(int argc,
if (quicklaunch_on)
{
if (_elm_appname) free(_elm_appname);
_elm_appname = NULL;
ELM_SAFE_FREE(_elm_appname, free);
if ((argv) && (argv[0]))
_elm_appname = strdup(ecore_file_file_get(argv[0]));

60
legacy/elementary/src/lib/elm_map.c
View File

@ -216,7 +216,7 @@ _nominatim_url_cb(const Evas_Object *obj,
if (str)
{
if (str[0]) free(str[0]);
free(str[0]);
free(str);
}
}
@ -709,7 +709,7 @@ _grid_item_create(Grid *g,
}
else eina_stringshare_replace(&gi->url, url);
if (url) free(url);
free(url);
eina_matrixsparse_data_idx_set(g->grid, y, x, gi);
return gi;
@ -723,10 +723,10 @@ _grid_item_free(Grid_Item *gi)
_grid_item_unload(gi);
if (gi->g && gi->g->grid)
eina_matrixsparse_data_idx_set(gi->g->grid, gi->y, gi->x, NULL);
if (gi->url) eina_stringshare_del(gi->url);
eina_stringshare_del(gi->url);
if (gi->file_have) ecore_file_remove(gi->file);
if (gi->file) eina_stringshare_del(gi->file);
if (gi->img) evas_object_del(gi->img);
eina_stringshare_del(gi->file);
evas_object_del(gi->img);
free(gi);
}
@ -1505,7 +1505,7 @@ _overlay_default_content_update(Overlay_Default *ovl,
EINA_SAFETY_ON_NULL_RETURN(ovl);
if (ovl->content == content) return;
if (ovl->content) evas_object_del(ovl->content);
evas_object_del(ovl->content);
ovl->content = content;
if (ovl->content)
@ -1555,7 +1555,7 @@ _overlay_default_class_content_update(Overlay_Default *ovl,
{
EINA_SAFETY_ON_NULL_RETURN(ovl);
if (ovl->clas_content) evas_object_del(ovl->clas_content);
evas_object_del(ovl->clas_content);
ovl->clas_content = _icon_dup(content, ovl->layout);
_overlay_default_layout_update(ovl);
}
@ -1568,7 +1568,7 @@ _overlay_default_icon_update(Overlay_Default *ovl,
if (ovl->icon == icon) return;
if (ovl->icon) evas_object_del(ovl->icon);
evas_object_del(ovl->icon);
ovl->icon = icon;
_overlay_default_layout_update(ovl);
}
@ -1579,7 +1579,7 @@ _overlay_default_class_icon_update(Overlay_Default *ovl,
{
EINA_SAFETY_ON_NULL_RETURN(ovl);
if (ovl->clas_icon) evas_object_del(ovl->clas_icon);
evas_object_del(ovl->clas_icon);
ovl->clas_icon = _icon_dup(icon, ovl->layout);
_overlay_default_layout_update(ovl);
}
@ -1599,11 +1599,11 @@ _overlay_default_free(Overlay_Default *ovl)
{
EINA_SAFETY_ON_NULL_RETURN(ovl);
if (ovl->content) evas_object_del(ovl->content);
if (ovl->icon) evas_object_del(ovl->icon);
if (ovl->clas_content) evas_object_del(ovl->clas_content);
if (ovl->clas_icon) evas_object_del(ovl->clas_icon);
if (ovl->layout) evas_object_del(ovl->layout);
evas_object_del(ovl->content);
evas_object_del(ovl->icon);
evas_object_del(ovl->clas_content);
evas_object_del(ovl->clas_icon);
evas_object_del(ovl->layout);
free(ovl);
}
@ -1672,7 +1672,7 @@ _overlay_group_coord_member_update(Overlay_Group *grp,
_coord_to_region_convert
(grp->wsd, x, y, grp->wsd->size.w, &grp->lon, &grp->lat);
if (grp->members) eina_list_free(grp->members);
eina_list_free(grp->members);
grp->members = members;
snprintf(text, sizeof(text), "%d", eina_list_count(members));
@ -1728,9 +1728,9 @@ _overlay_group_free(Overlay_Group *grp)
{
EINA_SAFETY_ON_NULL_RETURN(grp);
if (grp->overlay) free(grp->overlay);
free(grp->overlay);
if (grp->ovl) _overlay_default_free(grp->ovl);
if (grp->members) eina_list_free(grp->members);
eina_list_free(grp->members);
free(grp);
}
@ -1777,7 +1777,7 @@ _overlay_class_icon_update(Overlay_Class *ovl,
EINA_SAFETY_ON_NULL_RETURN(ovl);
if (ovl->icon == icon) return;
if (ovl->icon) evas_object_del(ovl->icon);
evas_object_del(ovl->icon);
ovl->icon = icon;
// For using proxy, it should have size and be shown but moved away to hide.
evas_object_resize(icon, 32, 32);
@ -1804,7 +1804,7 @@ _overlay_class_content_update(Overlay_Class *ovl,
EINA_SAFETY_ON_NULL_RETURN(ovl);
if (ovl->content == content) return;
if (ovl->content) evas_object_del(ovl->content);
evas_object_del(ovl->content);
ovl->content = content;
// For using proxy, it should have size and be shown but moved away to hide.
// content should have it's own size
@ -1855,8 +1855,8 @@ _overlay_class_free(Overlay_Class *clas)
_overlay_default_class_icon_update(overlay->ovl, NULL);
}
}
if (clas->icon) evas_object_del(clas->icon);
if (clas->members) eina_list_free(clas->members);
evas_object_del(clas->icon);
eina_list_free(clas->members);
free(clas);
}
@ -2077,7 +2077,7 @@ _overlay_route_free(Overlay_Route *route)
EINA_LIST_FREE(route->nodes, n)
{
if (n->pos.address) eina_stringshare_del(n->pos.address);
eina_stringshare_del(n->pos.address);
free(n);
}
@ -3130,7 +3130,7 @@ _name_request(const Evas_Object *obj,
&(name->job), sd->ua) || !(name->job))
{
ERR("Can't request Name from %s to %s", url, name->fname);
if (name->address) free(name->address);
free(name->address);
free(name->fname);
free(name);
free(fname);
@ -4090,7 +4090,7 @@ _elm_map_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_grid_all_clear(sd);
// Removal of download list should be after grid clear.
if (sd->download_idler) ecore_idler_del(sd->download_idler);
ecore_idler_del(sd->download_idler);
eina_list_free(sd->download_list);
_source_all_unload(sd);
@ -4797,10 +4797,10 @@ _route_add(Eo *obj, void *_pd, va_list *list)
if (!url)
{
ERR("Route URL is NULL");
if (type_name) free(type_name);
free(type_name);
return;
}
if (type_name) free(type_name);
free(type_name);
route = ELM_NEW(Elm_Map_Route);
route->wsd = sd;
@ -4848,13 +4848,13 @@ elm_map_route_del(Elm_Map_Route *route)
EINA_LIST_FREE(route->waypoint, w)
{
if (w->point) eina_stringshare_del(w->point);
eina_stringshare_del(w->point);
free(w);
}
EINA_LIST_FREE(route->nodes, n)
{
if (n->pos.address) eina_stringshare_del(n->pos.address);
eina_stringshare_del(n->pos.address);
free(n);
}
@ -4939,8 +4939,8 @@ elm_map_name_del(Elm_Map_Name *name)
EINA_SAFETY_ON_NULL_RETURN(name->wsd);
ELM_MAP_CHECK((name->wsd)->obj);
if (name->job) ecore_file_download_abort(name->job);
if (name->address) free(name->address);
ecore_file_download_abort(name->job);
free(name->address);
if (name->fname)
{
ecore_file_remove(name->fname);

5
legacy/elementary/src/lib/elm_mapbuf.c
View File

@ -220,7 +220,7 @@ _elm_mapbuf_smart_content_set(Eo *obj, void *_pd, va_list *list)
return;
}
if (sd->content) evas_object_del(sd->content);
evas_object_del(sd->content);
sd->content = content;
if (content)
@ -330,8 +330,7 @@ _destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Mapbuf_Smart_Data *priv = _pd;
if (priv->idler) ecore_idler_del(priv->idler);
priv->idler = NULL;
ELM_SAFE_FREE(priv->idler, ecore_idler_del);
eo_do_super(obj, MY_CLASS, eo_destructor());
}

23
legacy/elementary/src/lib/elm_menu.c
View File

@ -48,10 +48,10 @@ _item_del(Elm_Menu_Item *item)
EINA_LIST_FREE(item->submenu.items, child)
_item_del(child);
if (item->label) eina_stringshare_del(item->label);
if (item->submenu.hv) evas_object_del(item->submenu.hv);
if (item->submenu.location) evas_object_del(item->submenu.location);
if (item->icon_str) eina_stringshare_del(item->icon_str);
eina_stringshare_del(item->label);
evas_object_del(item->submenu.hv);
evas_object_del(item->submenu.location);
eina_stringshare_del(item->icon_str);
elm_widget_item_free(item);
}
@ -305,8 +305,7 @@ _item_content_set_hook(Elm_Object_Item *it,
item = (Elm_Menu_Item *)it;
if (content == item->content) return;
if (item->content) evas_object_del(item->content);
evas_object_del(item->content);
item->content = content;
if (item->content)
elm_layout_content_set(VIEW(item), "elm.swallow.content", item->content);
@ -634,8 +633,8 @@ _elm_menu_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
evas_object_event_callback_del_full
(sd->bx, EVAS_CALLBACK_RESIZE, _menu_resize_cb, obj);
if (sd->hv) evas_object_del(sd->hv);
if (sd->location) evas_object_del(sd->location);
evas_object_del(sd->hv);
evas_object_del(sd->location);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}
@ -906,10 +905,10 @@ _item_del_pre_hook(Elm_Object_Item *it)
ELM_MENU_DATA_GET(WIDGET(item), sd);
elm_menu_item_subitems_clear(it);
if (item->label) eina_stringshare_del(item->label);
if (item->content) evas_object_del(item->content);
if (item->submenu.hv) evas_object_del(item->submenu.hv);
if (item->submenu.location) evas_object_del(item->submenu.location);
eina_stringshare_del(item->label);
evas_object_del(item->content);
evas_object_del(item->submenu.hv);
evas_object_del(item->submenu.location);
if (item->parent)
item->parent->submenu.items =

6
legacy/elementary/src/lib/elm_module.c
View File

@ -56,12 +56,10 @@ _elm_module_shutdown(void)
EINA_LIST_FREE(tl, m) _elm_module_del(m);
eina_hash_free(modules);
modules = NULL;
ELM_SAFE_FREE(modules, eina_hash_free);
}
if (modules_as) eina_hash_free(modules_as);
modules_as = NULL;
ELM_SAFE_FREE(modules_as, eina_hash_free);
}
void

2
legacy/elementary/src/lib/elm_notify.c
View File

@ -405,7 +405,7 @@ _elm_notify_smart_content_set(Eo *obj, void *_pd, va_list *list)
if (part && strcmp(part, "default")) return;
if (sd->content == content) goto end;
if (sd->content) evas_object_del(sd->content);
evas_object_del(sd->content);
sd->content = content;
if (content)

16
legacy/elementary/src/lib/elm_photocam.c
View File

@ -513,8 +513,7 @@ _grid_clear(Evas_Object *obj,
}
}
free(g->grid);
g->grid = NULL;
ELM_SAFE_FREE(g->grid, free);
g->gw = 0;
g->gh = 0;
}
@ -1404,12 +1403,11 @@ _elm_photocam_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
EINA_LIST_FREE(sd->grids, g)
{
if (g->grid) free(g->grid);
free(g->grid);
free(g);
}
eo_unref(sd->pan_obj);
evas_object_del(sd->pan_obj);
sd->pan_obj = NULL;
ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
if (sd->f) eina_file_close(sd->f);
free(sd->remote_data);
@ -1557,7 +1555,7 @@ _elm_photocam_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *d
size_t length;
Evas_Load_Error ret = EVAS_LOAD_ERROR_NONE;
if (sd->remote_data) free(sd->remote_data);
free(sd->remote_data);
length = eina_binbuf_length_get(download);
sd->remote_data = eina_binbuf_string_steal(download);
f = eina_file_virtualize(_elm_url_get(url),
@ -2262,11 +2260,7 @@ _gesture_enabled_set(Eo *obj, void *_pd, va_list *list)
sd->do_gesture = gesture;
if (sd->g_layer)
{
evas_object_del(sd->g_layer);
sd->g_layer = NULL;
}
ELM_SAFE_FREE(sd->g_layer, evas_object_del);
if (!gesture) return;

10
legacy/elementary/src/lib/elm_prefs.c
View File

@ -1034,13 +1034,11 @@ _elm_prefs_page_populate(Elm_Prefs_Page_Node *page,
err:
EINA_LIST_FOREACH(page->items, l, it)
{
if (it->w_obj) evas_object_del(it->w_obj);
it->w_obj = NULL;
ELM_SAFE_FREE(it->w_obj, evas_object_del);
it->w_impl = NULL;
}
if (page->w_obj) evas_object_del(page->w_obj);
page->w_obj = NULL;
ELM_SAFE_FREE(page->w_obj, evas_object_del);
page->w_impl = NULL;
return EINA_FALSE;
@ -2084,10 +2082,10 @@ _prefs_item_del_cb(void *data EINA_UNUSED,
it = evas_object_data_get(obj, "prefs_item");
lbl = evas_object_data_del(it->w_obj, "label_widget");
if (lbl) evas_object_del(lbl);
evas_object_del(lbl);
icon = evas_object_data_del(it->w_obj, "icon_widget");
if (icon) evas_object_del(icon);
evas_object_del(icon);
ELM_PREFS_DATA_GET(it->prefs, sd);

6
legacy/elementary/src/lib/elm_prefs_data.c
View File

@ -299,8 +299,7 @@ _eet_data_load(Elm_Prefs_Data *prefs_data,
default:
ERR("bad item (type = %d) fetched from data file %s, skipping it",
it->type, prefs_data->data_file);
free(item);
item = NULL;
ELM_SAFE_FREE(item, free);
skip = EINA_TRUE;
break;
}
@ -311,8 +310,7 @@ _eet_data_load(Elm_Prefs_Data *prefs_data,
skip = EINA_TRUE;
if (set_err) eina_value_flush(&(item->value));
free(item);
item = NULL;
ELM_SAFE_FREE(item, free);
}
if (!skip) eina_hash_set(map, it->name, item);

2
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -306,7 +306,7 @@ _elm_progressbar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Elm_Progressbar_Smart_Data *sd = _pd;
Elm_Progress_Status *progress_obj;
if (sd->units) eina_stringshare_del(sd->units);
eina_stringshare_del(sd->units);
if (sd->progress_status)
{
EINA_LIST_FREE(sd->progress_status, progress_obj)

2
legacy/elementary/src/lib/elm_scroller.c
View File

@ -654,7 +654,7 @@ _elm_scroller_smart_content_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
if (sd->content == content) return;
if (sd->content) evas_object_del(sd->content);
evas_object_del(sd->content);
sd->content = content;
if (content)

6
legacy/elementary/src/lib/elm_segment_control.c
View File

@ -67,8 +67,8 @@ _item_free(Elm_Segment_Item *it)
if (sd->selected_item == it) sd->selected_item = NULL;
if (sd->items) sd->items = eina_list_remove(sd->items, it);
if (it->icon) evas_object_del(it->icon);
if (it->label) eina_stringshare_del(it->label);
evas_object_del(it->icon);
eina_stringshare_del(it->label);
}
static void
@ -460,7 +460,7 @@ _item_content_set_hook(Elm_Object_Item *it,
{
if (content == item->icon) return;
if (item->icon) evas_object_del(item->icon);
evas_object_del(item->icon);
item->icon = content;
if (!item->icon)
{

5
legacy/elementary/src/lib/elm_slideshow.c
View File

@ -223,8 +223,7 @@ _item_realize(Elm_Slideshow_Item *item)
(sd->items_built, sd->items_built);
if (item->itc->func.del)
item->itc->func.del(elm_widget_item_data_get(item), VIEW(item));
evas_object_del(VIEW(item));
VIEW(item) = NULL;
ELM_SAFE_FREE(VIEW(item), evas_object_del);
}
}
@ -355,7 +354,7 @@ _elm_slideshow_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
const char *layout;
elm_slideshow_clear(obj);
if (sd->transitions) elm_widget_stringlist_free(sd->transitions);
elm_widget_stringlist_free(sd->transitions);
ecore_timer_del(sd->timer);
EINA_LIST_FREE(sd->layout.list, layout)

4
legacy/elementary/src/lib/elm_store.c
View File

@ -399,7 +399,7 @@ _store_filesystem_list_do(void *data, Ecore_Thread *th EINA_UNUSED)
}
else
{
if (info->base.sort_id) free(info->base.sort_id);
free(info->base.sort_id);
free(info);
}
if (ecore_thread_check(th)) break;
@ -469,7 +469,7 @@ _store_filesystem_list_update(void *data, Ecore_Thread *th EINA_UNUSED, void *ms
NULL/* func data */);
st->items = eina_inlist_append(st->items, (Eina_Inlist *)sti);
done:
if (info->base.sort_id) free(info->base.sort_id);
free(info->base.sort_id);
free(info);
}

2
legacy/elementary/src/lib/elm_theme.c
View File

@ -260,7 +260,7 @@ _elm_theme_idler_clean(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object
Ecore_Idler *idler;
idler = evas_object_data_get(obj, "elm-theme-reload-idler");
if (idler) ecore_idler_del(idler);
ecore_idler_del(idler);
evas_object_data_del(obj, "elm-theme-reload-idler");
}

23
legacy/elementary/src/lib/elm_thumb.c
View File

@ -206,8 +206,7 @@ _thumb_finish(Elm_Thumb_Smart_Data *sd,
evas = evas_object_evas_get(sd->obj);
if ((sd->view) && (sd->is_video ^ sd->was_video))
{
evas_object_del(sd->view);
sd->view = NULL;
ELM_SAFE_FREE(sd->view, evas_object_del);
}
sd->was_video = sd->is_video;
@ -287,14 +286,9 @@ _thumb_finish(Elm_Thumb_Smart_Data *sd,
EINA_LIST_FREE(retry, sd)
{
eo_data_unref(sd->obj, sd);
eina_stringshare_del(sd->thumb.thumb_path);
sd->thumb.thumb_path = NULL;
eina_stringshare_del(sd->thumb.thumb_key);
sd->thumb.thumb_key = NULL;
evas_object_del(sd->view);
sd->view = NULL;
ELM_SAFE_FREE(sd->thumb.thumb_path, eina_stringshare_del);
ELM_SAFE_FREE(sd->thumb.thumb_key, eina_stringshare_del);
ELM_SAFE_FREE(sd->view, evas_object_del);
wd = eo_data_scope_get(sd->obj, ELM_OBJ_WIDGET_CLASS);
edje_object_signal_emit
@ -580,19 +574,14 @@ _elm_thumb_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded,
sd);
if (sd->view)
{
evas_object_del(sd->view);
sd->view = NULL;
}
ELM_SAFE_FREE(sd->view, evas_object_del);
eina_stringshare_del(sd->thumb.thumb_path);
eina_stringshare_del(sd->thumb.thumb_key);
eina_stringshare_del(sd->file);
eina_stringshare_del(sd->key);
if (sd->eeh) ecore_event_handler_del(sd->eeh);
ecore_event_handler_del(sd->eeh);
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}

23
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -121,11 +121,7 @@ _items_visibility_fix(Elm_Toolbar_Smart_Data *sd,
static void
_item_menu_destroy(Elm_Toolbar_Item *item)
{
if (item->o_menu)
{
evas_object_del(item->o_menu);
item->o_menu = NULL;
}
ELM_SAFE_FREE(item->o_menu, evas_object_del);
item->menu = EINA_FALSE;
}
@ -934,10 +930,10 @@ _item_del(Elm_Toolbar_Item *it)
evas_object_del(it->icon);
}
if (it->object) evas_object_del(it->object);
evas_object_del(it->object);
//TODO: See if checking for sd->menu_parent is necessary before
//deleting menu
if (it->o_menu) evas_object_del(it->o_menu);
evas_object_del(it->o_menu);
}
static void
@ -1346,7 +1342,7 @@ _item_content_set_hook(Elm_Object_Item *it,
if (part && strcmp(part, "object")) return;
if (item->object == content) return;
if (item->object) evas_object_del(item->object);
evas_object_del(item->object);
item->object = content;
if (item->object)
@ -1574,8 +1570,7 @@ _transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
if (item->proxy)
{
evas_object_image_source_visible_set(elm_image_object_get(item->proxy), EINA_TRUE);
evas_object_del(item->proxy);
item->proxy = NULL;
ELM_SAFE_FREE(item->proxy, evas_object_del);
}
item->trans = NULL;
@ -1759,8 +1754,7 @@ _mouse_up_reorder(Elm_Toolbar_Item *it,
if (it->proxy)
{
evas_object_image_source_visible_set(elm_image_object_get(it->proxy), EINA_TRUE);
evas_object_del(it->proxy);
it->proxy = NULL;
ELM_SAFE_FREE(it->proxy, evas_object_del);
}
eo_do(obj, elm_scrollable_interface_hold_set(EINA_FALSE));
@ -3557,8 +3551,7 @@ elm_toolbar_item_state_add(Elm_Object_Item *it,
if (!_item_icon_set(icon_obj, "toolbar/", icon))
{
evas_object_del(icon_obj);
icon_obj = NULL;
ELM_SAFE_FREE(icon_obj, evas_object_del);
icon = NULL;
}
@ -3602,7 +3595,7 @@ elm_toolbar_item_state_del(Elm_Object_Item *it,
eina_stringshare_del(state->label);
eina_stringshare_del(state->icon_str);
if (state->icon) evas_object_del(state->icon);
evas_object_del(state->icon);
free(state);
item->states = eina_list_remove_list(item->states, del_state);

8
legacy/elementary/src/lib/elm_transit.c
View File

@ -118,10 +118,9 @@ _transit_obj_data_update(Elm_Transit *transit, Evas_Object *obj)
obj_data->freeze_events = evas_object_freeze_events_get(obj);
if ((!transit->state_keep) && (obj_data->state))
if (!transit->state_keep)
{
free(obj_data->state);
obj_data->state = NULL;
ELM_SAFE_FREE(obj_data->state, free);
}
else
{
@ -172,8 +171,7 @@ _transit_obj_remove_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *
Elm_Transit_Obj_Data *obj_data = evas_object_data_get(obj, _transit_key);
if (obj_data)
{
if (obj_data->state)
free(obj_data->state);
free(obj_data->state);
free(obj_data);
}
_remove_obj_from_list(transit, obj);

17
legacy/elementary/src/lib/elm_widget.c
View File

@ -328,10 +328,10 @@ _elm_widget_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
EINA_LIST_FREE(sd->event_cb, ecb)
free(ecb);
if (sd->style) eina_stringshare_del(sd->style);
eina_stringshare_del(sd->style);
if (sd->theme) elm_theme_free(sd->theme);
_if_focused_revert(obj, EINA_TRUE);
if (sd->access_info) eina_stringshare_del(sd->access_info);
eina_stringshare_del(sd->access_info);
evas_object_smart_data_set(obj, NULL);
}
@ -3946,8 +3946,7 @@ _part_text_translatable_set(Eina_Inlist **translate_strings, const char *part, E
eina_stringshare_del(ts->id);
eina_stringshare_del(ts->domain);
eina_stringshare_del(ts->string);
free(ts);
ts = NULL;
ELM_SAFE_FREE(ts, free);
}
}
@ -4170,7 +4169,7 @@ _elm_widget_access_info_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
{
const char *txt = va_arg(*list, const char *);
Elm_Widget_Smart_Data *sd = _pd;
if (sd->access_info) eina_stringshare_del(sd->access_info);
eina_stringshare_del(sd->access_info);
if (!txt) sd->access_info = NULL;
else sd->access_info = eina_stringshare_add(txt);
}
@ -5063,11 +5062,9 @@ _elm_widget_item_free(Elm_Widget_Item *item)
if (item->del_func)
item->del_func((void *)item->data, item->widget, item);
if (item->view)
evas_object_del(item->view);
evas_object_del(item->view);
if (item->access_info)
eina_stringshare_del(item->access_info);
eina_stringshare_del(item->access_info);
while (item->signals)
_elm_widget_item_signal_callback_list_get(item, item->signals);
@ -6079,7 +6076,7 @@ _elm_widget_item_access_info_set(Elm_Widget_Item *item,
const char *txt)
{
ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
if (item->access_info) eina_stringshare_del(item->access_info);
eina_stringshare_del(item->access_info);
if (!txt) item->access_info = NULL;
else item->access_info = eina_stringshare_add(txt);
}

30
legacy/elementary/src/lib/elm_win.c
View File

@ -491,8 +491,8 @@ _shot_do(Elm_Win_Smart_Data *sd)
file, key, flags);
}
free(file);
if (key) free(key);
if (flags) free(flags);
free(key);
free(flags);
ecore_evas_free(ee);
if (sd->shot.repeat_count) sd->shot.shot_counter++;
}
@ -1494,12 +1494,11 @@ _elm_win_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
_elm_win_focus_highlight_shutdown(sd);
eina_stringshare_del(sd->focus_highlight.style);
if (sd->title) eina_stringshare_del(sd->title);
if (sd->icon_name) eina_stringshare_del(sd->icon_name);
if (sd->role) eina_stringshare_del(sd->role);
if (sd->icon) evas_object_del(sd->icon);
if (sd->main_menu) evas_object_del(sd->main_menu);
eina_stringshare_del(sd->title);
eina_stringshare_del(sd->icon_name);
eina_stringshare_del(sd->role);
evas_object_del(sd->icon);
evas_object_del(sd->main_menu);
_elm_win_profile_del(sd);
_elm_win_available_profiles_del(sd);
@ -2471,8 +2470,7 @@ _elm_win_frame_add(Elm_Win_Smart_Data *sd,
if (!elm_widget_theme_object_set
(sd->obj, sd->frame_obj, "border", "base", style))
{
evas_object_del(sd->frame_obj);
sd->frame_obj = NULL;
ELM_SAFE_FREE(sd->frame_obj, evas_object_del);
return;
}
@ -2542,11 +2540,7 @@ _elm_win_frame_del(Elm_Win_Smart_Data *sd)
{
int w, h;
if (sd->client_obj)
{
evas_object_del(sd->client_obj);
sd->client_obj = NULL;
}
ELM_SAFE_FREE(sd->client_obj, evas_object_del);
if (sd->frame_obj)
{
@ -2580,8 +2574,7 @@ _elm_win_frame_del(Elm_Win_Smart_Data *sd)
(sd->frame_obj, "elm,action,close", "elm",
_elm_win_frame_cb_close);
evas_object_del(sd->frame_obj);
sd->frame_obj = NULL;
ELM_SAFE_FREE(sd->frame_obj, evas_object_del);
}
evas_output_framespace_set(sd->evas, 0, 0, 0, 0);
@ -2832,8 +2825,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
tmp_sd.ee = ecore_evas_object_ecore_evas_get(tmp_sd.img_obj);
if (!tmp_sd.ee)
{
evas_object_del(tmp_sd.img_obj);
tmp_sd.img_obj = NULL;
ELM_SAFE_FREE(tmp_sd.img_obj, evas_object_del);
}
}
break;

12
legacy/elementary/src/lib/els_cursor.c
View File

@ -182,8 +182,7 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur)
if (!_elm_theme_object_set(obj, cur->obj, "cursor", cur->cursor_name,
cur->style ? cur->style : "default"))
{
evas_object_del(cur->obj);
cur->obj = NULL;
ELM_SAFE_FREE(cur->obj, evas_object_del);
return EINA_FALSE;
}
@ -439,8 +438,7 @@ elm_object_cursor_unset(Evas_Object *obj)
{
evas_object_event_callback_del_full(cur->obj, EVAS_CALLBACK_DEL,
_elm_cursor_obj_del, cur);
evas_object_del(cur->obj);
cur->obj = NULL;
ELM_SAFE_FREE(cur->obj, evas_object_del);
}
if (cur->visible)
@ -518,11 +516,7 @@ elm_object_cursor_theme_search_enabled_set(Evas_Object *obj, Eina_Bool theme_sea
{
ELM_CURSOR_GET_OR_RETURN(cur, obj);
cur->theme_search = theme_search;
if (cur->obj)
{
evas_object_del(cur->obj);
cur->obj = NULL;
}
ELM_SAFE_FREE(cur->obj, evas_object_del);
_elm_cursor_cur_set(cur);
}

3
legacy/elementary/src/lib/els_tooltip.c
View File

@ -183,8 +183,7 @@ _elm_tooltip_content_del(Elm_Tooltip *tt)
(tt->content, EVAS_CALLBACK_DEL,
_elm_tooltip_content_del_cb, tt);
evas_object_hide(tt->content);
evas_object_del(tt->content);
tt->content = NULL;
ELM_SAFE_FREE(tt->content, evas_object_del);
}
static void