vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eo: Fixed the type _eo_id_get accepts.

This commit is contained in:
Tom Hacohen 2013-09-27 12:27:00 +01:00
parent e3cb9195c2
commit ba5af54f6d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/eo/eo.c
View File

@ -297,7 +297,7 @@ _eo_op_internal(const char *file, int line, Eo_Base *eo_ptr, const _Eo_Class *cu
if (op_type == EO_OP_TYPE_REGULAR)
{
func_data = _eo_data_scope_get((_Eo_Object *) eo_ptr, func->src);
calling_obj = _eo_id_get((Eo *) eo_ptr);
calling_obj = _eo_id_get((_Eo_Object *) eo_ptr);
}
else
{
@ -1114,7 +1114,7 @@ eo_add_internal(const char *file, int line, const Eo *klass_id, Eo *parent_id, .
_eo_unref(obj);
return _eo_id_get((Eo *) obj);
return _eo_id_get(obj);
fail:
/* Unref twice, once for the ref above, and once for the basic object ref. */
@ -1297,7 +1297,7 @@ _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj)
#endif
if (obj->datarefcount == 0)
{
ERR("Data for object %lx (%s) is already not referenced.", (unsigned long) _eo_id_get((Eo *) obj), obj->klass->desc->name);
ERR("Data for object %lx (%s) is already not referenced.", (unsigned long) _eo_id_get(obj), obj->klass->desc->name);
}
else
{

12
src/lib/eo/eo_private.h
View File

@ -190,7 +190,7 @@ Eo *_eo_class_id_get(const _Eo_Class *klass)
}
static inline
Eo *_eo_id_get(const Eo *obj)
Eo *_eo_id_get(const _Eo_Object *obj)
{
return _eo_header_id_get((Eo_Base *) obj);
}
@ -208,13 +208,13 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
/* We need that for the event callbacks that may ref/unref. */
obj->refcount++;
eo_do(_eo_id_get((Eo *) obj), eo_event_callback_call(EO_EV_DEL, NULL, NULL));
eo_do(_eo_id_get(obj), eo_event_callback_call(EO_EV_DEL, NULL, NULL));
const _Eo_Class *klass = obj->klass;
_eo_condtor_reset(obj);
do_err = eo_do(_eo_id_get((Eo *) obj), eo_destructor());
do_err = eo_do(_eo_id_get(obj), eo_destructor());
if (EINA_UNLIKELY(!do_err))
{
ERR("in %s:%d: Object of class '%s' - One of the object destructors have failed.",
@ -233,7 +233,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(emb_obj, _eo_id_get((Eo *) obj));
eo_composite_detach(emb_obj, _eo_id_get(obj));
}
}
@ -252,7 +252,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((Eo *) obj));
_eo_id_release((Eo_Id) _eo_id_get(obj));
eina_lock_take(&klass->objects.trash_lock);
if (klass->objects.trash_count <= 8)
@ -301,7 +301,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((Eo *) obj), xref->ref_obj);
ERR("Data of object 0x%lx is still referenced by object %p", (unsigned long) _eo_id_get(obj), xref->ref_obj);
free(xref);
obj->data_xrefs = nitr;