libyang REFACTOR rename sized array size to count
... because it reflects the fact that it may not
always (internally) be the size of the array.
diff --git a/tests/utests/schema/test_schema_stmts.c b/tests/utests/schema/test_schema_stmts.c
index 7e93afd..9e34742 100644
--- a/tests/utests/schema/test_schema_stmts.c
+++ b/tests/utests/schema/test_schema_stmts.c
@@ -49,7 +49,7 @@
"identity test {base \"a\";base b; description text;reference \'another text\';status current; if-feature x;if-feature y; identityone:ext;}"
"identity a; identity b; extension ext; feature x; feature y;", mod);
assert_non_null(mod->parsed->identities);
- assert_int_equal(3, LY_ARRAY_SIZE(mod->parsed->identities));
+ assert_int_equal(3, LY_ARRAY_COUNT(mod->parsed->identities));
/* invalid substatement */
TEST_STMT_SUBSTM_ERR(ctx, 0, "identity", "organization", "XXX");
@@ -66,7 +66,7 @@
"<reference><text>ref</text></reference>"
"<myext:ext xmlns:myext=\"urn:libyang:test:identityone-yin\"/>"
"</identity><extension name=\"ext\"/><identity name=\"base-name\"/><feature name=\"iff\"/>", mod);
- assert_int_equal(2, LY_ARRAY_SIZE(mod->parsed->identities));
+ assert_int_equal(2, LY_ARRAY_COUNT(mod->parsed->identities));
assert_string_equal(mod->parsed->identities[0].name, "ident-name");
assert_string_equal(mod->parsed->identities[0].bases[0], "base-name");
assert_string_equal(mod->parsed->identities[0].iffeatures[0], "iff");
@@ -81,7 +81,7 @@
/* min subelems */
TEST_SCHEMA_OK(ctx, 1, 1, "identitytwo-yin", "<identity name=\"ident-name\" />", mod);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->parsed->identities));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->parsed->identities));
assert_string_equal(mod->parsed->identities[0].name, "ident-name");
/* invalid substatement */
@@ -100,21 +100,21 @@
assert_non_null(mod->compiled);
assert_non_null(mod->compiled->identities);
assert_non_null(mod_imp->compiled->identities[0].derived);
- assert_int_equal(1, LY_ARRAY_SIZE(mod_imp->compiled->identities[0].derived));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod_imp->compiled->identities[0].derived));
assert_ptr_equal(mod_imp->compiled->identities[0].derived[0], &mod->compiled->identities[2]);
assert_non_null(mod->compiled->identities[0].derived);
- assert_int_equal(2, LY_ARRAY_SIZE(mod->compiled->identities[0].derived));
+ assert_int_equal(2, LY_ARRAY_COUNT(mod->compiled->identities[0].derived));
assert_ptr_equal(mod->compiled->identities[0].derived[0], &mod->compiled->identities[2]);
assert_ptr_equal(mod->compiled->identities[0].derived[1], &mod->compiled->identities[3]);
assert_non_null(mod->compiled->identities[1].derived);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->compiled->identities[1].derived));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->identities[1].derived));
assert_ptr_equal(mod->compiled->identities[1].derived[0], &mod->compiled->identities[2]);
assert_non_null(mod->compiled->identities[2].derived);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->compiled->identities[2].derived));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->identities[2].derived));
assert_ptr_equal(mod->compiled->identities[2].derived[0], &mod->compiled->identities[3]);
TEST_SCHEMA_OK(ctx, 1, 0, "c", "identity c2 {base c1;} identity c1;", mod);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->compiled->identities[1].derived));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->identities[1].derived));
assert_ptr_equal(mod->compiled->identities[1].derived[0], &mod->compiled->identities[0]);
TEST_SCHEMA_ERR(ctx, 0, 0, "inv", "identity i1;identity i1;", "Duplicate identifier \"i1\" of identity statement. /inv:{identity='i1'}");
@@ -179,7 +179,7 @@
"feature test {description text;reference \'another text\';status current; if-feature x; if-feature y; featureone:ext;}"
"extension ext; feature x; feature y;", mod);
assert_non_null(mod->parsed->features);
- assert_int_equal(3, LY_ARRAY_SIZE(mod->parsed->features));
+ assert_int_equal(3, LY_ARRAY_COUNT(mod->parsed->features));
/* invalid substatement */
TEST_STMT_SUBSTM_ERR(ctx, 0, "feature", "organization", "XXX");
@@ -195,7 +195,7 @@
"<reference><text>ref</text></reference>"
"<myext:ext xmlns:myext=\"urn:libyang:test:featureone-yin\"/>"
"</feature><extension name=\"ext\"/><feature name=\"iff\"/>", mod);
- assert_int_equal(2, LY_ARRAY_SIZE(mod->parsed->features));
+ assert_int_equal(2, LY_ARRAY_COUNT(mod->parsed->features));
assert_string_equal(mod->parsed->features[0].name, "feature-name");
assert_string_equal(mod->parsed->features[0].dsc, "desc");
assert_true(mod->parsed->features[0].flags & LYS_STATUS_DEPRC);
@@ -207,7 +207,7 @@
/* min subelems */
TEST_SCHEMA_OK(ctx, 0, 1, "featuretwo-yin", "<feature name=\"feature-name\"/>", mod)
- assert_int_equal(1, LY_ARRAY_SIZE(mod->parsed->features));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->parsed->features));
assert_string_equal(mod->parsed->features[0].name, "feature-name");
/* invalid substatement */
@@ -226,7 +226,7 @@
"feature f8 {if-feature \"f1 or f2 or f3 or orfeature or andfeature\";}\n"
"feature f9 {if-feature \"not not f1\";}", mod);
assert_non_null(mod->compiled->features);
- assert_int_equal(9, LY_ARRAY_SIZE(mod->compiled->features));
+ assert_int_equal(9, LY_ARRAY_COUNT(mod->compiled->features));
/* all features are disabled by default */
LY_ARRAY_FOR(mod->compiled->features, struct lysc_feature, f) {
@@ -303,16 +303,16 @@
TEST_SCHEMA_OK(ctx, 0, 0, "b", "feature f1 {if-feature f2;}feature f2;", mod);
assert_non_null(mod->compiled);
assert_non_null(mod->compiled->features);
- assert_int_equal(2, LY_ARRAY_SIZE(mod->compiled->features));
+ assert_int_equal(2, LY_ARRAY_COUNT(mod->compiled->features));
assert_non_null(mod->compiled->features[0].iffeatures);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->compiled->features[0].iffeatures));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->features[0].iffeatures));
assert_non_null(mod->compiled->features[0].iffeatures[0].features);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->compiled->features[0].iffeatures[0].features));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->features[0].iffeatures[0].features));
assert_ptr_equal(&mod->compiled->features[1], mod->compiled->features[0].iffeatures[0].features[0]);
assert_non_null(mod->compiled->features);
- assert_int_equal(2, LY_ARRAY_SIZE(mod->compiled->features));
+ assert_int_equal(2, LY_ARRAY_COUNT(mod->compiled->features));
assert_non_null(mod->compiled->features[1].depfeatures);
- assert_int_equal(1, LY_ARRAY_SIZE(mod->compiled->features[1].depfeatures));
+ assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->features[1].depfeatures));
assert_ptr_equal(&mod->compiled->features[0], mod->compiled->features[1].depfeatures[0]);
/* invalid reference */