Adjust eo_do calls to work with the eo2 api.

21 files changed, 80 insertions, 79 deletions

diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index cbd87eae1a..2de040edd0 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -431,7 +431,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
 {
    int r = 0;
 
-   eo_do(timer, eo_event_freeze_get(&r));
+   eo_do(timer, r = eo_event_freeze_get());
    return !!r;
 }
 
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index db301f1078..6120ff0adb 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -193,7 +193,7 @@ _edje_edit_edje_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *
     *    groups).
     */
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, edje_obj_file_set(file, group, &int_ret));
+   eo_do_super(obj, MY_CLASS, int_ret = edje_obj_file_set(file, group));
    if (!int_ret)
      return ret;
 
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 1a2126c5ad..46bb3fdfe0 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -78,7 +78,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
 {
    if (!obj) return NULL;
    void *ret = NULL;
-   eo_do(obj, edje_obj_signal_callback_del(emission, source, (Edje_Signal_Cb)func, NULL, &ret));
+   eo_do(obj, ret = edje_obj_signal_callback_del(emission, source, (Edje_Signal_Cb)func, NULL));
    return ret;
 }
 
@@ -107,7 +107,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
 {
    if (!obj) return NULL;
    void *ret = NULL;
-   eo_do(obj, edje_obj_signal_callback_del(emission, source, func, data, &ret));
+   eo_do(obj, ret = edje_obj_signal_callback_del(emission, source, func, data));
    return ret;
 }
 
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 536356edb7..a4de77fc0c 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -52,8 +52,8 @@ _edje_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root)
    EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
    EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
 
-   Edje_Load_Error error;
-   eo_do(eo_obj, edje_obj_load_error_get(&error));
+   Edje_Load_Error error = EDJE_LOAD_ERROR_NONE;
+   eo_do(eo_obj, error = edje_obj_load_error_get());
    if (error != EDJE_LOAD_ERROR_NONE)
      {
         EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
@@ -363,4 +363,4 @@ _edje_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *g
    return ret;
 }
 
-#include "edje.eo.c"
\ No newline at end of file
+#include "edje.eo.c"
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 654c5d033a..5aa362f3a1 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -238,7 +238,7 @@ evas_event_callback_cleanup(Evas *eo_e)
 void
 evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
 {
-   eo_do(eo_e, eo_event_callback_call(_legacy_evas_callback_table[type], event_info, NULL));
+   eo_do(eo_e, eo_event_callback_call(_legacy_evas_callback_table[type], event_info));
 }
 
 void
@@ -299,7 +299,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
               break;
           }
 
-        eo_do(eo_obj, eo_event_callback_call(_legacy_evas_callback_table[type], event_info, NULL));
+        eo_do(eo_obj, eo_event_callback_call(_legacy_evas_callback_table[type], event_info));
 
         if (type == EVAS_CALLBACK_MOUSE_DOWN)
           {
diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index 01355b3ce1..14a384886a 100644
--- a/src/lib/evas/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
@@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key)
    return NULL;
    MAGIC_CHECK_END();
    void *data = NULL;
-   eo_do((Evas_Object *)obj, eo_base_data_get(key, &data));
+   eo_do((Evas_Object *)obj, data = eo_base_data_get(key));
    return data;
 }
 
@@ -29,6 +29,6 @@ evas_object_data_del(Evas_Object *obj, const char *key)
    return NULL;
    MAGIC_CHECK_END();
    void *data = NULL;
