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

eolian: always print error and fail when name conflicts are detected

This commit is contained in:
Mike Blumenkrantz 2018-02-15 13:50:56 -05:00
parent d17b8a23d9
commit 1f32a4fcd2
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/eolian/database_validate.c
View File

@ -333,25 +333,15 @@ _validate_function(Validate_State *vals, const Eolian_Unit *src,
Eolian_Function_Parameter *param;
char buf[512];
static int _duplicates_warn = -1;
if (EINA_UNLIKELY(_duplicates_warn < 0))
{
const char *s = getenv("EOLIAN_WARN_FUNC_DUPLICATES");
if (!s) _duplicates_warn = 0;
else _duplicates_warn = atoi(s);
}
const Eolian_Function *ofunc = nhash ? eina_hash_find(nhash, func->name) : NULL;
if (EINA_UNLIKELY(ofunc && (ofunc != func) && (_duplicates_warn > 0)))
if (EINA_UNLIKELY(ofunc && (ofunc != func)))
{
snprintf(buf, sizeof(buf),
"%sfunction '%s' redefined (originally at %s:%d:%d)",
func->is_beta ? "beta " : "", func->name, ofunc->base.file,
ofunc->base.line, ofunc->base.column);
if ((!func->is_beta && !ofunc->is_beta) || (_duplicates_warn > 1))
_obj_error(&func->base, buf);
if (_duplicates_warn > 1)
vals->warned = EINA_TRUE;
_obj_error(&func->base, buf);
vals->warned = EINA_TRUE;
}
/* if already validated, no need to perform the other checks...