summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-09-27 12:27:00 +0100
committerTom Hacohen <tom@stosb.com>2013-09-27 14:01:47 +0100
commitba5af54f6d0129d23931166f52317847fda3e7e4 (patch)
tree21ed0ca5c17f04258123d6bb7920af82e900961a /src
parente3cb9195c2a6d0d0b77f09cadc08f6384834aa55 (diff)
Eo: Fixed the type _eo_id_get accepts.
Diffstat (limited to 'src')
-rw-r--r--src/lib/eo/eo.c6
-rw-r--r--src/lib/eo/eo_private.h12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 83d03f0c8f..1ce4a56f9d 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -297,7 +297,7 @@ _eo_op_internal(const char *file, int line, Eo_Base *eo_ptr, const _Eo_Class *cu
297 if (op_type == EO_OP_TYPE_REGULAR) 297 if (op_type == EO_OP_TYPE_REGULAR)
298 { 298 {
299 func_data = _eo_data_scope_get((_Eo_Object *) eo_ptr, func->src); 299 func_data = _eo_data_scope_get((_Eo_Object *) eo_ptr, func->src);
300 calling_obj = _eo_id_get((Eo *) eo_ptr); 300 calling_obj = _eo_id_get((_Eo_Object *) eo_ptr);
301 } 301 }
302 else 302 else
303 { 303 {
@@ -1114,7 +1114,7 @@ eo_add_internal(const char *file, int line, const Eo *klass_id, Eo *parent_id, .
1114 1114
1115 _eo_unref(obj); 1115 _eo_unref(obj);
1116 1116
1117 return _eo_id_get((Eo *) obj); 1117 return _eo_id_get(obj);
1118 1118
1119fail: 1119fail:
1120 /* Unref twice, once for the ref above, and once for the basic object ref. */ 1120 /* 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)
1297#endif 1297#endif
1298 if (obj->datarefcount == 0) 1298 if (obj->datarefcount == 0)
1299 { 1299 {
1300 ERR("Data for object %lx (%s) is already not referenced.", (unsigned long) _eo_id_get((Eo *) obj), obj->klass->desc->name); 1300 ERR("Data for object %lx (%s) is already not referenced.", (unsigned long) _eo_id_get(obj), obj->klass->desc->name);
1301 } 1301 }
1302 else 1302 else
1303 { 1303 {
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 382e9663b8..aec22f1dab 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -190,7 +190,7 @@ Eo *_eo_class_id_get(const _Eo_Class *klass)
190} 190}
191 191
192static inline 192static inline
193Eo *_eo_id_get(const Eo *obj) 193Eo *_eo_id_get(const _Eo_Object *obj)
194{ 194{
195 return _eo_header_id_get((Eo_Base *) obj); 195 return _eo_header_id_get((Eo_Base *) obj);
196} 196}
@@ -208,13 +208,13 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
208 /* We need that for the event callbacks that may ref/unref. */ 208 /* We need that for the event callbacks that may ref/unref. */
209 obj->refcount++; 209 obj->refcount++;
210 210
211 eo_do(_eo_id_get((Eo *) obj), eo_event_callback_call(EO_EV_DEL, NULL, NULL)); 211 eo_do(_eo_id_get(obj), eo_event_callback_call(EO_EV_DEL, NULL, NULL));
212 212
213 const _Eo_Class *klass = obj->klass; 213 const _Eo_Class *klass = obj->klass;
214 214
215 _eo_condtor_reset(obj); 215 _eo_condtor_reset(obj);
216 216
217 do_err = eo_do(_eo_id_get((Eo *) obj), eo_destructor()); 217 do_err = eo_do(_eo_id_get(obj), eo_destructor());
218 if (EINA_UNLIKELY(!do_err)) 218 if (EINA_UNLIKELY(!do_err))
219 { 219 {
220 ERR("in %s:%d: Object of class '%s' - One of the object destructors have failed.", 220 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)
233 Eo *emb_obj; 233 Eo *emb_obj;
234 EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj) 234 EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
235 { 235 {
236 eo_composite_detach(emb_obj, _eo_id_get((Eo *) obj)); 236 eo_composite_detach(emb_obj, _eo_id_get(obj));
237 } 237 }
238 } 238 }
239 239
@@ -252,7 +252,7 @@ _eo_free(_Eo_Object *obj)
252 ERR("Object %p data still referenced %d time(s).", obj, obj->datarefcount); 252 ERR("Object %p data still referenced %d time(s).", obj, obj->datarefcount);
253 } 253 }
254#endif 254#endif
255 _eo_id_release((Eo_Id) _eo_id_get((Eo *) obj)); 255 _eo_id_release((Eo_Id) _eo_id_get(obj));
256 256
257 eina_lock_take(&klass->objects.trash_lock); 257 eina_lock_take(&klass->objects.trash_lock);
258 if (klass->objects.trash_count <= 8) 258 if (klass->objects.trash_count <= 8)
@@ -301,7 +301,7 @@ _eo_unref(_Eo_Object *obj)
301 { 301 {
302 Eina_Inlist *nitr = obj->data_xrefs->next; 302 Eina_Inlist *nitr = obj->data_xrefs->next;
303 Eo_Xref_Node *xref = EINA_INLIST_CONTAINER_GET(obj->data_xrefs, Eo_Xref_Node); 303 Eo_Xref_Node *xref = EINA_INLIST_CONTAINER_GET(obj->data_xrefs, Eo_Xref_Node);
304 ERR("Data of object 0x%lx is still referenced by object %p", (unsigned long) _eo_id_get((Eo *) obj), xref->ref_obj); 304 ERR("Data of object 0x%lx is still referenced by object %p", (unsigned long) _eo_id_get(obj), xref->ref_obj);
305 305
306 free(xref); 306 free(xref);
307 obj->data_xrefs = nitr; 307 obj->data_xrefs = nitr;