vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eo2: improve _eo2_class_funcs_set() errors support 

as op descs are sorted, we can't output fct indexes in error msgs, but
as they are sorted using api_fct as key, we can detect multiple usage of
the same api_fct which leads to an unpredictable call to whatever is
returned by _eo2_api_op_id_get()->_eo2_api_desc_get().

it is still possible to instanciate an object of a not well defined class.
This commit is contained in:
Jérémy Zurcher 2014-01-08 11:13:34 +01:00 committed by Tom Hacohen
parent a9c325c124
commit 9d2eeb7a8b
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -682,25 +682,37 @@ EAPI void
_eo2_class_funcs_set(_Eo_Class *klass) _eo2_class_funcs_set(_Eo_Class *klass)
{ {
int op_id; int op_id;
const void *last_api_func;
const Eo2_Op_Description *api_desc; const Eo2_Op_Description *api_desc;
Eo2_Op_Description *op_desc; Eo2_Op_Description *op_desc;
Eo2_Op_Description *op_descs; Eo2_Op_Description *op_descs;
op_id = klass->base_id;
op_descs = klass->desc->ops.descs2; op_descs = klass->desc->ops.descs2;
qsort((void*)op_descs, klass->desc->ops.count, sizeof(Eo2_Op_Description), eo2_api_funcs_cmp); qsort((void*)op_descs, klass->desc->ops.count, sizeof(Eo2_Op_Description), eo2_api_funcs_cmp);
op_id = klass->base_id; DBG("Set functions for class '%s':%p", klass->desc->name, klass);
DBG("Set functions for class '%s' %p", klass->desc->name, klass);
if (!op_descs) return; if (!op_descs) return;
last_api_func = NULL;
for (op_desc = op_descs; op_desc->op_type != EO_OP_TYPE_INVALID; op_desc++) for (op_desc = op_descs; op_desc->op_type != EO_OP_TYPE_INVALID; op_desc++)
{ {
if(op_desc->api_func == NULL) if(op_desc->api_func == NULL)
ERR("Setting implementation for NULL API. Class '%s', Func index: %lu", {
klass->desc->name, (unsigned long) (op_desc - op_descs)); ERR("Ignore %d NULL->%p '%s'. Can't set implementation for NULL API.",
op_desc->op, op_desc->func, op_desc->doc);
continue;
}
if (op_desc->op == EO_NOOP) if (op_desc->op == EO_NOOP)
{ {
if (op_desc->api_func == last_api_func)
{
ERR("API already defined %d %p->%p '%s'. Expect undefined behaviour.",
op_desc->op, op_desc->api_func, op_desc->func, op_desc->doc);
}
op_desc->op = op_id; op_desc->op = op_id;
op_id++; op_id++;
} }
@ -709,20 +721,20 @@ _eo2_class_funcs_set(_Eo_Class *klass)
api_desc = _eo2_api_desc_get(op_desc->api_func, klass->parent, klass->extensions); api_desc = _eo2_api_desc_get(op_desc->api_func, klass->parent, klass->extensions);
if (api_desc == NULL) if (api_desc == NULL)
ERR("Can't find api func %p description in class hierarchy. Class '%s', Func index: %lu", {
op_desc->api_func, klass->desc->name, (unsigned long) (op_desc - op_descs)); ERR("Ignore override %p->%p. Can't find api func description in class hierarchy.",
op_desc->api_func, op_desc->func);
continue;
}
op_desc->op = api_desc->op; op_desc->op = api_desc->op;
op_desc->doc = api_desc->doc; op_desc->doc = api_desc->doc;
if (op_desc->op == EO_NOOP)
ERR("API func %p, not found in direct parent '%s'. Class '%s', Func index: %lu",
op_desc->api_func, klass->parent->desc->name,
klass->desc->name, (unsigned long) (op_desc - op_descs));
} }
DBG(" %4d %p %p %s", op_desc->op, op_desc->api_func, op_desc->func, op_desc->doc); DBG(" %4d %p->%p '%s'", op_desc->op, op_desc->api_func, op_desc->func, op_desc->doc);
_dich_func_set(klass, op_desc->op, op_desc->func); _dich_func_set(klass, op_desc->op, op_desc->func);
last_api_func = op_desc->api_func;
} }
} }