Ector and eo suite: Semi automatically migrate to the new eo_add.

There were some issues with the migration that required manual
intervention.

4 files changed, 88 insertions, 64 deletions

diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index 3cc47e3460..93336db508 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -61,12 +61,13 @@ _ector_cairo_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
                                                                 Ector_Cairo_Surface_Data *pd EINA_UNUSED,
                                                                 const Eo_Class *type)
 {
+   Eo *ret = NULL;
    if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
-     return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
-     return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
-     return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(ret, obj));
 
    ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
    return NULL;
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 2ad665306b..fe3658c468 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -44,12 +44,13 @@ _ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
                                                              Ector_GL_Surface_Data *pd EINA_UNUSED,
                                                              const Eo_Class *type)
 {
+   Eo *ret = NULL;
    if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
-     return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
-     return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
-     return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(ret, obj));
 
    ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
    return NULL;
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index f67b1947d2..551211fe8c 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -15,14 +15,15 @@ _ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
                                                                    Ector_Software_Surface_Data *pd EINA_UNUSED,
                                                                    const Eo_Class *type)
 {
+   Eo *ret = NULL;
    if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN)
-     return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
+     return eo_add(&ret, ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(ret, obj));
    ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
    return NULL;
 }
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 2960902715..bebf5c7e67 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -17,10 +17,11 @@
 START_TEST(eo_simple)
 {
    eo_init();
-   Eo *obj = eo_add(EO_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, EO_CLASS, NULL);
    fail_if(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    fail_if(!obj);
    eo_constructor(obj);
    eo_destructor(obj);
@@ -33,7 +34,8 @@ END_TEST
 START_TEST(eo_stack)
 {
    eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    fail_if(!obj);
 
    simple_recursive(obj, 123);
@@ -100,7 +102,8 @@ START_TEST(eo_signals)
           { EO_BASE_EVENT_DEL, _eo_signals_eo_del_cb },
           { NULL, NULL }
    };
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    Eina_Bool r;
 
    eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks);
@@ -129,7 +132,7 @@ START_TEST(eo_signals)
 
    eo_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    /* Legacy support signals. */
      {
         const Eo_Event_Description *a_desc = eo_base_legacy_only_event_description_get("a,changed");
@@ -190,7 +193,8 @@ START_TEST(eo_data_fetch)
    const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
 #ifdef EO_DEBUG
    fail_if(eo_data_scope_get(obj, SIMPLE_CLASS));
@@ -201,7 +205,7 @@ START_TEST(eo_data_fetch)
    klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(eo_data_scope_get(obj, klass));
    fail_if(!eo_data_scope_get(obj, EO_BASE_CLASS));
@@ -268,7 +272,8 @@ START_TEST(eo_isa_tests)
         fail_if(!klass);
      }
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(eo_isa(obj, SIMPLE_CLASS));
    fail_if(!eo_isa(obj, iface));
@@ -277,7 +282,7 @@ START_TEST(eo_isa_tests)
    fail_if(!eo_isa(obj, EO_CLASS));
    eo_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    fail_if(!obj);
    fail_if(eo_isa(obj, klass));
    fail_if(eo_isa(obj, iface));
@@ -295,9 +300,11 @@ START_TEST(eo_composite_tests)
 {
    eo_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    fail_if(!obj);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj2 = NULL;
+   eo_add(&obj2, SIMPLE_CLASS, NULL);
    fail_if(!obj2);
 
    eo_composite_attach(obj, obj2);
@@ -356,11 +363,12 @@ START_TEST(eo_man_free)
    fail_if(!klass);
    cur_klass = klass;
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    eo_unref(obj);
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(eo_manual_free(obj));
    eo_unref(obj);
@@ -370,7 +378,7 @@ START_TEST(eo_man_free)
    cur_klass = klass;
    fail_if(!klass);
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(eo_manual_free(obj));
    fail_if(eo_destructed_is(obj));
@@ -378,7 +386,7 @@ START_TEST(eo_man_free)
    fail_if(!eo_destructed_is(obj));
    fail_if(!eo_manual_free(obj));
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    eo_unref(obj);
    fail_if(!eo_destructed_is(obj));
@@ -389,12 +397,12 @@ START_TEST(eo_man_free)
    cur_klass = klass;
    fail_if(!klass);
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(eo_manual_free(obj));
    eo_unref(obj);
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    eo_manual_free_set(obj, EINA_TRUE);
    eo_unref(obj);
@@ -403,7 +411,7 @@ START_TEST(eo_man_free)
    eo_unref(obj);
    fail_if(!eo_manual_free(obj));
 
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    eo_manual_free_set(obj, EINA_TRUE);
    eo_unref(obj);
@@ -421,9 +429,12 @@ END_TEST
 START_TEST(eo_refs)
 {
    eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj3 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, NULL);
+   Eo *obj2 = NULL;
+   eo_add(&obj2, SIMPLE_CLASS, NULL);
+   Eo *obj3 = NULL;
+   eo_add(&obj3, SIMPLE_CLASS, NULL);
 
    eo_xref(obj, obj2);
    fail_if(eo_ref_get(obj) != 2);
@@ -458,8 +469,8 @@ START_TEST(eo_refs)
    eo_unref(obj3);
 
    /* Check hierarchy */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj));
