summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2014-04-17 21:08:43 +0200
committerCedric Bail <cedric.bail@free.fr>2014-04-17 21:08:43 +0200
commit1816949ee5383adda0d3afd5550184dc68e39f9e (patch)
tree4dcb19ef7b3cfd7801169267328c9dcedd1e4a0a
parentc17d08d2ab52c12583570c47a29ae65ee72409c7 (diff)
ecore: Fixed se of EINA_MAIN_LOOP_CHECK_RETURN macros with functions with return types
Summary: Changed uses of EINA_MAIN_LOOP_CHECK_RETURN for EINA_MAIN_LOOP_CHECK_RETURN_VAL for functions that doesn't have void return types. These only error out when compiling with --with-profile=debug @fixed Reviewers: raster, cedric, smohanty CC: cedric Differential Revision: https://phab.enlightenment.org/D765
-rw-r--r--src/lib/ecore/ecore_getopt.c2
-rw-r--r--src/lib/ecore/ecore_poll.c4
-rw-r--r--src/lib/ecore/ecore_timer.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c
index 8c978f1..d7d8d07 100644
--- a/src/lib/ecore/ecore_getopt.c
+++ b/src/lib/ecore/ecore_getopt.c
@@ -793,7 +793,7 @@ _ecore_getopt_help_prepare(const Ecore_Getopt *parser)
793{ 793{
794 const char *var; 794 const char *var;
795 795
796 EINA_MAIN_LOOP_CHECK_RETURN; 796 EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
797 if (!parser) return EINA_FALSE; 797 if (!parser) return EINA_FALSE;
798 798
799 if (_argc < 1) 799 if (_argc < 1)
diff --git a/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c
index 0113136..eeff3c7 100644
--- a/src/lib/ecore/ecore_poll.c
+++ b/src/lib/ecore/ecore_poll.c
@@ -297,7 +297,7 @@ _ecore_poller_constructor(Eo *obj, Ecore_Poller_Data *poller, Ecore_Poller_Type
297EOLIAN static Eina_Bool 297EOLIAN static Eina_Bool
298_ecore_poller_interval_set(Eo *obj EINA_UNUSED, Ecore_Poller_Data *poller, int interval) 298_ecore_poller_interval_set(Eo *obj EINA_UNUSED, Ecore_Poller_Data *poller, int interval)
299{ 299{
300 EINA_MAIN_LOOP_CHECK_RETURN; 300 EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
301 301
302 int ibit; 302 int ibit;
303 303
@@ -330,7 +330,7 @@ _ecore_poller_interval_get(Eo *obj EINA_UNUSED, Ecore_Poller_Data *poller)
330{ 330{
331 int ibit, interval = 1; 331 int ibit, interval = 1;
332 332
333 EINA_MAIN_LOOP_CHECK_RETURN; 333 EINA_MAIN_LOOP_CHECK_RETURN_VAL(interval);
334 334
335 ibit = poller->ibit; 335 ibit = poller->ibit;
336 while (ibit != 0) 336 while (ibit != 0)
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 2de040e..7d118b8 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -300,7 +300,7 @@ _ecore_timer_interval_get(Eo *obj EINA_UNUSED, Ecore_Timer_Data *timer)
300{ 300{
301 double ret = -1.0; 301 double ret = -1.0;
302 302
303 EINA_MAIN_LOOP_CHECK_RETURN; 303 EINA_MAIN_LOOP_CHECK_RETURN_VAL(ret);
304 _ecore_lock(); 304 _ecore_lock();
305 ret = timer->in; 305 ret = timer->in;
306 _ecore_unlock(); 306 _ecore_unlock();
@@ -365,7 +365,7 @@ _ecore_timer_pending_get(Eo *obj EINA_UNUSED, Ecore_Timer_Data *timer)
365 double now; 365 double now;
366 double ret = 0.0; 366 double ret = 0.0;
367 367
368 EINA_MAIN_LOOP_CHECK_RETURN; 368 EINA_MAIN_LOOP_CHECK_RETURN_VAL(ret);
369 369
370 _ecore_lock(); 370 _ecore_lock();
371 371
@@ -438,7 +438,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
438EOLIAN static int 438EOLIAN static int
439_ecore_timer_eo_base_event_freeze_get(Eo *obj EINA_UNUSED, Ecore_Timer_Data *timer) 439_ecore_timer_eo_base_event_freeze_get(Eo *obj EINA_UNUSED, Ecore_Timer_Data *timer)
440{ 440{
441 EINA_MAIN_LOOP_CHECK_RETURN; 441 EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
442 442
443 return timer->frozen; 443 return timer->frozen;
444} 444}