parser schema CHANGE always return non-const modules
Refs #1645
diff --git a/src/parser_schema.h b/src/parser_schema.h
index ecb3851..bddb300 100644
--- a/src/parser_schema.h
+++ b/src/parser_schema.h
@@ -103,7 +103,7 @@
* @return LY_ERR value.
*/
LY_ERR lys_parse(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, const char **features,
- const struct lys_module **module);
+ struct lys_module **module);
/**
* @brief Load a schema into the specified context.
@@ -117,7 +117,7 @@
* @param[out] module Optional parsed module.
* @return LY_ERR value.
*/
-LY_ERR lys_parse_mem(struct ly_ctx *ctx, const char *data, LYS_INFORMAT format, const struct lys_module **module);
+LY_ERR lys_parse_mem(struct ly_ctx *ctx, const char *data, LYS_INFORMAT format, struct lys_module **module);
/**
* @brief Read a schema from file descriptor into the specified context.
@@ -134,7 +134,7 @@
* @param[out] module Optional parsed module.
* @return LY_ERR value.
*/
-LY_ERR lys_parse_fd(struct ly_ctx *ctx, int fd, LYS_INFORMAT format, const struct lys_module **module);
+LY_ERR lys_parse_fd(struct ly_ctx *ctx, int fd, LYS_INFORMAT format, struct lys_module **module);
/**
* @brief Load a schema into the specified context from a file.
@@ -148,7 +148,7 @@
* @param[out] module Optional parsed module.
* @return LY_ERR value.
*/
-LY_ERR lys_parse_path(struct ly_ctx *ctx, const char *path, LYS_INFORMAT format, const struct lys_module **module);
+LY_ERR lys_parse_path(struct ly_ctx *ctx, const char *path, LYS_INFORMAT format, struct lys_module **module);
/**
* @brief Search for the schema file in the specified searchpaths.
diff --git a/src/tree_schema.c b/src/tree_schema.c
index 702563a..86de5c4 100644
--- a/src/tree_schema.c
+++ b/src/tree_schema.c
@@ -1634,7 +1634,7 @@
}
API LY_ERR
-lys_parse(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, const char **features, const struct lys_module **module)
+lys_parse(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, const char **features, struct lys_module **module)
{
LY_ERR ret = LY_SUCCESS;
struct lys_module *mod;
@@ -1678,7 +1678,7 @@
}
API LY_ERR
-lys_parse_mem(struct ly_ctx *ctx, const char *data, LYS_INFORMAT format, const struct lys_module **module)
+lys_parse_mem(struct ly_ctx *ctx, const char *data, LYS_INFORMAT format, struct lys_module **module)
{
LY_ERR ret;
struct ly_in *in = NULL;
@@ -1694,7 +1694,7 @@
}
API LY_ERR
-lys_parse_fd(struct ly_ctx *ctx, int fd, LYS_INFORMAT format, const struct lys_module **module)
+lys_parse_fd(struct ly_ctx *ctx, int fd, LYS_INFORMAT format, struct lys_module **module)
{
LY_ERR ret;
struct ly_in *in = NULL;
@@ -1710,7 +1710,7 @@
}
API LY_ERR
-lys_parse_path(struct ly_ctx *ctx, const char *path, LYS_INFORMAT format, const struct lys_module **module)
+lys_parse_path(struct ly_ctx *ctx, const char *path, LYS_INFORMAT format, struct lys_module **module)
{
LY_ERR ret;
struct ly_in *in = NULL;
diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c
index 4d392ed..4df9d7e 100644
--- a/tests/utests/basic/test_context.c
+++ b/tests/utests/basic/test_context.c
@@ -268,7 +268,7 @@
/* reloading module in case only the compiled module resists in the context */
assert_int_equal(LY_SUCCESS, ly_in_new_memory("module w {namespace urn:w;prefix w;revision 2018-10-24;}", &in));
- assert_int_equal(LY_SUCCESS, lys_parse(UTEST_LYCTX, in, LYS_IN_YANG, NULL, (const struct lys_module **)&mod1));
+ assert_int_equal(LY_SUCCESS, lys_parse(UTEST_LYCTX, in, LYS_IN_YANG, NULL, &mod1));
ly_in_free(in, 0);
assert_non_null(mod1->compiled);
assert_non_null(mod1->parsed);
@@ -288,7 +288,7 @@
assert_int_equal(LY_SUCCESS, ly_in_new_memory("module z {namespace urn:z;prefix z;import w {prefix w;revision-date 2018-10-24;}}", &in));
ly_ctx_set_module_imp_clb(UTEST_LYCTX, test_imp_clb, "module w {namespace urn:w;prefix w;revision 2018-10-24;}");
- assert_int_equal(LY_SUCCESS, lys_parse(UTEST_LYCTX, in, LYS_IN_YANG, NULL, (const struct lys_module **)&mod2));
+ assert_int_equal(LY_SUCCESS, lys_parse(UTEST_LYCTX, in, LYS_IN_YANG, NULL, &mod2));
ly_in_free(in, 0);
assert_non_null(mod2);
assert_non_null(mod1->parsed);
@@ -298,7 +298,7 @@
static void
test_imports(void **state)
{
- const struct lys_module *mod1, *mod2, *import;
+ struct lys_module *mod1, *mod2, *import;
/* use own context with extra flags */
ly_ctx_destroy(UTEST_LYCTX);
@@ -382,7 +382,7 @@
assert_non_null(ly_ctx_get_module_ns(UTEST_LYCTX, "urn:ietf:params:xml:ns:yang:ietf-datastores", "2018-02-14"));
/* select module by revision */
- assert_int_equal(LY_SUCCESS, lys_parse(UTEST_LYCTX, in1, LYS_IN_YANG, NULL, (const struct lys_module **)&mod));
+ assert_int_equal(LY_SUCCESS, lys_parse(UTEST_LYCTX, in1, LYS_IN_YANG, NULL, &mod));
/* invalid attempts - implementing module of the same name and inserting the same module */
assert_int_equal(LY_SUCCESS, lys_parse_in(UTEST_LYCTX, in2, LYS_IN_YANG, NULL, NULL, &unres.creating, &mod2));
assert_int_equal(LY_EDENIED, lys_implement(mod2, NULL, &unres));
@@ -753,7 +753,7 @@
static void
test_set_priv_parsed(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *schema_a;
const char **iter;
const char *check[] = {
@@ -895,7 +895,7 @@
test_explicit_compile(void **state)
{
uint32_t i;
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *schema_a = "module a {\n"
" namespace urn:tests:a;\n"
" prefix a;yang-version 1.1;\n"
diff --git a/tests/utests/basic/test_plugins.c b/tests/utests/basic/test_plugins.c
index 662fd9b..4afd9a4 100644
--- a/tests/utests/basic/test_plugins.c
+++ b/tests/utests/basic/test_plugins.c
@@ -41,7 +41,7 @@
static void
test_add_simple(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *leaf;
struct lyplg_ext *plugin_e;
struct lyplg_type *plugin_t;
@@ -69,7 +69,7 @@
static void
test_validation(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_node *tree;
const char *data;
const char *schema = "module libyang-plugins-validate {"
@@ -124,7 +124,7 @@
static void
test_not_implemented(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_node *tree;
const char *schema = "module libyang-plugins-unknown {"
" namespace urn:libyang:tests:plugins:unknown;"
diff --git a/tests/utests/data/test_new.c b/tests/utests/data/test_new.c
index d678fef..e9b591e 100644
--- a/tests/utests/data/test_new.c
+++ b/tests/utests/data/test_new.c
@@ -86,7 +86,7 @@
static void
test_top_level(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_node *node, *rpc;
UTEST_ADD_MODULE(schema_a, LYS_IN_YANG, NULL, &mod);
@@ -200,7 +200,7 @@
{
LY_ERR ret;
struct lyd_node *root, *node, *parent;
- const struct lys_module *mod;
+ struct lys_module *mod;
char *str;
UTEST_ADD_MODULE(schema_a, LYS_IN_YANG, NULL, &mod);
@@ -349,7 +349,7 @@
{
LY_ERR ret;
struct lyd_node *root, *node;
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *mod_str = "module ext {yang-version 1.1; namespace urn:tests:extensions:ext; prefix e;"
"import ietf-restconf {revision-date 2017-01-26; prefix rc;}"
"rc:yang-data template {container c {leaf x {type string;} leaf y {type string;} leaf z {type string;}}}}";
diff --git a/tests/utests/data/test_validation.c b/tests/utests/data/test_validation.c
index 2045a3a..643655c 100644
--- a/tests/utests/data/test_validation.c
+++ b/tests/utests/data/test_validation.c
@@ -737,7 +737,7 @@
test_defaults(void **state)
{
struct lyd_node *tree, *node, *diff;
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *schema =
"module f {\n"
" namespace urn:tests:f;\n"
diff --git a/tests/utests/extensions/test_metadata.c b/tests/utests/extensions/test_metadata.c
index 1022117..8ebe67b 100644
--- a/tests/utests/extensions/test_metadata.c
+++ b/tests/utests/extensions/test_metadata.c
@@ -21,7 +21,7 @@
static void
test_yang(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_ext_instance *e;
const char *data = "module a {yang-version 1.1; namespace urn:tests:extensions:metadata:a; prefix a;"
@@ -92,7 +92,7 @@
static void
test_yin(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_ext_instance *e;
const char *data;
diff --git a/tests/utests/extensions/test_nacm.c b/tests/utests/extensions/test_nacm.c
index 76280da..2298dea 100644
--- a/tests/utests/extensions/test_nacm.c
+++ b/tests/utests/extensions/test_nacm.c
@@ -30,7 +30,7 @@
static void
test_deny_all(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_container *cont;
struct lysc_node_leaf *leaf;
struct lysc_ext_instance *e;
@@ -73,7 +73,7 @@
static void
test_deny_write(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_container *cont;
struct lysc_node_leaf *leaf;
struct lysc_ext_instance *e;
diff --git a/tests/utests/extensions/test_yangdata.c b/tests/utests/extensions/test_yangdata.c
index 5e5cdcc..e45cdae 100644
--- a/tests/utests/extensions/test_yangdata.c
+++ b/tests/utests/extensions/test_yangdata.c
@@ -30,7 +30,7 @@
static void
test_schema(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_ext_instance *e;
char *printed = NULL;
const char *data = "module a {yang-version 1.1; namespace urn:tests:extensions:yangdata:a; prefix self;"
@@ -236,7 +236,7 @@
static void
test_data(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_ext_instance *e;
struct lyd_node *tree = NULL;
const char *schema = "module a {yang-version 1.1; namespace urn:tests:extensions:yangdata:a; prefix self;"
diff --git a/tests/utests/node/list.c b/tests/utests/node/list.c
index 4753121..7dcd68d 100644
--- a/tests/utests/node/list.c
+++ b/tests/utests/node/list.c
@@ -49,7 +49,7 @@
test_schema_yang(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_list *lysc_leaf;
struct lysc_node *lysc_node;
@@ -361,7 +361,7 @@
test_schema_yin(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_list *lysc_leaf;
struct lysc_node *lysc_node;
@@ -652,7 +652,7 @@
{
const char *schema_yang, *schema_yin;
char *printed;
- const struct lys_module *mod;
+ struct lys_module *mod;
/* test print yang to yin */
schema_yang = MODULE_CREATE_YANG("PRINT0",
diff --git a/tests/utests/restriction/test_pattern.c b/tests/utests/restriction/test_pattern.c
index 9298390..ab01ff2 100644
--- a/tests/utests/restriction/test_pattern.c
+++ b/tests/utests/restriction/test_pattern.c
@@ -82,7 +82,7 @@
test_schema_yang(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_pattern *pattern;
@@ -181,7 +181,7 @@
test_schema_yin(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_pattern *pattern;
@@ -288,7 +288,7 @@
{
const char *schema_yang, *schema_yin;
char *printed;
- const struct lys_module *mod;
+ struct lys_module *mod;
/* test print yang to yin */
schema_yang = MODULE_CREATE_YANG("PRINT0", "leaf port {type string {"
diff --git a/tests/utests/restriction/test_range.c b/tests/utests/restriction/test_range.c
index 7d44554..782443a 100644
--- a/tests/utests/restriction/test_range.c
+++ b/tests/utests/restriction/test_range.c
@@ -82,7 +82,7 @@
test_schema_yang(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_range *range;
@@ -170,7 +170,7 @@
test_schema_yin(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_range *range;
@@ -301,7 +301,7 @@
{
const char *schema_yang, *schema_yin;
char *printed;
- const struct lys_module *mod;
+ struct lys_module *mod;
/* test print yang to yin */
schema_yang = MODULE_CREATE_YANG("PRINT0", "leaf port {type int32 {"
diff --git a/tests/utests/schema/test_printer_tree.c b/tests/utests/schema/test_printer_tree.c
index bf141fe..5627702 100644
--- a/tests/utests/schema/test_printer_tree.c
+++ b/tests/utests/schema/test_printer_tree.c
@@ -22,7 +22,7 @@
#define TEST_LOCAL_SETUP \
char *printed; \
- const struct lys_module *mod; \
+ struct lys_module *mod; \
const char *orig; \
const char *expect; \
assert_int_equal(LY_SUCCESS, ly_out_new_memory(&printed, 0, &UTEST_OUT));
@@ -37,7 +37,7 @@
base_sections(void **state)
{
TEST_LOCAL_SETUP;
- const struct lys_module *modxx;
+ struct lys_module *modxx;
orig =
"module a01xx {\n"
diff --git a/tests/utests/schema/test_printer_yang.c b/tests/utests/schema/test_printer_yang.c
index 3a2cabd..293404c 100644
--- a/tests/utests/schema/test_printer_yang.c
+++ b/tests/utests/schema/test_printer_yang.c
@@ -23,7 +23,7 @@
static void
test_module(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *orig = "module a {\n"
" yang-version 1.1;\n"
" namespace \"urn:test:a\";\n"
@@ -161,7 +161,7 @@
static void
test_submodule(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *mod_yang = "module a {\n"
" yang-version 1.1;\n"
" namespace \"urn:test:a\";\n"
diff --git a/tests/utests/schema/test_printer_yin.c b/tests/utests/schema/test_printer_yin.c
index 3e25ce9..5c610a7 100644
--- a/tests/utests/schema/test_printer_yin.c
+++ b/tests/utests/schema/test_printer_yin.c
@@ -23,7 +23,7 @@
static void
test_module(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *orig =
"module all {\n"
@@ -538,7 +538,7 @@
static void
test_submodule(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *mod_yin =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
diff --git a/tests/utests/schema/test_schema_common.c b/tests/utests/schema/test_schema_common.c
index 60f22d4..6cefa5d 100644
--- a/tests/utests/schema/test_schema_common.c
+++ b/tests/utests/schema/test_schema_common.c
@@ -49,7 +49,7 @@
void
test_getnext(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysc_node *node = NULL, *four;
const struct lysc_node_container *cont;
const struct lysc_action *rpc;
@@ -878,7 +878,7 @@
void
test_includes(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
{
/* YANG 1.0 - the missing include sub_a_two in main_a will be injected from sub_a_one */
diff --git a/tests/utests/schema/test_schema_extensions.c b/tests/utests/schema/test_schema_extensions.c
index a2dad63..fecc5e6 100644
--- a/tests/utests/schema/test_schema_extensions.c
+++ b/tests/utests/schema/test_schema_extensions.c
@@ -22,7 +22,7 @@
void
test_extension_argument(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *mod_def_yang = "module a {\n"
" namespace \"urn:a\";\n"
" prefix a;\n\n"
@@ -116,7 +116,7 @@
void
test_extension_argument_element(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const char *mod_def_yang = "module a {\n"
" namespace \"urn:a\";\n"
" prefix a;\n\n"
diff --git a/tests/utests/schema/test_schema_stmts.c b/tests/utests/schema/test_schema_stmts.c
index af816bb..c331c3c 100644
--- a/tests/utests/schema/test_schema_stmts.c
+++ b/tests/utests/schema/test_schema_stmts.c
@@ -22,7 +22,7 @@
void
test_identity(void **state)
{
- const struct lys_module *mod, *mod_imp;
+ struct lys_module *mod, *mod_imp;
/*
* parsing YANG
@@ -137,7 +137,7 @@
void
test_feature(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysp_feature *f;
/*
diff --git a/tests/utests/schema/test_tree_schema_compile.c b/tests/utests/schema/test_tree_schema_compile.c
index dfe64d3..9bf2f95 100644
--- a/tests/utests/schema/test_tree_schema_compile.c
+++ b/tests/utests/schema/test_tree_schema_compile.c
@@ -109,7 +109,7 @@
/* data definition name collision in top level */
str = "module aa {namespace urn:aa;prefix aa; leaf a {type string;} container a{presence x;}}";
assert_int_equal(LY_SUCCESS, ly_in_new_memory(str, &in));
- assert_int_equal(LY_EEXIST, lys_parse(UTEST_LYCTX, in, LYS_IN_YANG, NULL, (const struct lys_module **)&mod));
+ assert_int_equal(LY_EEXIST, lys_parse(UTEST_LYCTX, in, LYS_IN_YANG, NULL, &mod));
ly_in_free(in, 0);
CHECK_LOG_CTX("Duplicate identifier \"a\" of data definition/RPC/action/notification statement.", "/aa:a");
}
@@ -192,7 +192,7 @@
static void
test_node_container(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_container *cont;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a;container c;}", LYS_IN_YANG, &mod));
@@ -218,7 +218,7 @@
static void
test_node_leaflist(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
struct lysc_node_leaflist *ll;
struct lysc_node_leaf *l;
@@ -327,7 +327,7 @@
static void
test_node_list(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_list *list;
struct lysc_node *child;
struct ly_in *in;
@@ -465,7 +465,7 @@
static void
test_node_choice(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_choice *ch;
struct lysc_node_case *cs;
@@ -524,7 +524,7 @@
static void
test_node_anydata(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_anydata *any;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {yang-version 1.1;namespace urn:a;prefix a;"
@@ -549,7 +549,7 @@
static void
test_action(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysc_node_action *rpc;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a;"
@@ -606,7 +606,7 @@
static void
test_notification(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysc_node_notif *notif;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a;"
@@ -679,7 +679,7 @@
static void
test_type_range(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
#if 0
@@ -810,7 +810,7 @@
static void
test_type_length(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a;leaf l {type binary {length min {error-app-tag errortag;error-message error;}}}}", LYS_IN_YANG, &mod));
@@ -1015,7 +1015,7 @@
static void
test_type_pattern(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {yang-version 1.1; namespace urn:a;prefix a;leaf l {type string {"
@@ -1076,7 +1076,7 @@
static void
test_type_enum(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {yang-version 1.1; namespace urn:a;prefix a;feature f; leaf l {type enumeration {"
@@ -1201,7 +1201,7 @@
static void
test_type_bits(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
/* type bits is now tested in file type/bits.c */
@@ -1293,7 +1293,7 @@
static void
test_type_dec64(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a;leaf l {type decimal64 {"
@@ -1376,7 +1376,7 @@
static void
test_type_instanceid(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a;typedef mytype {type instance-identifier {require-instance false;}}"
@@ -1408,7 +1408,7 @@
static void
test_type_identityref(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {yang-version 1.1;namespace urn:a;prefix a;identity i; identity j; identity k {base i;}"
@@ -1469,7 +1469,7 @@
static void
test_type_leafref(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
const char *path;
struct lyxp_expr *expr;
@@ -1827,7 +1827,6 @@
static void
test_type_empty(void **state)
{
-
/* invalid */
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, "module aa {namespace urn:aa;prefix aa;"
"leaf l {type empty; default x;}}", LYS_IN_YANG, NULL));
@@ -1841,7 +1840,7 @@
static void
test_type_union(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {yang-version 1.1;namespace urn:a;prefix a; typedef mybasetype {type string;}"
@@ -1913,7 +1912,7 @@
static void
test_type_dflt(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_type *type;
struct lysc_node_leaf *leaf;
uint8_t dynamic;
@@ -2020,7 +2019,6 @@
static void
test_grouping(void **state)
{
-
/* result ok, but a warning about not used locally scoped grouping printed */
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, "module a {namespace urn:a;prefix a; grouping grp1 {leaf a1 {type string;}}"
"container a {leaf x {type string;} grouping grp2 {leaf a2 {type string;}}}}", LYS_IN_YANG, NULL));
@@ -2046,7 +2044,7 @@
static void
test_uses(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysc_node *parent, *child;
const struct lysc_node_container *cont;
const struct lysc_node_leaf *leaf;
@@ -2221,7 +2219,7 @@
static void
test_refine(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node *parent, *child;
struct lysc_node_leaf *leaf;
struct lysc_node_leaflist *llist;
@@ -2376,7 +2374,7 @@
static void
test_augment(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysc_node *node;
const struct lysc_node_choice *ch;
const struct lysc_node_case *c;
@@ -2546,7 +2544,7 @@
static void
test_deviation(void **state)
{
- const struct lys_module *mod;
+ struct lys_module *mod;
const struct lysc_node *node;
const struct lysc_node_list *list;
const struct lysc_node_leaflist *llist;
diff --git a/tests/utests/types/binary.c b/tests/utests/types/binary.c
index 2fbb6e4..5666207 100644
--- a/tests/utests/types/binary.c
+++ b/tests/utests/types/binary.c
@@ -33,7 +33,7 @@
const char *val, *dec_val;
char bin_val[2];
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value value = {0};
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_BINARY]);
struct lysc_type *lysc_type;
diff --git a/tests/utests/types/bits.c b/tests/utests/types/bits.c
index 7688967..ea2491f 100644
--- a/tests/utests/types/bits.c
+++ b/tests/utests/types/bits.c
@@ -82,7 +82,7 @@
test_schema_yang(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_type_bits *lysc_type;
@@ -276,7 +276,7 @@
test_schema_yin(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_type_bits *lysc_type;
@@ -471,7 +471,7 @@
{
const char *schema_yang, *schema_yin;
char *printed;
- const struct lys_module *mod;
+ struct lys_module *mod;
/* test print yang to yin */
schema_yang = MODULE_CREATE_YANG("PRINT0",
@@ -753,7 +753,7 @@
{
const char *val_text = NULL;
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value value = {0};
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_BITS]);
struct lysc_type *lysc_type;
@@ -847,7 +847,7 @@
test_plugin_compare(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_BITS]);
struct lysc_type *lysc_type;
@@ -934,7 +934,7 @@
test_plugin_print(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_BITS]);
struct lysc_type *lysc_type;
@@ -976,7 +976,7 @@
test_plugin_dup(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_BITS]);
struct lysc_type *lysc_type;
diff --git a/tests/utests/types/int8.c b/tests/utests/types/int8.c
index 6642a1c..265daf9 100644
--- a/tests/utests/types/int8.c
+++ b/tests/utests/types/int8.c
@@ -86,7 +86,7 @@
test_schema_yang(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_range *range;
@@ -647,7 +647,7 @@
test_schema_yin(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_range *range;
@@ -999,7 +999,7 @@
{
const char *schema_yang, *schema_yin;
char *printed;
- const struct lys_module *mod;
+ struct lys_module *mod;
/* test print yang to yin */
schema_yang = MODULE_CREATE_YANG("PRINT0",
@@ -1378,7 +1378,7 @@
{
const char *val_text = NULL;
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value value = {0};
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_INT8]);
struct lysc_type *lysc_type;
@@ -1512,7 +1512,7 @@
test_plugin_compare(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_INT8]);
struct lysc_type *lysc_type;
@@ -1597,7 +1597,7 @@
test_plugin_print(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_INT8]);
struct lysc_type *lysc_type;
@@ -1637,7 +1637,7 @@
test_plugin_dup(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_INT8]);
struct lysc_type *lysc_type[2];
diff --git a/tests/utests/types/string.c b/tests/utests/types/string.c
index 749d084..678e95e 100644
--- a/tests/utests/types/string.c
+++ b/tests/utests/types/string.c
@@ -82,7 +82,7 @@
test_schema_yang(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_pattern *pattern;
@@ -332,7 +332,7 @@
test_schema_yin(void **state)
{
const char *schema;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lysc_node_leaf *lysc_leaf;
struct lysp_node_leaf *lysp_leaf;
struct lysc_pattern *pattern;
@@ -618,7 +618,7 @@
{
const char *schema_yang, *schema_yin;
char *printed;
- const struct lys_module *mod;
+ struct lys_module *mod;
/* test print yang to yin */
schema_yang = MODULE_CREATE_YANG("PRINT0",
@@ -1039,7 +1039,7 @@
const char *val_text = NULL;
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value value = {0};
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_STRING]);
struct lysc_type *lysc_type;
@@ -1147,7 +1147,7 @@
test_plugin_compare(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_STRING]);
struct lysc_type *lysc_type;
@@ -1225,7 +1225,7 @@
test_plugin_print(void **state)
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_STRING]);
struct lysc_type *lysc_type;
@@ -1264,7 +1264,7 @@
{
struct ly_err_item *err = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
struct lyd_value values[10];
struct lyplg_type *type = lyplg_find(LYPLG_TYPE, "", NULL, ly_data_type2str[LY_TYPE_STRING]);
struct lysc_type *lysc_type[2];
diff --git a/tests/utests/utests.h b/tests/utests/utests.h
index 5bea045..50ec188 100644
--- a/tests/utests/utests.h
+++ b/tests/utests/utests.h
@@ -1126,7 +1126,7 @@
*/
#define UTEST_INVALID_MODULE(DATA, FORMAT, FEATURES, RET_VAL) \
{ \
- const struct lys_module *mod; \
+ struct lys_module *mod; \
assert_int_equal(LY_SUCCESS, ly_in_new_memory(DATA, &_UC->in)); \
assert_int_equal(RET_VAL, lys_parse(_UC->ctx, _UC->in, FORMAT, FEATURES, &mod)); \
assert_null(mod); \
diff --git a/tools/lint/main_ni.c b/tools/lint/main_ni.c
index 13eb1cd..bb2c552 100644
--- a/tools/lint/main_ni.c
+++ b/tools/lint/main_ni.c
@@ -291,7 +291,7 @@
char *dir, *module;
const char *fall = "*";
const char **features = &fall;
- const struct lys_module *mod;
+ struct lys_module *mod;
if (parse_schema_path(argv[optind + i], &dir, &module)) {
goto error;
diff --git a/tools/re/main.c b/tools/re/main.c
index 4d8aa99..9ef32eb 100644
--- a/tools/re/main.c
+++ b/tools/re/main.c
@@ -124,7 +124,7 @@
int *invert_match = NULL;
int patterns_count = 0;
struct ly_ctx *ctx = NULL;
- const struct lys_module *mod;
+ struct lys_module *mod;
FILE *infile = NULL;
size_t len = 0;
ssize_t l;