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

elm_win.c: ELM_SAFE_FREE adoption. 

I splited ELM_SAFE_FREE refactoring patches. One commit per each file as recommended.
For the detail, please refer 3072dab12f12fe83fb5a628d15efd5cded11787f.
This commit is contained in:
Daniel Juyung Seo 2013-05-29 21:11:46 +09:00
parent 1a2cc11167
commit cb691fc983
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,9 +651,7 @@ _elm_win_mouse_in(Ecore_Evas *ee)
static void static void
_elm_win_focus_highlight_reconfigure_job_stop(Elm_Win_Smart_Data *sd) _elm_win_focus_highlight_reconfigure_job_stop(Elm_Win_Smart_Data *sd)
{ {
if (sd->focus_highlight.reconf_job) ELM_SAFE_FREE(sd->focus_highlight.reconf_job, ecore_job_del);
ecore_job_del(sd->focus_highlight.reconf_job);
sd->focus_highlight.reconf_job = NULL;
} }
static void static void
@ -883,22 +881,15 @@ _elm_win_available_profiles_del(Elm_Win_Smart_Data *sd)
unsigned int i; unsigned int i;
for (i = 0; i < sd->profile.count; i++) for (i = 0; i < sd->profile.count; i++)
if (sd->profile.available_list[i]) ELM_SAFE_FREE(sd->profile.available_list[i], eina_stringshare_del);
{
eina_stringshare_del(sd->profile.available_list[i]);
sd->profile.available_list[i] = NULL;
}
sd->profile.count = 0; sd->profile.count = 0;
free(sd->profile.available_list); ELM_SAFE_FREE(sd->profile.available_list, free);
sd->profile.available_list = NULL;
} }
static void static void
_elm_win_profile_del(Elm_Win_Smart_Data *sd) _elm_win_profile_del(Elm_Win_Smart_Data *sd)
{ {
if (!sd->profile.name) return; ELM_SAFE_FREE(sd->profile.name, eina_stringshare_del);
eina_stringshare_del(sd->profile.name);
sd->profile.name = NULL;
} }
static Eina_Bool static Eina_Bool
@ -1470,10 +1461,10 @@ _elm_win_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
ecore_evas_callback_resize_set(sd->ee, NULL); ecore_evas_callback_resize_set(sd->ee, NULL);
} }
ELM_FREE_FUNC(sd->deferred_resize_job, ecore_job_del); if (sd->deferred_resize_job) ecore_job_del(sd->deferred_resize_job);
ELM_FREE_FUNC(sd->deferred_child_eval_job, ecore_job_del); if (sd->deferred_child_eval_job) ecore_job_del(sd->deferred_child_eval_job);
ELM_FREE_FUNC(sd->shot.info, eina_stringshare_del); if (sd->shot.info) eina_stringshare_del(sd->shot.info);
ELM_FREE_FUNC(sd->shot.timer, ecore_timer_del); if (sd->shot.timer) ecore_timer_del(sd->shot.timer);
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
if (sd->x.client_message_handler) if (sd->x.client_message_handler)
@ -1883,11 +1874,7 @@ void
_elm_win_shutdown(void) _elm_win_shutdown(void)
{ {
while (_elm_win_list) evas_object_del(_elm_win_list->data); while (_elm_win_list) evas_object_del(_elm_win_list->data);
if (_elm_win_state_eval_job) ELM_SAFE_FREE(_elm_win_state_eval_job, ecore_job_del);
{
ecore_job_del(_elm_win_state_eval_job);
_elm_win_state_eval_job = NULL;
}
} }
void void