commit 854e1559ad26f725d60a4820abe9acf558f6a853
author Radek Krejci <rkrejci@cesnet.cz> Mon Dec 21 15:05:23 2020 +0100
committer Michal Vasko <mvasko@cesnet.cz> Tue Jan 05 11:26:07 2021 +0100
tree c368bda4e32d7c071106d7bccdd04387a1bc0d27
parent d54412f49e0231b726f0f862f0208c6fd78467c7

schema parsers CHANGE unify name collisions error messages

Also move the error into a common category despite it is YANG or YIN.

src/parser_yin.c

diff --git a/src/parser_yin.c b/src/parser_yin.c
index f117f43..c13ce60 100644
--- a/src/parser_yin.c
+++ b/src/parser_yin.c
@@ -1747,7 +1747,7 @@
     /* submodules share the namespace with the module names, so there must not be
      * a module of the same name in the context, no need for revision matching */
     if (!strcmp(inc_meta->name, inc->name) || ly_ctx_get_module_latest(ctx->xmlctx->ctx, inc->name)) {
-        LOGVAL_PARSER((struct lys_parser_ctx *)ctx, LY_VCODE_NAME_COL, inc->name);
+        LOGVAL_PARSER((struct lys_parser_ctx *)ctx, LY_VCODE_NAME2_COL, "module", "submodule", inc->name);
         return LY_EVALID;
     }
 
@@ -3700,7 +3700,7 @@
      * a submodule of the same name in the context, no need for revision matching */
     dup = ly_ctx_get_submodule(ctx->xmlctx->ctx, NULL, mod->mod->name, NULL);
     if (dup) {
-        LOGVAL_PARSER((struct lys_parser_ctx *)ctx, LYVE_SYNTAX_YANG, "Name collision between module and submodule of name \"%s\".", mod->mod->name);
+        LOGVAL_PARSER((struct lys_parser_ctx *)ctx, LY_VCODE_NAME2_COL, "module", "submodule", mod->mod->name);
         return LY_EVALID;
     }
 
@@ -3768,7 +3768,7 @@
      * a submodule of the same name in the context, no need for revision matching */
     dup = ly_ctx_get_submodule(ctx->xmlctx->ctx, NULL, submod->name, NULL);
     if (dup && strcmp(dup->mod->name, submod->mod->name)) {
-        LOGVAL_PARSER((struct lys_parser_ctx *)ctx, LYVE_SYNTAX_YANG, "Name collision between submodules of name \"%s\".", dup->name);
+        LOGVAL_PARSER((struct lys_parser_ctx *)ctx, LY_VCODE_NAME_COL, "submodules", dup->name);
         return LY_EVALID;
     }