+   eo_add(&obj, SIMPLE_CLASS, NULL);
+   eo_ref(eo_add(&obj2, SIMPLE_CLASS, obj));
 
    Eo *wref = NULL;
    eo_wref_add(obj2, &wref);
@@ -474,18 +485,18 @@ START_TEST(eo_refs)
    fail_if(wref);
 
    /* eo_add_ref and normal eo_add */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_add(SIMPLE_CLASS, obj);
-   obj3 = eo_add_ref(SIMPLE_CLASS, obj);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
+   eo_add(&obj2, SIMPLE_CLASS, obj);
+   eo_add_ref(&obj3, SIMPLE_CLASS, obj);
 
    ck_assert_int_eq(eo_ref_get(obj), 1);
    ck_assert_int_eq(eo_ref_get(obj2), 1);
    ck_assert_int_eq(eo_ref_get(obj3), 2);
 
    /* Setting and removing parents. */
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj));
-   obj3 = eo_ref(eo_add(SIMPLE_CLASS, NULL));
+   eo_add(&obj, SIMPLE_CLASS, NULL);
+   eo_ref(eo_add(&obj2, SIMPLE_CLASS, obj));
+   eo_ref(eo_add(&obj3, SIMPLE_CLASS, NULL));
 
    eo_parent_set(obj2, obj3);
    eo_parent_set(obj3, obj);
@@ -507,13 +518,13 @@ START_TEST(eo_refs)
    eo_del(obj3);
 
    /* Just check it doesn't seg atm. */
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    eo_ref(obj);
    eo_unref(obj);
    eo_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
-   obj2 = eo_add(SIMPLE_CLASS, obj);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
+   eo_add(&obj2, SIMPLE_CLASS, obj);
    eo_unref(obj2);
    eo_ref(obj2);
    eo_del(obj2);
@@ -527,8 +538,10 @@ START_TEST(eo_weak_reference)
 {
    eo_init();
 
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, NULL);
+   Eo *obj2 = NULL;
+   eo_add(&obj2, SIMPLE_CLASS, NULL);
    Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL;
    eo_wref_add(obj, &wref);
    fail_if(!wref);
@@ -536,7 +549,7 @@ START_TEST(eo_weak_reference)
    eo_unref(obj);
    fail_if(wref);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    eo_wref_add(obj, &wref);
 
    eo_ref(obj);
@@ -548,7 +561,7 @@ START_TEST(eo_weak_reference)
    eo_unref(obj);
    fail_if(wref);
 
-   obj = eo_add(SIMPLE_CLASS, NULL);
+   eo_add(&obj, SIMPLE_CLASS, NULL);
 
    eo_wref_add(obj, &wref);
    eo_wref_del(obj, &wref);
@@ -597,7 +610,8 @@ END_TEST
 START_TEST(eo_generic_data)
 {
    eo_init();
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, NULL);
    void *data = NULL;
 
    eo_key_data_set(obj, "test1", (void *) 1);
@@ -641,7 +655,8 @@ START_TEST(eo_magic_checks)
 
    memset(_buf, 1, sizeof(_buf));
 
-   Eo *obj = eo_add(SIMPLE_CLASS, (Eo *) buf);
+   Eo *obj = NULL;
+   eo_add(&obj, SIMPLE_CLASS, (Eo *) buf);
    fail_if(obj);
 
    while (1)
@@ -651,10 +666,10 @@ START_TEST(eo_magic_checks)
         Eo *wref = NULL;
         Eo *obj2 = NULL;
 
-        obj = eo_add((Eo_Class *) buf, NULL);
+        eo_add(&obj, (Eo_Class *) buf, NULL);
         fail_if(obj);
 
