enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

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.
This commit is contained in:
Tom Hacohen 2016-08-16 16:28:33 +01:00
parent 28c80f9122
commit b3dd735be7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/eo/eo.c
View File

@ -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();

5
src/lib/eo/eo_private.h
View File

@ -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;