Follow-up to vlm#379

Tommaker · Jul 7, 2020 · 46b394d · 46b394d
1 parent ca81457
commit 46b394d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,6 @@
 Full list of copyright holders:
 
+Rob Stradling <[email protected]>
 Bartosz Marcinkiewicz <[email protected]>
 Bent Nicolaisen <[email protected]>
 Bi-Ruei, Chiu <[email protected]>

diff --git a/tests/tests-asn1c-compiler/155-parameterization-more-than-two-level-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/155-parameterization-more-than-two-level-OK.asn1.-Pgen-PER
@@ -291,7 +291,7 @@ Packet_List_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
 
 	if((size >= 1 && size <= 256)) {
 		/* Perform validation of the inner elements */
-		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+		return SEQUENCE_OF_constraint(td, sptr, ctfailcb, app_key);
 	} else {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: constraint failed (%s:%d)",
@@ -376,7 +376,7 @@ UpperLayer_List_41P0_constraint(const asn_TYPE_descriptor_t *td, const void *spt
 
 	if((size >= 1 && size <= 256)) {
 		/* Perform validation of the inner elements */
-		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+		return SEQUENCE_OF_constraint(td, sptr, ctfailcb, app_key);
 	} else {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: constraint failed (%s:%d)",

diff --git a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
@@ -56,7 +56,7 @@ memb_varsets_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
 
 	if((size >= 1)) {
 		/* Perform validation of the inner elements */
-		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+		return SEQUENCE_OF_constraint(td, sptr, ctfailcb, app_key);
 	} else {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: constraint failed (%s:%d)",
@@ -383,7 +383,7 @@ memb_vset_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
 
 	if((size >= 1)) {
 		/* Perform validation of the inner elements */
-		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+		return SET_OF_constraint(td, sptr, ctfailcb, app_key);
 	} else {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: constraint failed (%s:%d)",