commit eeee95c507b48fbfdb480f33249ca02e46d7c550
author Radek Krejci <rkrejci@cesnet.cz> Tue Jan 19 10:57:22 2021 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Wed Jan 20 13:35:31 2021 +0100
tree 77bde9e305a31468a1b3f9e8fc0a268544f48f9a
parent 9d3c102a463ecc4c1731e3e53792a4ac1d81b539

schema parsers CHANGE warn about include in YANG 1.1 submodules

YANG 1.1 requires all submodules to be present inside main module.
Having includes in submodules is not necessary since the submodules can
reference all submodules included in the main module.

src/parser_yang.c

diff --git a/src/parser_yang.c b/src/parser_yang.c
index 9fe7386..591aaa5 100644
--- a/src/parser_yang.c
+++ b/src/parser_yang.c
@@ -4328,6 +4328,10 @@
 
         /* linkage */
         case LY_STMT_INCLUDE:
+            if (submod->version == LYS_VERSION_1_1) {
+                LOGWRN(PARSER_CTX(ctx), "YANG version 1.1 expects all includes in main module, includes in submodules (%s) are not necessary.",
+                        submod->name);
+            }
             LY_CHECK_RET(parse_include(ctx, submod->name, &submod->includes));
             break;
         case LY_STMT_IMPORT:

src/parser_yin.c

diff --git a/src/parser_yin.c b/src/parser_yin.c
index ef0c65e..bc20d0e 100644
--- a/src/parser_yin.c
+++ b/src/parser_yin.c
@@ -3507,6 +3507,10 @@
                 ret = yin_parse_import(ctx, (struct import_meta *)subelem->dest);
                 break;
             case LY_STMT_INCLUDE:
+                if ((current_element == LY_STMT_SUBMODULE) && (ctx->parsed_mod->version == LYS_VERSION_1_1)) {
+                    LOGWRN(PARSER_CTX(ctx), "YANG version 1.1 expects all includes in main module, includes in submodules (%s) are not necessary.",
+                            ((struct lysp_submodule *)(ctx->parsed_mod))->name);
+                }
                 ret = yin_parse_include(ctx, (struct include_meta *)subelem->dest);
                 break;
             case LY_STMT_INPUT:

src/tree_schema.c

diff --git a/src/tree_schema.c b/src/tree_schema.c
index 1c5cd3b..2935a67 100644
--- a/src/tree_schema.c
+++ b/src/tree_schema.c
@@ -1430,7 +1430,7 @@
         dirs->count--;
         wd = (char *)dirs->objs[dirs->count];
         dirs->objs[dirs->count] = NULL;
-        LOGVRB("Searching for \"%s\" in %s.", name, wd);
+        LOGVRB("Searching for \"%s\" in \"%s\".", name, wd);
 
         if (dir) {
             closedir(dir);