-        obj = eo_add(SIMPLE_CLASS, NULL);
+        eo_add(&obj, SIMPLE_CLASS, NULL);
         fail_if(!obj);
 
         simple_a_set((Eo *) buf, ++i);
@@ -769,7 +784,8 @@ START_TEST(eo_multiple_do)
    const Eo_Class *klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
    fail_if(!klass);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
 
    Eina_Bool ca, cb, cc;
@@ -798,24 +814,24 @@ START_TEST(eo_add_do_and_custom)
    Eo *obj = NULL;
    eo_init();
 
-   obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid));
+   eo_add(&obj, SIMPLE_CLASS, NULL, eo_constructor(obj));
    fail_if(!obj);
    eo_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7));
+   eo_add(&obj, SIMPLE_CLASS, NULL, simple_a_set(obj, 7));
    fail_if(!obj);
    pd = eo_data_scope_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 7);
    eo_unref(obj);
 
-   obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid), simple_a_set(eoid, 7));
+   eo_add(&obj, SIMPLE_CLASS, NULL, eo_constructor(obj), simple_a_set(obj, 7));
    fail_if(!obj);
    pd = eo_data_scope_get(obj, SIMPLE_CLASS);
    fail_if(pd->a != 7);
    eo_unref(obj);
 
    Eina_Bool finalized;
-   obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eoid));
+   eo_add(&obj, SIMPLE_CLASS, NULL, finalized = eo_finalized_get(obj));
    fail_if(finalized);
 
    finalized = eo_finalized_get(obj);
@@ -846,7 +862,8 @@ START_TEST(eo_pointers_indirection)
    fail_if(!klass);
 
    /* Check simple id validity */
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(!eo_isa(obj, klass));
    obj = (Eo *)((char *)(obj) + 1);
@@ -857,17 +874,19 @@ START_TEST(eo_pointers_indirection)
    fail_if(eo_isa(obj, klass));
 
    /* Check id invalidity after deletion */
-   Eo *obj1 = eo_add(klass, NULL);
+   Eo *obj1 = NULL;
+   eo_add(&obj1, klass, NULL);
    fail_if(!obj1);
    eo_unref(obj1);
-   Eo *obj2 = eo_add(klass, NULL);
+   Eo *obj2 = NULL;
+   eo_add(&obj2, klass, NULL);
    fail_if(!obj2);
    fail_if(!eo_isa(obj2, klass));
    fail_if(eo_isa(obj1, klass));
    eo_unref(obj2);
 
    /* Check id sanity checks for "close enough" ids. */
-   obj1 = eo_add(klass, NULL);
+   eo_add(&obj1, klass, NULL);
    fail_if(!obj1);
    obj2 = (Eo *) (((Eo_Id) obj1) & ~MASK_OBJ_TAG);
    fail_if(eo_class_get(obj2));
@@ -880,7 +899,7 @@ START_TEST(eo_pointers_indirection)
    /* Creation of the objects */
    for ( obj_id = 0; obj_id < NB_OBJS; obj_id++)
      {
-        objs[obj_id] = eo_add(klass, NULL);
+        eo_add(&objs[obj_id], klass, NULL);
         if(!objs[obj_id])
           fail_if(!objs[obj_id]);
         if(!eo_isa(objs[obj_id], klass))
@@ -896,7 +915,7 @@ START_TEST(eo_pointers_indirection)
    /* Creation of the deleted objects */
    for ( obj_id = 0; obj_id < NB_OBJS; obj_id+=2000)
      {
-        objs[obj_id] = eo_add(klass, NULL);
+        eo_add(&objs[obj_id], klass, NULL);
         if(!objs[obj_id])
           fail_if(!objs[obj_id]);
         if(!eo_isa(objs[obj_id], klass))
@@ -942,7 +961,8 @@ START_TEST(eo_add_failures)
 
    const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
 
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
 
    fail_if(obj);
 
@@ -981,7 +1001,8 @@ START_TEST(eo_del_intercept)
 
    /* Check unref interception */
    intercepted = EINA_FALSE;
-   Eo *obj = eo_add(klass, NULL);
+   Eo *obj = NULL;
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(!eo_isa(obj, klass));
    eo_del_intercept_set(obj, _del_intercept);
@@ -991,7 +1012,7 @@ START_TEST(eo_del_intercept)
 
    /* Check del interception */
    intercepted = EINA_FALSE;
-   obj = eo_add(klass, NULL);
+   eo_add(&obj, klass, NULL);
    fail_if(!obj);
    fail_if(!eo_isa(obj, klass));
    eo_del_intercept_set(obj, _del_intercept);