diff options
45 files changed, 13 insertions, 50 deletions
diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c index 82d67ef3..4d7a2149 100644 --- a/libasn1compiler/asn1c_C.c +++ b/libasn1compiler/asn1c_C.c @@ -1356,7 +1356,7 @@ asn1c_lang_C_type_SIMPLE_TYPE(arg_t *arg) { // OUT("td->check_constraints " // "= asn_DEF_%s.check_constraints;\n", // asn1c_type_name(arg, expr, TNF_SAFE)); - OUT("return td->op->check_constraints" + OUT("return td->check_constraints" "(td, sptr, ctfailcb, app_key);\n"); } INDENT(-1); diff --git a/libasn1compiler/asn1c_constraint.c b/libasn1compiler/asn1c_constraint.c index bd6087e0..75b1b8ff 100644 --- a/libasn1compiler/asn1c_constraint.c +++ b/libasn1compiler/asn1c_constraint.c @@ -211,7 +211,7 @@ asn1c_emit_constraint_checking_code(arg_t *arg) { case ASN_CONSTR_SEQUENCE_OF: case ASN_CONSTR_SET_OF: OUT("/* Perform validation of the inner elements */\n"); - OUT("return td->op->check_constraints(td, sptr, ctfailcb, app_key);\n"); + OUT("return td->check_constraints(td, sptr, ctfailcb, app_key);\n"); break; default: OUT("/* Constraint check succeeded */\n"); diff --git a/skeletons/ANY.c b/skeletons/ANY.c index 2742aadb..8a7457ee 100644 --- a/skeletons/ANY.c +++ b/skeletons/ANY.c @@ -15,7 +15,6 @@ asn_TYPE_operation_t asn_OP_ANY = { OCTET_STRING_free, OCTET_STRING_print, OCTET_STRING_compare, - asn_generic_no_constraint, OCTET_STRING_decode_ber, OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/BIT_STRING.c b/skeletons/BIT_STRING.c index 3eabf0c1..dcaeac3d 100644 --- a/skeletons/BIT_STRING.c +++ b/skeletons/BIT_STRING.c @@ -21,7 +21,6 @@ asn_TYPE_operation_t asn_OP_BIT_STRING = { OCTET_STRING_free, /* Implemented in terms of OCTET STRING */ BIT_STRING_print, BIT_STRING_compare, - BIT_STRING_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, /* Implemented in terms of OCTET STRING */ OCTET_STRING_decode_xer_binary, diff --git a/skeletons/BMPString.c b/skeletons/BMPString.c index 3236feeb..649882ee 100644 --- a/skeletons/BMPString.c +++ b/skeletons/BMPString.c @@ -27,7 +27,6 @@ asn_TYPE_operation_t asn_OP_BMPString = { OCTET_STRING_free, /* Implemented in terms of OCTET STRING */ BMPString_print, OCTET_STRING_compare, - BMPString_constraint, OCTET_STRING_decode_ber, OCTET_STRING_encode_der, BMPString_decode_xer, /* Convert from UTF-8 */ diff --git a/skeletons/BMPString.h b/skeletons/BMPString.h index 97d8305b..f465797a 100644 --- a/skeletons/BMPString.h +++ b/skeletons/BMPString.h @@ -25,7 +25,6 @@ xer_type_encoder_f BMPString_encode_xer; #define BMPString_free OCTET_STRING_free #define BMPString_print BMPString_print #define BMPString_compare OCTET_STRING_compare -#define BMPString_constraint asn_generic_no_constraint #define BMPString_decode_ber OCTET_STRING_decode_ber #define BMPString_encode_der OCTET_STRING_encode_der #define BMPString_decode_uper OCTET_STRING_decode_uper diff --git a/skeletons/BOOLEAN.c b/skeletons/BOOLEAN.c index 797eb8b7..7b941e7d 100644 --- a/skeletons/BOOLEAN.c +++ b/skeletons/BOOLEAN.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_BOOLEAN = { BOOLEAN_free, BOOLEAN_print, BOOLEAN_compare, - asn_generic_no_constraint, BOOLEAN_decode_ber, BOOLEAN_encode_der, BOOLEAN_decode_xer, diff --git a/skeletons/ENUMERATED.c b/skeletons/ENUMERATED.c index 1785b92e..4ec97c24 100644 --- a/skeletons/ENUMERATED.c +++ b/skeletons/ENUMERATED.c @@ -18,7 +18,6 @@ asn_TYPE_operation_t asn_OP_ENUMERATED = { ASN__PRIMITIVE_TYPE_free, INTEGER_print, /* Implemented in terms of INTEGER */ INTEGER_compare, /* Implemented in terms of INTEGER */ - asn_generic_no_constraint, ber_decode_primitive, INTEGER_encode_der, /* Implemented in terms of INTEGER */ INTEGER_decode_xer, /* This is temporary! */ diff --git a/skeletons/GeneralString.c b/skeletons/GeneralString.c index cc2c292a..c833dd53 100644 --- a/skeletons/GeneralString.c +++ b/skeletons/GeneralString.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_GeneralString = { OCTET_STRING_free, OCTET_STRING_print, /* non-ascii string */ OCTET_STRING_compare, - asn_generic_unknown_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/GeneralizedTime.c b/skeletons/GeneralizedTime.c index a421c25e..aeebafde 100644 --- a/skeletons/GeneralizedTime.c +++ b/skeletons/GeneralizedTime.c @@ -175,7 +175,6 @@ asn_TYPE_operation_t asn_OP_GeneralizedTime = { OCTET_STRING_free, GeneralizedTime_print, OCTET_STRING_compare, /* Does not normalize time zones! */ - GeneralizedTime_constraint, /* Check validity of time */ OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ GeneralizedTime_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/GraphicString.c b/skeletons/GraphicString.c index 88b3734e..ecf4e529 100644 --- a/skeletons/GraphicString.c +++ b/skeletons/GraphicString.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_GraphicString = { OCTET_STRING_free, OCTET_STRING_print, /* non-ascii string */ OCTET_STRING_compare, - asn_generic_unknown_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/IA5String.c b/skeletons/IA5String.c index 94578691..b0e06c30 100644 --- a/skeletons/IA5String.c +++ b/skeletons/IA5String.c @@ -21,7 +21,6 @@ asn_TYPE_operation_t asn_OP_IA5String = { OCTET_STRING_free, OCTET_STRING_print_utf8, /* ASCII subset */ OCTET_STRING_compare, - IA5String_constraint, /* Constraint on the alphabet */ OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/INTEGER.c b/skeletons/INTEGER.c index 63f94781..682e2575 100644 --- a/skeletons/INTEGER.c +++ b/skeletons/INTEGER.c @@ -18,7 +18,6 @@ asn_TYPE_operation_t asn_OP_INTEGER = { INTEGER_free, INTEGER_print, INTEGER_compare, - asn_generic_no_constraint, ber_decode_primitive, INTEGER_encode_der, INTEGER_decode_xer, diff --git a/skeletons/ISO646String.c b/skeletons/ISO646String.c index eef0284a..64455648 100644 --- a/skeletons/ISO646String.c +++ b/skeletons/ISO646String.c @@ -21,7 +21,6 @@ asn_TYPE_operation_t asn_OP_ISO646String = { OCTET_STRING_free, OCTET_STRING_print_utf8, /* ASCII subset */ OCTET_STRING_compare, - VisibleString_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/NULL.c b/skeletons/NULL.c index b9f5ea3d..39f45489 100644 --- a/skeletons/NULL.c +++ b/skeletons/NULL.c @@ -17,7 +17,6 @@ asn_TYPE_operation_t asn_OP_NULL = { BOOLEAN_free, NULL_print, NULL_compare, - asn_generic_no_constraint, BOOLEAN_decode_ber, /* Implemented in terms of BOOLEAN */ NULL_encode_der, /* Special handling of DER encoding */ NULL_decode_xer, diff --git a/skeletons/NativeEnumerated.c b/skeletons/NativeEnumerated.c index 8650f332..3087c18b 100644 --- a/skeletons/NativeEnumerated.c +++ b/skeletons/NativeEnumerated.c @@ -22,7 +22,6 @@ asn_TYPE_operation_t asn_OP_NativeEnumerated = { NativeInteger_free, NativeInteger_print, NativeInteger_compare, - asn_generic_no_constraint, NativeInteger_decode_ber, NativeInteger_encode_der, NativeInteger_decode_xer, diff --git a/skeletons/NativeInteger.c b/skeletons/NativeInteger.c index f3cd5a5f..234306cb 100644 --- a/skeletons/NativeInteger.c +++ b/skeletons/NativeInteger.c @@ -23,7 +23,6 @@ asn_TYPE_operation_t asn_OP_NativeInteger = { NativeInteger_free, NativeInteger_print, NativeInteger_compare, - asn_generic_no_constraint, NativeInteger_decode_ber, NativeInteger_encode_der, NativeInteger_decode_xer, diff --git a/skeletons/NativeReal.c b/skeletons/NativeReal.c index 838ba2dd..2a556e8f 100644 --- a/skeletons/NativeReal.c +++ b/skeletons/NativeReal.c @@ -25,7 +25,6 @@ asn_TYPE_operation_t asn_OP_NativeReal = { NativeReal_free, NativeReal_print, NativeReal_compare, - asn_generic_no_constraint, NativeReal_decode_ber, NativeReal_encode_der, NativeReal_decode_xer, diff --git a/skeletons/NumericString.c b/skeletons/NumericString.c index d08ec965..4dd4c2ff 100644 --- a/skeletons/NumericString.c +++ b/skeletons/NumericString.c @@ -41,7 +41,6 @@ asn_TYPE_operation_t asn_OP_NumericString = { OCTET_STRING_free, OCTET_STRING_print_utf8, /* ASCII subset */ OCTET_STRING_compare, - NumericString_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/OBJECT_IDENTIFIER.c b/skeletons/OBJECT_IDENTIFIER.c index 7110b0bd..ccb6b98d 100644 --- a/skeletons/OBJECT_IDENTIFIER.c +++ b/skeletons/OBJECT_IDENTIFIER.c @@ -19,7 +19,6 @@ asn_TYPE_operation_t asn_OP_OBJECT_IDENTIFIER = { ASN__PRIMITIVE_TYPE_free, OBJECT_IDENTIFIER_print, OCTET_STRING_compare, /* Implemented in terms of a string comparison */ - OBJECT_IDENTIFIER_constraint, ber_decode_primitive, der_encode_primitive, OBJECT_IDENTIFIER_decode_xer, diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c index b99d9423..75b9448b 100644 --- a/skeletons/OCTET_STRING.c +++ b/skeletons/OCTET_STRING.c @@ -28,7 +28,6 @@ asn_TYPE_operation_t asn_OP_OCTET_STRING = { OCTET_STRING_free, OCTET_STRING_print, /* OCTET STRING generally means a non-ascii sequence */ OCTET_STRING_compare, - asn_generic_no_constraint, OCTET_STRING_decode_ber, OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/OPEN_TYPE.c b/skeletons/OPEN_TYPE.c index 6a71993f..05b2d807 100644 --- a/skeletons/OPEN_TYPE.c +++ b/skeletons/OPEN_TYPE.c @@ -12,7 +12,6 @@ asn_TYPE_operation_t asn_OP_OPEN_TYPE = { OPEN_TYPE_free, OPEN_TYPE_print, OPEN_TYPE_compare, - OPEN_TYPE_constraint, OPEN_TYPE_decode_ber, OPEN_TYPE_encode_der, OPEN_TYPE_decode_xer, diff --git a/skeletons/ObjectDescriptor.c b/skeletons/ObjectDescriptor.c index 2e9a76d4..145e24a0 100644 --- a/skeletons/ObjectDescriptor.c +++ b/skeletons/ObjectDescriptor.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_ObjectDescriptor = { OCTET_STRING_free, OCTET_STRING_print_utf8, /* Treat as ASCII subset (it's not) */ OCTET_STRING_compare, - asn_generic_unknown_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/PrintableString.c b/skeletons/PrintableString.c index 10a3edd2..7c634f1e 100644 --- a/skeletons/PrintableString.c +++ b/skeletons/PrintableString.c @@ -51,7 +51,6 @@ asn_TYPE_operation_t asn_OP_PrintableString = { OCTET_STRING_free, OCTET_STRING_print_utf8, /* ASCII subset */ OCTET_STRING_compare, - PrintableString_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/REAL.c b/skeletons/REAL.c index 3767b970..f036dcd4 100644 --- a/skeletons/REAL.c +++ b/skeletons/REAL.c @@ -45,7 +45,6 @@ asn_TYPE_operation_t asn_OP_REAL = { ASN__PRIMITIVE_TYPE_free, REAL_print, REAL_compare, - asn_generic_no_constraint, ber_decode_primitive, der_encode_primitive, REAL_decode_xer, diff --git a/skeletons/RELATIVE-OID.c b/skeletons/RELATIVE-OID.c index cb763a6b..008847a0 100644 --- a/skeletons/RELATIVE-OID.c +++ b/skeletons/RELATIVE-OID.c @@ -20,7 +20,6 @@ asn_TYPE_operation_t asn_OP_RELATIVE_OID = { ASN__PRIMITIVE_TYPE_free, RELATIVE_OID_print, OCTET_STRING_compare, /* Implemented in terms of opaque comparison */ - asn_generic_no_constraint, ber_decode_primitive, der_encode_primitive, RELATIVE_OID_decode_xer, diff --git a/skeletons/T61String.c b/skeletons/T61String.c index ae09e8b9..efb7df82 100644 --- a/skeletons/T61String.c +++ b/skeletons/T61String.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_T61String = { OCTET_STRING_free, OCTET_STRING_print, /* non-ascii string */ OCTET_STRING_compare, - asn_generic_unknown_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/TeletexString.c b/skeletons/TeletexString.c index 5e6aeaf2..31f84338 100644 --- a/skeletons/TeletexString.c +++ b/skeletons/TeletexString.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_TeletexString = { OCTET_STRING_free, OCTET_STRING_print, /* non-ascii string */ OCTET_STRING_compare, - asn_generic_unknown_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/UTCTime.c b/skeletons/UTCTime.c index 61caf2ea..32c58178 100644 --- a/skeletons/UTCTime.c +++ b/skeletons/UTCTime.c @@ -32,7 +32,6 @@ asn_TYPE_operation_t asn_OP_UTCTime = { OCTET_STRING_free, UTCTime_print, OCTET_STRING_compare, /* Does not deal with time zones. */ - UTCTime_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, /* Implemented in terms of OCTET STRING */ OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/UTF8String.c b/skeletons/UTF8String.c index a89a89e7..7a6de6d0 100644 --- a/skeletons/UTF8String.c +++ b/skeletons/UTF8String.c @@ -17,7 +17,6 @@ asn_TYPE_operation_t asn_OP_UTF8String = { OCTET_STRING_free, UTF8String_print, OCTET_STRING_compare, - UTF8String_constraint, /* Check for invalid codes, etc. */ OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/UniversalString.c b/skeletons/UniversalString.c index 45ba4378..88d54c6a 100644 --- a/skeletons/UniversalString.c +++ b/skeletons/UniversalString.c @@ -27,7 +27,6 @@ asn_TYPE_operation_t asn_OP_UniversalString = { OCTET_STRING_free, UniversalString_print, /* Convert into UTF8 and print */ OCTET_STRING_compare, - UniversalString_constraint, OCTET_STRING_decode_ber, OCTET_STRING_encode_der, UniversalString_decode_xer, /* Convert from UTF-8 */ diff --git a/skeletons/VideotexString.c b/skeletons/VideotexString.c index c3de329e..6e4fc365 100644 --- a/skeletons/VideotexString.c +++ b/skeletons/VideotexString.c @@ -16,7 +16,6 @@ asn_TYPE_operation_t asn_OP_VideotexString = { OCTET_STRING_free, OCTET_STRING_print, /* non-ascii string */ OCTET_STRING_compare, - asn_generic_unknown_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, diff --git a/skeletons/VisibleString.c b/skeletons/VisibleString.c index 214848ad..f8d651bb 100644 --- a/skeletons/VisibleString.c +++ b/skeletons/VisibleString.c @@ -21,7 +21,6 @@ asn_TYPE_operation_t asn_OP_VisibleString = { OCTET_STRING_free, OCTET_STRING_print_utf8, /* ASCII subset */ OCTET_STRING_compare, - VisibleString_constraint, OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, diff --git a/skeletons/constr_CHOICE.c b/skeletons/constr_CHOICE.c index d6b6141d..3d0cbbe4 100644 --- a/skeletons/constr_CHOICE.c +++ b/skeletons/constr_CHOICE.c @@ -1243,7 +1243,6 @@ asn_TYPE_operation_t asn_OP_CHOICE = { CHOICE_free, CHOICE_print, CHOICE_compare, - CHOICE_constraint, CHOICE_decode_ber, CHOICE_encode_der, CHOICE_decode_xer, diff --git a/skeletons/constr_SEQUENCE.c b/skeletons/constr_SEQUENCE.c index 2924823b..a810f3d2 100644 --- a/skeletons/constr_SEQUENCE.c +++ b/skeletons/constr_SEQUENCE.c @@ -1524,7 +1524,6 @@ asn_TYPE_operation_t asn_OP_SEQUENCE = { SEQUENCE_free, SEQUENCE_print, SEQUENCE_compare, - SEQUENCE_constraint, SEQUENCE_decode_ber, SEQUENCE_encode_der, SEQUENCE_decode_xer, diff --git a/skeletons/constr_SEQUENCE_OF.c b/skeletons/constr_SEQUENCE_OF.c index d267c3f8..3b9c1f58 100644 --- a/skeletons/constr_SEQUENCE_OF.c +++ b/skeletons/constr_SEQUENCE_OF.c @@ -211,7 +211,6 @@ asn_TYPE_operation_t asn_OP_SEQUENCE_OF = { SEQUENCE_OF_free, SEQUENCE_OF_print, SEQUENCE_OF_compare, - SEQUENCE_OF_constraint, SEQUENCE_OF_decode_ber, SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, diff --git a/skeletons/constr_SET.c b/skeletons/constr_SET.c index 69037a60..a0bacb58 100644 --- a/skeletons/constr_SET.c +++ b/skeletons/constr_SET.c @@ -1055,7 +1055,6 @@ asn_TYPE_operation_t asn_OP_SET = { SET_free, SET_print, SET_compare, - SET_constraint, SET_decode_ber, SET_encode_der, SET_decode_xer, diff --git a/skeletons/constr_SET_OF.c b/skeletons/constr_SET_OF.c index 340c35c7..c24a956c 100644 --- a/skeletons/constr_SET_OF.c +++ b/skeletons/constr_SET_OF.c @@ -976,7 +976,6 @@ asn_TYPE_operation_t asn_OP_SET_OF = { SET_OF_free, SET_OF_print, SET_OF_compare, - SET_OF_constraint, SET_OF_decode_ber, SET_OF_encode_der, SET_OF_decode_xer, diff --git a/skeletons/constr_TYPE.h b/skeletons/constr_TYPE.h index b0b4e0e4..742798ee 100644 --- a/skeletons/constr_TYPE.h +++ b/skeletons/constr_TYPE.h @@ -145,7 +145,6 @@ typedef struct asn_TYPE_operation_s { asn_struct_free_f *free_struct; /* Free the structure */ asn_struct_print_f *print_struct; /* Human readable output */ asn_struct_compare_f *compare_struct; /* Compare two structures */ - asn_constr_check_f *check_constraints; /* Constraints validator */ ber_type_decoder_f *ber_decoder; /* Generic BER decoder */ der_type_encoder_f *der_encoder; /* Canonical DER encoder */ xer_type_decoder_f *xer_decoder; /* Generic XER decoder */ diff --git a/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P b/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P index b522fe2b..67ab3fdf 100644 --- a/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P @@ -47,7 +47,7 @@ T_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR index e17981f1..5b965c15 100644 --- 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(asn_TYPE_descriptor_t *td, const void *sptr, if((size >= 1)) { /* Perform validation of the inner elements */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } else { ASN__CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", @@ -405,7 +405,7 @@ memb_vset_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, if((size >= 1)) { /* Perform validation of the inner elements */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } else { ASN__CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P index 2767118c..8339f07a 100644 --- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P @@ -86,7 +86,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types index 85146a28..eae562df 100644 --- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types @@ -88,7 +88,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER index c6bdd60d..120c8494 100644 --- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER @@ -90,7 +90,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE b/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE index ba327b8a..e24c261d 100644 --- a/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE +++ b/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE @@ -37,7 +37,7 @@ OK_Integer1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -106,7 +106,7 @@ OK_Integer2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -175,7 +175,7 @@ OK_Integer3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -244,7 +244,7 @@ OK_Integer4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -313,7 +313,7 @@ NO_Integer5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, } /* Replace with underlying type checker */ - return td->op->check_constraints(td, sptr, ctfailcb, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* |