seoz pushed a commit to branch master.
commit 1ac35e99e2a63031e95315e1d6afa2e21cf2d34b
Author: Daniel Juyung Seo <[email protected]>
Date: Wed May 29 20:43:03 2013 +0900
elm_clock.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.
---
src/lib/elm_clock.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index ed2663c..b49fea6 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -142,7 +142,7 @@ _on_clock_val_up_start(void *data,
sd->interval = sd->first_interval;
sd->sel_obj = obj;
- ELM_FREE_FUNC(sd->spin, ecore_timer_del);
+ if (sd->spin) ecore_timer_del(sd->spin);
sd->spin = ecore_timer_add(sd->interval, _on_clock_val_up, data);
_on_clock_val_up(data);
@@ -158,7 +158,7 @@ _on_clock_val_down_start(void *data,
sd->interval = sd->first_interval;
sd->sel_obj = obj;
- ELM_FREE_FUNC(sd->spin, ecore_timer_del);
+ if (sd->spin) ecore_timer_del(sd->spin);
sd->spin = ecore_timer_add(sd->interval, _on_clock_val_down, data);
_on_clock_val_down(data);
@@ -172,7 +172,7 @@ _on_clock_val_change_stop(void *data,
{
ELM_CLOCK_DATA_GET(data, sd);
- ELM_FREE_FUNC(sd->spin, ecore_timer_del);
+ ELM_SAFE_FREE(sd->spin, ecore_timer_del);
sd->sel_obj = NULL;
}
@@ -712,8 +712,8 @@ _elm_clock_smart_del(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
{
Elm_Clock_Smart_Data *sd = _pd;
- ELM_FREE_FUNC(sd->ticker, ecore_timer_del);
- ELM_FREE_FUNC(sd->spin, ecore_timer_del);
+ if (sd->ticker) ecore_timer_del(sd->ticker);
+ if (sd->spin) ecore_timer_del(sd->spin);
/* NB: digits are killed for being sub objects, automatically */
--
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
