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

elm: Removed unnecessary null check for eina_stringshare_del.

This commit is contained in:
Daniel Juyung Seo 2014-01-22 10:12:44 +09:00
parent c066009c49
commit 43533a2fb9
20 changed files with 83 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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());
}

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());
}

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

@ -829,9 +829,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))

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

@ -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);
}

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());
}

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

@ -1587,12 +1587,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);

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

@ -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;

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

@ -355,8 +355,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);
}
@ -1867,8 +1867,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
{
@ -3433,8 +3432,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));

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);
}

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

@ -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);
}

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

@ -591,7 +591,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)
{

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

@ -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

18
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;

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

@ -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);
}
@ -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);
}
@ -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);
}

16
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);
}
@ -906,10 +906,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 =

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)

4
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

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

@ -287,14 +287,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 +575,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());
}

11
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);
}
@ -4170,7 +4170,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);
}
@ -5066,8 +5066,7 @@ _elm_widget_item_free(Elm_Widget_Item *item)
if (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 +6078,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);
}

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

@ -1494,10 +1494,10 @@ _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);
eina_stringshare_del(sd->title);
eina_stringshare_del(sd->icon_name);
eina_stringshare_del(sd->role);
evas_object_del(sd->icon);
if (sd->main_menu) evas_object_del(sd->main_menu);