Don't return int in functions returning Eina_Bool

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@51201 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_x/xlib/ecore_x_image.c b/src/lib/ecore_x/xlib/ecore_x_image.c
index d52d2ee..4b8215c 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_image.c
+++ b/src/lib/ecore_x/xlib/ecore_x_image.c
@@ -193,7 +193,7 @@ EAPI Eina_Bool
 ecore_x_image_get(Ecore_X_Image *im, Ecore_X_Drawable draw,
                   int x, int y, int sx, int sy, int w, int h)
 {
-   int ret = 1;
+   Eina_Bool ret = EINA_TRUE;
    XErrorHandler ph;
 
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -215,7 +215,7 @@ ecore_x_image_get(Ecore_X_Image *im, Ecore_X_Drawable draw,
              im->xim->width = w;
              im->xim->height = h;
              if (!XShmGetImage(_ecore_x_disp, draw, im->xim, x, y, 0xffffffff))
-                ret = 0;
+                ret = EINA_FALSE;
 
              ecore_x_sync();
           }
@@ -257,12 +257,12 @@ ecore_x_image_get(Ecore_X_Image *im, Ecore_X_Drawable draw,
 
         XSetErrorHandler((XErrorHandler)ph);
         if (_ecore_x_image_err)
-           ret = 0;
+           ret = EINA_FALSE;
      }
    else
      {
         printf("currently unimplemented ecore_x_image_get without shm\n");
-        ret = 0;
+        ret = EINA_FALSE;
      }
 
    return ret;

diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c
index 2b35e13..8c0611d 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_xi2.c
+++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c
@@ -131,7 +131,8 @@ EAPI Eina_Bool
 ecore_x_input_multi_select(Ecore_X_Window win)
 {
 #ifdef ECORE_XI2
-   int i, find = 0;
+   int i;
+   Eina_Bool find = EINA_FALSE;
 
    if (!_ecore_x_xi2_devs)
       return 0;
@@ -153,13 +154,13 @@ ecore_x_input_multi_select(Ecore_X_Window win)
              XISetMask(mask, XI_ButtonRelease);
              XISetMask(mask, XI_Motion);
              XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
-             find = 1;
+             find = EINA_TRUE;
           }
      }
 
    return find;
 #else /* ifdef ECORE_XI2 */
-   return 0;
+   return EINA_FALSE;
 #endif /* ifdef ECORE_XI2 */
 } /* ecore_x_input_multi_select */
 

diff --git a/src/tests/ecore_test_ecore.c b/src/tests/ecore_test_ecore.c
index 364eb1a..6f7e30e 100644 (file)
--- a/src/tests/ecore_test_ecore.c
+++ b/src/tests/ecore_test_ecore.c
@@ -24,7 +24,7 @@ _quit_cb(void *data)
 static Eina_Bool
 _dummy_cb(void *data)
 {
-   return (int)(long)data;
+   return !!data;
 }
 
 START_TEST(ecore_test_ecore_init)