-   eo_do(obj, eo_base_data_get(key, &data), eo_base_data_del(key));
+   eo_do(obj, data = eo_base_data_get(key), eo_base_data_del(key));
    return data;
 }
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 3308da2bc1..d53451b94e 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -958,8 +958,9 @@ _canvas_event_thaw(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED)
 {
    int fcount = -1;
    eo_do_super(eo_e, EVAS_CLASS,
-         eo_event_thaw(),
-         eo_event_freeze_get(&fcount));
+         eo_event_thaw());
+   eo_do_super(eo_e, EVAS_CLASS,
+         fcount = eo_event_freeze_get());
    if (0 == fcount)
      {
         Evas_Public_Data *e = _pd;
@@ -988,7 +989,7 @@ evas_event_freeze_get(const Evas *eo_e)
    return 0;
    MAGIC_CHECK_END();
    int ret = 0;
-   eo_do((Eo *)eo_e, eo_event_freeze_get(&ret));
+   eo_do((Eo *)eo_e, ret = eo_event_freeze_get());
    return ret;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 761c736296..903578f232 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -131,7 +131,7 @@ _on_child_del(void *data, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, v
    Evas_Object *box = data;
 
    Evas_Object *ret = NULL;
-   eo_do(box, evas_obj_box_internal_remove(o, &ret));
+   eo_do(box, ret = evas_obj_box_internal_remove(o));
    if (!ret)
      ERR("child removal failed");
    evas_object_smart_changed(box);
@@ -163,7 +163,7 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
 {
    Evas_Object_Box_Option *opt = NULL;
 
-   eo_do(o, evas_obj_box_internal_option_new(child, &opt));
+   eo_do(o, opt = evas_obj_box_internal_option_new(child));
    if (!opt)
      {
         ERR("option_new failed");
@@ -464,7 +464,7 @@ _evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNU
 {
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj,
-         evas_obj_smart_callbacks_descriptions_set(_signals, NULL),
+         evas_obj_smart_callbacks_descriptions_set(_signals),
          evas_obj_type_set(MY_CLASS_NAME_LEGACY));
 }
 
@@ -1686,7 +1686,7 @@ _evas_box_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
    if (!child)
      return NULL;
 
-   eo_do(o, evas_obj_box_internal_append(child, &opt));
+   eo_do(o, opt = evas_obj_box_internal_append(child));
 
    if (opt)
      {
@@ -1705,7 +1705,7 @@ _evas_box_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
    if (!child)
      return NULL;
 
-   eo_do(o, evas_obj_box_internal_prepend(child, &opt));
+   eo_do(o, opt = evas_obj_box_internal_prepend(child));
 
    if (opt)
      {
@@ -1723,7 +1723,7 @@ _evas_box_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, c
    if (!child)
      return NULL;
 
-   eo_do(o, evas_obj_box_internal_insert_before(child, reference, &opt));
+   eo_do(o, opt = evas_obj_box_internal_insert_before(child, reference));
 
    if (opt)
      {
@@ -1742,7 +1742,7 @@ _evas_box_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, co
    if (!child)
      return NULL;
 
-   eo_do(o, evas_obj_box_internal_insert_after(child, reference, &opt));
+   eo_do(o, opt = evas_obj_box_internal_insert_after(child, reference));
 
    if (opt)
      {
@@ -1761,7 +1761,7 @@ _evas_box_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, unsig
    if (!child)
      return NULL;
 
-   eo_do(o, evas_obj_box_internal_insert_at(child, pos, &opt));
+   eo_do(o, opt = evas_obj_box_internal_insert_at(child, pos));
 
    if (opt)
      {
@@ -1778,7 +1778,7 @@ _evas_box_remove(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Object *chil
 {
    Evas_Object *obj = NULL;
 
-   eo_do(o, evas_obj_box_internal_remove(child, &obj));
+   eo_do(o, obj = evas_obj_box_internal_remove(child));
 
    if (obj)
      {
@@ -1796,7 +1796,7 @@ _evas_box_remove_at(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, unsigned int p
 {
    Evas_Object *obj = NULL;
 
-   eo_do(o, evas_obj_box_internal_remove_at(pos, &obj));
+   eo_do(o, obj = evas_obj_box_internal_remove_at(pos));
 
    if (obj)
      {
@@ -1819,7 +1819,7 @@ _evas_box_remove_all(Eo *o, Evas_Object_Box_Data *priv, Eina_Bool clear)
         Evas_Object_Box_Option *opt = priv->children->data;
         Evas_Object *obj = NULL;
 
-        eo_do(o, evas_obj_box_internal_remove(opt->obj, &obj));
+        eo_do(o, obj = evas_obj_box_internal_remove(opt->obj));
         if (obj)
           {
              _evas_object_box_child_callbacks_unregister(obj, o);
@@ -1921,7 +1921,7 @@ EAPI Eina_Bool
 evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
    Eina_Bool ret = EINA_FALSE;
-   eo_do(o, evas_obj_box_option_property_vset(opt, property, (va_list *) &args, &ret));
+   eo_do(o, ret = evas_obj_box_option_property_vset(opt, property, (va_list *) &args));
    return ret;
 }
 
@@ -1948,7 +1948,7 @@ EAPI Eina_Bool
 evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *)o, evas_obj_box_option_property_vget(opt, property, (va_list *) &args, &ret));
+   eo_do((Eo *)o, ret = evas_obj_box_option_property_vget(opt, property, (va_list *) &args));
    return ret;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 287ad1a199..146265021e 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -324,12 +324,12 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    Evas *eo_e;
-   Eo *parent;
+   Eo *parent = NULL;
    Evas_Colorspace cspace;
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
-   eo_do(eo_obj, eo_parent_get(&parent));
+   eo_do(eo_obj, parent = eo_parent_get());
    eo_e = evas_object_evas_get(parent);
 
    evas_object_image_init(eo_obj);
@@ -650,7 +650,7 @@ EAPI Eina_Bool
 evas_object_image_source_unset(Evas_Object *eo_obj)
 {
    Eina_Bool result = EINA_FALSE;
-   eo_do(eo_obj, evas_obj_image_source_set(NULL, &result));
+   eo_do(eo_obj, result = evas_obj_image_source_set(NULL));
    return result;
 }
 
@@ -719,8 +719,8 @@ _evas_image_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *ro
 
    if (evas_object_image_load_error_get(eo_obj) != EVAS_LOAD_ERROR_NONE)
      {
-        Evas_Load_Error error;
-        eo_do(eo_obj, evas_obj_image_load_error_get(&error));
+        Evas_Load_Error error = EVAS_LOAD_ERROR_GENERIC;
+        eo_do(eo_obj, error = evas_obj_image_load_error_get());
         EO_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING,
                                 evas_load_error_str(error));
      }
@@ -2357,8 +2357,8 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas
 
         ctx = e->engine.func->context_new(e->engine.data.output);
 
-        Eina_Bool source_clip;
-        eo_do(eo_proxy, evas_obj_image_source_clip_get(&source_clip));
+        Eina_Bool source_clip = EINA_FALSE;
+        eo_do(eo_proxy, source_clip = evas_obj_image_source_clip_get());
 
         Evas_Proxy_Render_Data proxy_render_data = {
              .eo_proxy = eo_proxy,
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 9157314728..5968d8a001 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -221,13 +221,13 @@ _evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSE
 {
    Evas_Object_Protected_Data *obj;
    Evas_Line_Data *o;
-   Eo *parent;
+   Eo *parent = NULL;
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
    obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    evas_object_line_init(eo_obj);
-   eo_do(eo_obj, eo_parent_get(&parent));
+   eo_do(eo_obj, parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
 
    o = class_data;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 18ab16c253..61b54bb600 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1418,7 +1418,7 @@ evas_object_evas_get(const Evas_Object *eo_obj)
    return NULL;
    MAGIC_CHECK_END();
    Evas *eo_evas = NULL;
-   eo_do((Eo *)eo_obj, evas_common_evas_get(&eo_evas));
+   eo_do((Eo *)eo_obj, eo_evas = evas_common_evas_get());
    return eo_evas;
 }
 
@@ -1448,24 +1448,24 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI
    Eina_Bool clipees_has;
 
    eo_do(eo_obj,
-         evas_obj_visibility_get(&visible),
-         evas_obj_layer_get(&layer),
-         evas_obj_name_get(&name),
+         visible = evas_obj_visibility_get(),
+         layer = evas_obj_layer_get(),
+         name = evas_obj_name_get(),
          evas_obj_position_get(&x, &y),
          evas_obj_size_get(&w, &h),
-         evas_obj_scale_get(&scale),
+         scale = evas_obj_scale_get(),
          evas_obj_size_hint_min_get(&minw, &minh),
          evas_obj_size_hint_max_get(&maxw, &maxh),
          evas_obj_size_hint_request_get(&requestw, &requesth),
          evas_obj_size_hint_align_get(&dblx, &dbly),
          evas_obj_size_hint_weight_get(&dblw, &dblh),
          evas_obj_color_get(&r, &g, &b, &a),
-         evas_obj_focus_get(&focus),
-         evas_obj_pointer_mode_get(&m),
-         evas_obj_pass_events_get(&pass_event),
-         evas_obj_repeat_events_get(&repeat_event),
-         evas_obj_propagate_events_get(&propagate_event),
-         evas_obj_clipees_has(&clipees_has));
+         focus = evas_obj_focus_get(),
+         m = evas_obj_pointer_mode_get(),
+         pass_event = evas_obj_pass_events_get(),
+         repeat_event = evas_obj_repeat_events_get(),
+         propagate_event = evas_obj_propagate_events_get(),
+         clipees_has = evas_obj_clipees_has());
 
    EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
 
@@ -1540,7 +1540,7 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI
    EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has);
 
    Evas_Object *clipper = NULL;
-   eo_do(eo_obj, evas_obj_clip_get(&clipper));
+   eo_do(eo_obj, clipper = evas_obj_clip_get());
    EO_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper);
 
    const Evas_Map *map = evas_object_map_get(eo_obj);
@@ -1616,8 +1616,8 @@ evas_object_top_at_pointer_get(const Evas *eo_e)
    Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
    Evas_Object *ret = NULL;
    if (!e) return NULL;
-   eo_do((Eo *)eo_e, evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE,
-                                    EINA_TRUE, &ret));
+   eo_do((Eo *)eo_e, ret = evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE,
+                                    EINA_TRUE));
    return ret;
 }
 
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 2c6d0bdc8b..d38c9c8825 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -108,13 +108,13 @@ EOLIAN static void
 _evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
-   Eo *parent;
+   Eo *parent = NULL;
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
    obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    evas_object_polygon_init(eo_obj);
-   eo_do(eo_obj, eo_parent_get(&parent));
+   eo_do(eo_obj, parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
 }
 
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 8714fc35f0..dd84f45c74 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -95,14 +95,14 @@ evas_object_rectangle_add(Evas *e)
 EOLIAN static void
 _evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED)
 {
-   Eo *parent;
+   Eo *parent = NULL;
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    evas_object_rectangle_init(eo_obj);
 
-   eo_do(eo_obj, eo_parent_get(&parent));
+   eo_do(eo_obj, parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
 }
 
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 2a2aeb2869..d6c3ba2571 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -547,7 +547,7 @@ _evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNU
 {
    Evas_Object_Protected_Data *obj;
    Evas_Smart_Data *smart;
-   Eo *parent;
+   Eo *parent = NULL;
 
    smart = class_data;
    smart->object = eo_obj;
@@ -556,7 +556,7 @@ _evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNU
    evas_object_smart_init(eo_obj);
 
    obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
-   eo_do(eo_obj, eo_parent_get(&parent));
+   eo_do(eo_obj, parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
    eo_do(eo_obj,
          evas_obj_type_set(MY_CLASS_NAME_LEGACY),
@@ -797,7 +797,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
    if (!event) return;
    const _Evas_Event_Description *event_desc = eina_hash_find(signals_hash_table, event);
    if (event_desc)
-      eo_do(eo_obj, eo_event_callback_call(event_desc->eo_desc, event_info, NULL));
+      eo_do(eo_obj, eo_event_callback_call(event_desc->eo_desc, event_info));
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 1e56bfa073..2e77b1644a 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -383,9 +383,9 @@ _evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *class_data EINA_UNUSE
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
    evas_object_text_init(eo_obj);
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
-   Eo *parent;
+   Eo *parent = NULL;
 
-   eo_do(eo_obj, eo_parent_get(&parent));
+   eo_do(eo_obj, parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
 }
 
@@ -961,10 +961,10 @@ _evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Db
    EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
    EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
 
-   eo_do(eo_obj, evas_obj_text_font_source_get(&text));
+   eo_do(eo_obj, text = evas_obj_text_font_source_get());
    EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
 
-   eo_do(eo_obj, evas_obj_text_text_get(&text));
+   eo_do(eo_obj, text = evas_obj_text_text_get());
    EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text);
 }
 
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 785d687a92..060c91c27e 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -5499,7 +5499,7 @@ _evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    Evas_Textblock_Data *o;
-   Eo *eo_parent;
+   Eo *eo_parent = NULL;
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
@@ -5513,7 +5513,7 @@ _evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data
    _format_command_init();
    evas_object_textblock_init(eo_obj);
 
-   eo_do(eo_obj, eo_parent_get(&eo_parent));
+   eo_do(eo_obj, eo_parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent));
 }
 
@@ -6889,7 +6889,7 @@ EAPI const Evas_Object_Textblock_Node_Format *
 evas_textblock_node_format_first_get(const Evas_Object *eo_obj)
 {
    const Evas_Object_Textblock_Node_Format *format = NULL;
-   eo_do((Eo *)eo_obj, evas_obj_textblock_node_format_first_get(&format));
+   eo_do((Eo *)eo_obj, format = evas_obj_textblock_node_format_first_get());
    return format;
 }
 
@@ -6903,7 +6903,7 @@ EAPI const Evas_Object_Textblock_Node_Format *
 evas_textblock_node_format_last_get(const Evas_Object *eo_obj)
 {
    const Evas_Object_Textblock_Node_Format *format = NULL;
-   eo_do((Eo *)eo_obj, evas_obj_textblock_node_format_last_get(&format));
+   eo_do((Eo *)eo_obj, format = evas_obj_textblock_node_format_last_get());
    return format;
 }
 
@@ -10506,13 +10506,13 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
    Eo_Dbg_Info *node;
 
    const char *style;
-   const char *text;
+   const char *text = NULL;
    char shorttext[48];
-   const Evas_Textblock_Style *ts;
+   const Evas_Textblock_Style *ts = NULL;
 
-   eo_do(eo_obj, evas_obj_textblock_style_get(&ts));
+   eo_do(eo_obj, ts = evas_obj_textblock_style_get());
    style = evas_textblock_style_get(ts);
-   eo_do(eo_obj, evas_obj_textblock_text_markup_get(&text));
+   eo_do(eo_obj, text = evas_obj_textblock_text_markup_get());
    strncpy(shorttext, text, 38);
    if (shorttext[37])
      strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 6870b60d6c..6af6a89a80 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1065,14 +1065,14 @@ evas_object_textgrid_add(Evas *e)
 EOLIAN static void
 _evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
 {
-   Eo *eo_parent;
+   Eo *eo_parent = NULL;
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    evas_object_textgrid_init(eo_obj);
 
-   eo_do(eo_obj, eo_parent_get(&eo_parent));
+   eo_do(eo_obj, eo_parent = eo_parent_get());
    evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent));
 }
 
@@ -1497,7 +1497,7 @@ _evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSE
    EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
    EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
 
-   eo_do(eo_obj, evas_obj_textgrid_font_source_get(&text));
+   eo_do(eo_obj, text = evas_obj_textgrid_font_source_get());
    EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
 
      {
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 314ced98da..a77bed0788 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -29,10 +29,10 @@ evas_out_add(Evas *e)
 EOLIAN static void
 _evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 {
-   Eo *eo_parent;
+   Eo *eo_parent = NULL;
    Evas_Public_Data *e;
 
-   eo_do(eo_obj, eo_parent_get(&eo_parent));
+   eo_do(eo_obj, eo_parent = eo_parent_get());
    e = eo_data_scope_get(eo_parent, EVAS_CLASS);
 
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
@@ -54,10 +54,10 @@ evas_output_del(Evas_Out *evo)
 EOLIAN static void
 _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 {
-   Eo *eo_parent;
+   Eo *eo_parent = NULL;
    Evas_Public_Data *e;
 
-   eo_do(eo_obj, eo_parent_get(&eo_parent));
+   eo_do(eo_obj, eo_parent = eo_parent_get());
    e = eo_data_scope_get(eo_parent, EVAS_CLASS);
    if (!e) return ;
    // XXX: need to free output and context one they get allocated one day
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index f1776ff958..5ffe0f41c1 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1599,7 +1599,7 @@ _cb_always_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
 {
    int freeze_num = 0, i;
 
-   eo_do(eo_e, eo_event_freeze_get(&freeze_num));
+   eo_do(eo_e, freeze_num = eo_event_freeze_get());
    for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw());
    evas_event_callback_call(eo_e, type, event_info);
    for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze());
diff --git a/src/lib/evas/canvas/evas_render2.c b/src/lib/evas/canvas/evas_render2.c
index f853473a56..5fe8913849 100644
--- a/src/lib/evas/canvas/evas_render2.c
+++ b/src/lib/evas/canvas/evas_render2.c
@@ -121,7 +121,7 @@ _evas_render2_always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info)
 {
    int freeze_num = 0, i;
    
-   eo_do(eo_e, eo_event_freeze_get(&freeze_num));
+   eo_do(eo_e, freeze_num = eo_event_freeze_get());
    for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw());
    evas_event_callback_call(eo_e, type, event_info);
    for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze());
diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c
index dec5149677..e5536da704 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -250,7 +250,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy,
         ctx = e->engine.func->context_new(e->engine.data.output);
 
         if (eo_isa(eo_proxy, EVAS_OBJ_IMAGE_CLASS))
-          eo_do(eo_proxy, evas_obj_image_source_clip_get(&source_clip));
+          eo_do(eo_proxy, source_clip = evas_obj_image_source_clip_get());
 
         Evas_Proxy_Render_Data proxy_render_data = {
              .eo_proxy = eo_proxy,