Eo: Rename an internal function to reduce confusion.

@raster added eo_id_get() which was confusing because we already had
_eo_id_get() that was used internally.

3 files changed, 20 insertions, 20 deletions

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index bac6c3a692..0eac55c0bb 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -420,7 +420,7 @@ end:
 
              if (EINA_LIKELY(func->func && func->src))
                {
-                  call->eo_id = _eo_id_get(emb_obj);
+                  call->eo_id = _eo_obj_id_get(emb_obj);
                   call->obj = obj; /* FIXME-eo4: Hack, we retain the previous object so we unref it... */
                   call->func = func->func;
                   call->data = _eo_data_scope_get(emb_obj, func->src);
@@ -660,7 +660,7 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
    EINA_MAGIC_SET((Eo_Header *) obj, EO_EINA_MAGIC);
 #endif
    obj->header.id = _eo_id_allocate(obj);
-   Eo *eo_id = _eo_id_get(obj);
+   Eo *eo_id = _eo_obj_id_get(obj);
 
    _eo_condtor_reset(obj);
 
@@ -1459,7 +1459,7 @@ _eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Eo_Cl
    (obj->datarefcount)++;
 #ifdef EO_DEBUG
    Eo_Xref_Node *xref = calloc(1, sizeof(*xref));
-   xref->ref_obj = _eo_id_get(ref_obj);
+   xref->ref_obj = _eo_obj_id_get(ref_obj);
    xref->file = file;
    xref->line = line;
 
@@ -1488,7 +1488,7 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
 #endif
    if (obj->datarefcount == 0)
      {
-        ERR("Data for object %zx (%s) is already not referenced.", (size_t)_eo_id_get(obj), obj->klass->desc->name);
+        ERR("Data for object %zx (%s) is already not referenced.", (size_t)_eo_obj_id_get(obj), obj->klass->desc->name);
      }
    else
      {
@@ -1498,7 +1498,7 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
    Eo_Xref_Node *xref = NULL;
    EINA_INLIST_FOREACH(obj->data_xrefs, xref)
      {
-        if (xref->ref_obj == _eo_id_get(ref_obj))
+        if (xref->ref_obj == _eo_obj_id_get(ref_obj))
           break;
      }
 
@@ -1509,7 +1509,7 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
      }
    else
      {
-        ERR("ref_obj (0x%zx) does not reference data (%p) of obj (0x%zx).", (size_t)_eo_id_get(ref_obj), data, (size_t)_eo_id_get(obj));
+        ERR("ref_obj (0x%zx) does not reference data (%p) of obj (0x%zx).", (size_t)_eo_obj_id_get(ref_obj), data, (size_t)_eo_obj_id_get(obj));
      }
 #else
    (void) ref_obj;
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 75c0941e1b..33442fe9be 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -390,7 +390,7 @@ _eo_base_id_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
              name_glob = _hasglob(name);
              EINA_INLIST_FOREACH(pd->children, child_eo)
                {
-                  child = _eo_id_get(child_eo);
+                  child = _eo_obj_id_get(child_eo);
                   id = eo_id_get(child);
                   klass_name = eo_class_name_get(eo_class_get(child));
                   if (_idmatch(klass, klass_glob, klass_name) &&
@@ -408,7 +408,7 @@ _eo_base_id_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
                   // we have a glob - fnmatch
                   EINA_INLIST_FOREACH(pd->children, child_eo)
                     {
-                       child = _eo_id_get(child_eo);
+                       child = _eo_obj_id_get(child_eo);
                        id = eo_id_get(child);
                        if ((id) && (_idmatch(search, EINA_TRUE, id)))
                          return child;
@@ -421,7 +421,7 @@ _eo_base_id_find(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *search)
                   // fast path for simple "name"
                   EINA_INLIST_FOREACH(pd->children, child_eo)
                     {
-                       child = _eo_id_get(child_eo);
+                       child = _eo_obj_id_get(child_eo);
                        id = eo_id_get(child);
                        if ((id) && (_idmatch(search, EINA_FALSE, id)))
                          return child;
@@ -570,7 +570,7 @@ _eo_children_iterator_next(Eo_Children_Iterator *it, void **data)
    if (data)
      {
         _Eo_Object *eo_obj = EINA_INLIST_CONTAINER_GET(it->current, _Eo_Object);
-        *data = _eo_id_get(eo_obj);
+        *data = _eo_obj_id_get(eo_obj);
      }
    it->current = it->current->next;
 
@@ -1420,7 +1420,7 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
    // extra things like removes other children too later on in the list
    while (pd->children)
      {
-        child = _eo_id_get(EINA_INLIST_CONTAINER_GET(pd->children, _Eo_Object));
+        child = _eo_obj_id_get(EINA_INLIST_CONTAINER_GET(pd->children, _Eo_Object));
         eo_parent_set(child, NULL);
      }
 
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 69c5dff26c..5fe5bd75a7 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -195,7 +195,7 @@ Eo_Class *_eo_class_id_get(const _Eo_Class *klass)
 }
 
 static inline
-Eo *_eo_id_get(const _Eo_Object *obj)
+Eo *_eo_obj_id_get(const _Eo_Object *obj)
 {
    return _eo_header_id_get((Eo_Header *) obj);
 }
@@ -214,11 +214,11 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
 
    const _Eo_Class *klass = obj->klass;
 
-   eo_event_callback_call(_eo_id_get(obj), EO_BASE_EVENT_DEL, NULL);
+   eo_event_callback_call(_eo_obj_id_get(obj), EO_BASE_EVENT_DEL, NULL);
 
    _eo_condtor_reset(obj);
 
-   eo_destructor(_eo_id_get(obj));
+   eo_destructor(_eo_obj_id_get(obj));
 
    if (!obj->condtor_done)
      {
@@ -232,7 +232,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
         Eo *emb_obj;
         EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
           {
-             eo_composite_detach(_eo_id_get(obj), emb_obj);
+             eo_composite_detach(_eo_obj_id_get(obj), emb_obj);
           }
      }
 
@@ -251,7 +251,7 @@ _eo_free(_Eo_Object *obj)
         ERR("Object %p data still referenced %d time(s).", obj, obj->datarefcount);
      }
 #endif
-   _eo_id_release((Eo_Id) _eo_id_get(obj));
+   _eo_id_release((Eo_Id) _eo_obj_id_get(obj));
 
    eina_spinlock_take(&klass->objects.trash_lock);
    if (klass->objects.trash_count <= 8)
@@ -287,20 +287,20 @@ _eo_unref(_Eo_Object *obj)
 
         if (obj->destructed)
           {
-             ERR("Object %p already destructed.", _eo_id_get(obj));
+             ERR("Object %p already destructed.", _eo_obj_id_get(obj));
              return;
           }
 
         if (obj->del_triggered)
           {
-             ERR("Object %p deletion already triggered. You wrongly call eo_unref() within a destructor.", _eo_id_get(obj));
+             ERR("Object %p deletion already triggered. You wrongly call eo_unref() within a destructor.", _eo_obj_id_get(obj));
              return;
           }
 
         if (obj->del_intercept)
           {
              (obj->refcount)++;
-             obj->del_intercept(_eo_id_get(obj));
+             obj->del_intercept(_eo_obj_id_get(obj));
              return;
           }
 
@@ -322,7 +322,7 @@ _eo_unref(_Eo_Object *obj)
           {
              Eina_Inlist *nitr = obj->data_xrefs->next;
              Eo_Xref_Node *xref = EINA_INLIST_CONTAINER_GET(obj->data_xrefs, Eo_Xref_Node);
-             ERR("Data of object 0x%lx is still referenced by object %p", (unsigned long) _eo_id_get(obj), xref->ref_obj);
+             ERR("Data of object 0x%lx is still referenced by object %p", (unsigned long) _eo_obj_id_get(obj), xref->ref_obj);
 
              free(xref);
              obj->data_xrefs = nitr;