From b3dd735be7dade0d7168a9fcb686dc1bc69e5882 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 16 Aug 2016 16:28:33 +0100
Subject: [PATCH] Efl Object: Change and rename the type we use for function
 pointers.

Rename the type to something more sensible and change it to remove the
last remanent of Eo1. This fixes a fixme that has been there for a
while.

The type doesn't really matter, it just looks nicer with the va_list.
---
 src/lib/eo/eo.c         | 6 +++---
 src/lib/eo/eo_private.h | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 0f530b41d2..b5354c020e 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -187,7 +187,7 @@ _eo_op_class_get(Efl_Object_Op op)
 }
 
 static inline Eina_Bool
-_vtable_func_set(Eo_Vtable *vtable, const _Efl_Class *klass, Efl_Object_Op op, eo_op_func_type func)
+_vtable_func_set(Eo_Vtable *vtable, const _Efl_Class *klass, Efl_Object_Op op, Eo_Op_Func_Type func)
 {
    op_type_funcs *fsrc;
    size_t idx1 = DICH_CHAIN1(op);
@@ -1061,7 +1061,7 @@ eo_class_free(_Efl_Class *klass)
 
 /* Not really called, just used for the ptr... */
 static void
-_eo_class_isa_func(Eo *eo_id EINA_UNUSED, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
+_eo_class_isa_func(Eo *eo_id EINA_UNUSED, void *class_data EINA_UNUSED)
 {
    /* Do nonthing. */
 }
@@ -1813,7 +1813,7 @@ efl_object_init(void)
 #ifdef EO_DEBUG
    /* Call it just for coverage purposes. Ugly I know, but I like it better than
     * casting everywhere else. */
-   _eo_class_isa_func(NULL, NULL, NULL);
+   _eo_class_isa_func(NULL, NULL);
 #endif
 
    _efl_add_fallback_init();
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 40961459d5..9fb982d510 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -129,12 +129,11 @@ struct _Eo_Object
 #define DICH_CHAIN1(x) ((x) >> DICH_CHAIN_LAST_BITS)
 #define DICH_CHAIN_LAST(x) ((x) & ((1 << DICH_CHAIN_LAST_BITS) - 1))
 
-/* FIXME: Change the type to something generic that makes sense for eo */
-typedef void (*eo_op_func_type)(Eo *, void *class_data, va_list *list);
+typedef void (*Eo_Op_Func_Type)(Eo *, void *class_data);
 
 typedef struct
 {
-   eo_op_func_type func;
+   Eo_Op_Func_Type func;
    const _Efl_Class *src;
 } op_type_funcs;