From 3ce5d1ebc7b14d84660ba3e5e10544bf922ee845 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Thu, 8 Sep 2016 00:05:25 +0900
Subject: [PATCH] eo_compatible - improve usability of err/warnings by
 duplication impl

---
 src/lib/eo/eo.c                 |  7 ++++++-
 src/lib/eo/eo_ptr_indirection.x | 11 ++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 631e73aaa5..7931753bbd 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -2094,7 +2094,12 @@ efl_domain_data_return(Efl_Id_Domain domain)
 EAPI Eina_Bool
 efl_compatible(const Eo *obj, const Eo *obj_target)
 {
-   return _eo_id_domain_compatible(obj, obj_target);
+   Efl_Id_Domain domain1 = ((Eo_Id)obj >> SHIFT_DOMAIN) & MASK_DOMAIN;
+   Efl_Id_Domain domain2 = ((Eo_Id)obj_target >> SHIFT_DOMAIN) & MASK_DOMAIN;
+   if (domain1 == domain2) return EINA_TRUE;
+   DBG("Object %p and %p are not compatible. Domain %i and %i do not match",
+       obj, obj_target, domain1, domain2);
+   return EINA_FALSE;
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x
index 835e7a9cb5..21b88ac146 100644
--- a/src/lib/eo/eo_ptr_indirection.x
+++ b/src/lib/eo/eo_ptr_indirection.x
@@ -370,13 +370,10 @@ _eo_id_domain_compatible(const Eo *o1, const Eo *o2)
 {
    Efl_Id_Domain domain1 = ((Eo_Id)o1 >> SHIFT_DOMAIN) & MASK_DOMAIN;
    Efl_Id_Domain domain2 = ((Eo_Id)o2 >> SHIFT_DOMAIN) & MASK_DOMAIN;
-   if (domain1 != domain2)
-     {
-        ERR("Object %p and %p are not compatible. Domain %i and %i do not match",
-            o1, o2, domain1, domain2);
-        return EINA_FALSE;
-     }
-   return EINA_TRUE;
+   if (domain1 == domain2) return EINA_TRUE;
+   ERR("Object %p and %p are not compatible. Domain %i and %i do not match",
+       o1, o2, domain1, domain2);
+   return EINA_FALSE;
 }
 
 //////////////////////////////////////////////////////////////////////////