plugins exts UPDATE require ext storage to be a pointer
There are no other use-cases anyway and it being
a uint64_t number causes issues on 32b platforms.
diff --git a/src/tree_schema_free.c b/src/tree_schema_free.c
index ee05d3c..040872b 100644
--- a/src/tree_schema_free.c
+++ b/src/tree_schema_free.c
@@ -1362,7 +1362,7 @@
ly_bool node_free;
LY_ARRAY_FOR(substmts, u) {
- if (!substmts[u].storage) {
+ if (!substmts[u].storage_p) {
continue;
}
@@ -1385,75 +1385,75 @@
case LY_STMT_USES: {
struct lysp_node *child, *child_next;
- LY_LIST_FOR_SAFE(*VOIDPTR2_C(substmts[u].storage), child_next, child) {
+ LY_LIST_FOR_SAFE(*substmts[u].storage_p, child_next, child) {
node_free = (child->nodetype & (LYS_INPUT | LYS_OUTPUT)) ? 1 : 0;
lysp_node_free(&fctx, child);
if (node_free) {
free(child);
}
}
- *VOIDPTR2_C(substmts[u].storage) = NULL;
+ *substmts[u].storage_p = NULL;
break;
}
case LY_STMT_BASE:
/* multiple strings */
- FREE_ARRAY(ctx, **(const char ***)VOIDPTR2_C(substmts[u].storage), lydict_remove);
+ FREE_ARRAY(ctx, **(const char ***)substmts[u].storage_p, lydict_remove);
break;
case LY_STMT_BIT:
case LY_STMT_ENUM:
/* single enum */
- lysp_type_enum_free(&fctx, *VOIDPTR2_C(substmts[u].storage));
+ lysp_type_enum_free(&fctx, *substmts[u].storage_p);
break;
case LY_STMT_DEVIATE:
/* single deviate */
- lysp_deviate_free(&fctx, *VOIDPTR2_C(substmts[u].storage));
+ lysp_deviate_free(&fctx, *substmts[u].storage_p);
break;
case LY_STMT_DEVIATION:
/* single deviation */
- lysp_deviation_free(&fctx, *VOIDPTR2_C(substmts[u].storage));
+ lysp_deviation_free(&fctx, *substmts[u].storage_p);
break;
case LY_STMT_EXTENSION:
/* single extension */
- lysp_ext_free(&fctx, *VOIDPTR2_C(substmts[u].storage));
+ lysp_ext_free(&fctx, *substmts[u].storage_p);
break;
case LY_STMT_EXTENSION_INSTANCE:
/* multiple extension instances */
- FREE_ARRAY(&fctx, *(struct lysp_ext_instance **)VOIDPTR2_C(substmts[u].storage), lysp_ext_instance_free);
+ FREE_ARRAY(&fctx, *(struct lysp_ext_instance **)substmts[u].storage_p, lysp_ext_instance_free);
break;
case LY_STMT_FEATURE:
/* multiple features */
- FREE_ARRAY(&fctx, *(struct lysp_feature **)VOIDPTR2_C(substmts[u].storage), lysp_feature_free);
+ FREE_ARRAY(&fctx, *(struct lysp_feature **)substmts[u].storage_p, lysp_feature_free);
break;
case LY_STMT_IDENTITY:
/* multiple identities */
- FREE_ARRAY(&fctx, *(struct lysp_ident **)VOIDPTR2_C(substmts[u].storage), lysp_ident_free);
+ FREE_ARRAY(&fctx, *(struct lysp_ident **)substmts[u].storage_p, lysp_ident_free);
break;
case LY_STMT_IMPORT:
/* multiple imports */
- FREE_ARRAY(&fctx, *(struct lysp_import **)VOIDPTR2_C(substmts[u].storage), lysp_import_free);
+ FREE_ARRAY(&fctx, *(struct lysp_import **)substmts[u].storage_p, lysp_import_free);
break;
case LY_STMT_INCLUDE:
/* multiple includes */
- FREE_ARRAY(&fctx, *(struct lysp_include **)VOIDPTR2_C(substmts[u].storage), lysp_include_free);
+ FREE_ARRAY(&fctx, *(struct lysp_include **)substmts[u].storage_p, lysp_include_free);
break;
case LY_STMT_REFINE:
/* multiple refines */
- FREE_ARRAY(&fctx, *(struct lysp_refine **)VOIDPTR2_C(substmts[u].storage), lysp_refine_free);
+ FREE_ARRAY(&fctx, *(struct lysp_refine **)substmts[u].storage_p, lysp_refine_free);
break;
case LY_STMT_REVISION:
/* multiple revisions */
- FREE_ARRAY(&fctx, *(struct lysp_revision **)VOIDPTR2_C(substmts[u].storage), lysp_revision_free);
+ FREE_ARRAY(&fctx, *(struct lysp_revision **)substmts[u].storage_p, lysp_revision_free);
break;
case LY_STMT_CONFIG:
@@ -1487,7 +1487,7 @@
case LY_STMT_REVISION_DATE:
case LY_STMT_UNITS:
/* single string */
- lydict_remove(ctx, *VOIDPTR2_C(substmts[u].storage));
+ lydict_remove(ctx, *substmts[u].storage_p);
break;
case LY_STMT_LENGTH:
@@ -1495,34 +1495,34 @@
case LY_STMT_PATTERN:
case LY_STMT_RANGE:
/* multiple restrictions */
- FREE_ARRAY(&fctx, *(struct lysp_restr **)VOIDPTR2_C(substmts[u].storage), lysp_restr_free);
+ FREE_ARRAY(&fctx, *(struct lysp_restr **)substmts[u].storage_p, lysp_restr_free);
break;
case LY_STMT_WHEN:
/* multiple whens */
- FREE_ARRAY(&fctx, *(struct lysp_when **)VOIDPTR2_C(substmts[u].storage), lysp_when_free);
+ FREE_ARRAY(&fctx, *(struct lysp_when **)substmts[u].storage_p, lysp_when_free);
break;
case LY_STMT_PATH:
/* single expression */
- lyxp_expr_free(ctx, *VOIDPTR2_C(substmts[u].storage));
+ lyxp_expr_free(ctx, *substmts[u].storage_p);
break;
case LY_STMT_DEFAULT:
case LY_STMT_IF_FEATURE:
case LY_STMT_UNIQUE:
/* multiple qnames */
- FREE_ARRAY(ctx, *(struct lysp_qname **)VOIDPTR2_C(substmts[u].storage), lysp_qname_free);
+ FREE_ARRAY(ctx, *(struct lysp_qname **)substmts[u].storage_p, lysp_qname_free);
break;
case LY_STMT_TYPEDEF:
/* multiple typedefs */
- FREE_ARRAY(&fctx, *(struct lysp_tpdf **)VOIDPTR2_C(substmts[u].storage), lysp_tpdf_free);
+ FREE_ARRAY(&fctx, *(struct lysp_tpdf **)substmts[u].storage_p, lysp_tpdf_free);
break;
case LY_STMT_TYPE: {
/* single type */
- struct lysp_type **type_p = VOIDPTR_C(substmts[u].storage);
+ struct lysp_type **type_p = (struct lysp_type **)substmts[u].storage_p;
lysp_type_free(&fctx, *type_p);
free(*type_p);
@@ -1531,7 +1531,7 @@
case LY_STMT_MODULE:
case LY_STMT_SUBMODULE:
/* single (sub)module */
- lysp_module_free(&fctx, *VOIDPTR2_C(substmts[u].storage));
+ lysp_module_free(&fctx, *substmts[u].storage_p);
break;
default:
@@ -1550,7 +1550,7 @@
ly_bool node_free;
LY_ARRAY_FOR(substmts, u) {
- if (!substmts[u].storage) {
+ if (!substmts[u].storage_p) {
continue;
}
@@ -1570,14 +1570,14 @@
case LY_STMT_LIST: {
struct lysc_node *child, *child_next;
- LY_LIST_FOR_SAFE(*VOIDPTR2_C(substmts[u].storage), child_next, child) {
+ LY_LIST_FOR_SAFE(*substmts[u].storage_p, child_next, child) {
node_free = (child->nodetype & (LYS_INPUT | LYS_OUTPUT)) ? 1 : 0;
lysc_node_free_(&fctx, child);
if (node_free) {
free(child);
}
}
- *VOIDPTR2_C(substmts[u].storage) = NULL;
+ *substmts[u].storage_p = NULL;
break;
}
case LY_STMT_USES:
@@ -1607,7 +1607,7 @@
case LY_STMT_REFERENCE:
case LY_STMT_UNITS: {
/* single item */
- const char *str = *VOIDPTR2_C(substmts[u].storage);
+ const char *str = *substmts[u].storage_p;
lydict_remove(ctx, str);
break;
@@ -1615,7 +1615,7 @@
case LY_STMT_BIT:
case LY_STMT_ENUM: {
/* sized array */
- struct lysc_type_bitenum_item *items = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_type_bitenum_item *items = *substmts[u].storage_p;
FREE_ARRAY(&fctx, items, lysc_enum_item_free);
break;
@@ -1623,47 +1623,47 @@
case LY_STMT_LENGTH:
case LY_STMT_RANGE: {
/* single item */
- struct lysc_range *range = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_range *range = *substmts[u].storage_p;
lysc_range_free(&fctx, range);
break;
}
case LY_STMT_MUST: {
/* sized array */
- struct lysc_must *musts = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_must *musts = *substmts[u].storage_p;
FREE_ARRAY(&fctx, musts, lysc_must_free);
break;
}
case LY_STMT_WHEN:
/* single item, expects a pointer */
- lysc_when_free(&fctx, VOIDPTR_C(substmts[u].storage));
+ lysc_when_free(&fctx, (struct lysc_when **)substmts[u].storage_p);
break;
case LY_STMT_PATTERN: {
/* sized array of pointers */
- struct lysc_pattern **patterns = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_pattern **patterns = *substmts[u].storage_p;
FREE_ARRAY(&fctx, patterns, lysc_pattern_free);
break;
}
case LY_STMT_TYPE: {
/* single item */
- struct lysc_type *type = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_type *type = *substmts[u].storage_p;
lysc_type_free(&fctx, type);
break;
}
case LY_STMT_IDENTITY: {
/* sized array */
- struct lysc_ident *idents = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_ident *idents = *substmts[u].storage_p;
FREE_ARRAY(&fctx, idents, lysc_ident_free);
break;
}
case LY_STMT_EXTENSION_INSTANCE: {
/* sized array */
- struct lysc_ext_instance *exts = *VOIDPTR2_C(substmts[u].storage);
+ struct lysc_ext_instance *exts = *substmts[u].storage_p;
FREE_ARRAY(&fctx, exts, lysc_ext_instance_free);
break;