From f4d0a797ecc3f965bf9ff6cca3aa2197c3ce56d2 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 3 Jun 2012 08:42:08 +0000 Subject: [PATCH] Eo: remove eo_del. Useless for us, was only added to be like evas, but we don't need it anymore. SVN revision: 71655 --- legacy/eobj/lib/Eo.h | 8 -------- legacy/eobj/lib/eo.c | 11 +---------- legacy/eobj/tests/eo_test_general.c | 10 ++++------ 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/legacy/eobj/lib/Eo.h b/legacy/eobj/lib/Eo.h index 5d01939d3d..837bb625a7 100644 --- a/legacy/eobj/lib/Eo.h +++ b/legacy/eobj/lib/Eo.h @@ -708,14 +708,6 @@ EAPI Eo *eo_xref_internal(Eo *obj, const Eo *ref_obj, const char *file, int line */ EAPI void eo_xunref(Eo *obj, const Eo *ref_obj); -/** - * @brief Delete the object passed (disregarding ref count). - * @param obj the object to work on. - * - * @see eo_unref() - */ -EAPI void eo_del(Eo *obj); - /** * @addtogroup Eo_Composite_Objects Composite Objects. * @{ diff --git a/legacy/eobj/lib/eo.c b/legacy/eobj/lib/eo.c index 9cb6c41619..02f617e3c9 100644 --- a/legacy/eobj/lib/eo.c +++ b/legacy/eobj/lib/eo.c @@ -1156,7 +1156,7 @@ eo_ref(const Eo *_obj) return _eo_ref(obj); } -static void +static inline void _eo_del_internal(Eo *obj) { if (obj->del) @@ -1241,15 +1241,6 @@ eo_ref_get(const Eo *obj) return obj->refcount; } -EAPI void -eo_del(Eo *obj) -{ - EO_MAGIC_RETURN(obj, EO_EINA_MAGIC); - - _eo_del_internal(obj); - _eo_unref(obj); -} - EAPI Eo * eo_parent_get(const Eo *obj) { diff --git a/legacy/eobj/tests/eo_test_general.c b/legacy/eobj/tests/eo_test_general.c index 08ab15c631..15404e89cc 100644 --- a/legacy/eobj/tests/eo_test_general.c +++ b/legacy/eobj/tests/eo_test_general.c @@ -168,8 +168,8 @@ START_TEST(eo_refs) /* Just check it doesn't seg atm. */ obj = eo_add(SIMPLE_CLASS, NULL); eo_ref(obj); - eo_del(obj); - eo_del(obj); + eo_unref(obj); + eo_unref(obj); eo_shutdown(); } @@ -194,8 +194,8 @@ START_TEST(eo_weak_reference) eo_ref(obj); fail_if(!wref); - eo_del(obj); - fail_if(wref); + eo_unref(obj); + fail_if(!wref); eo_unref(obj); fail_if(wref); @@ -429,8 +429,6 @@ START_TEST(eo_magic_checks) eo_do((Eo *) buf, eo_wref_add(&wref)); fail_if(wref); - eo_del((Eo *) buf); - fail_if(eo_parent_get((Eo *) buf)); eo_error_set((Eo *) buf);