diff options
Diffstat (limited to 'tests')
27 files changed, 527 insertions, 233 deletions
diff --git a/tests/105-param-2-OK.asn1.-P b/tests/105-param-2-OK.asn1.-P index 009a0773..08b5d662 100644 --- a/tests/105-param-2-OK.asn1.-P +++ b/tests/105-param-2-OK.asn1.-P @@ -227,10 +227,10 @@ xer_type_encoder_f SignedREAL_encode_xer; int SignedREAL_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_SIGNED_16P0.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -350,10 +350,10 @@ xer_type_encoder_f SignedSET_encode_xer; int SignedSET_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_SIGNED_16P1.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/106-param-constr-OK.asn1.-P b/tests/106-param-constr-OK.asn1.-P index db115163..545e1637 100644 --- a/tests/106-param-constr-OK.asn1.-P +++ b/tests/106-param-constr-OK.asn1.-P @@ -23,7 +23,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Narrow_15P0; static int memb_narrow1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -48,7 +48,7 @@ memb_narrow1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_narrow2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -73,7 +73,7 @@ memb_narrow2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_narrow3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -205,10 +205,10 @@ xer_type_encoder_f NarrowInteger_encode_xer; int NarrowInteger_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Narrow_15P0.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/108-param-constr-3-OK.asn1.-P b/tests/108-param-constr-3-OK.asn1.-P index ee5a5042..0f00d5da 100644 --- a/tests/108-param-constr-3-OK.asn1.-P +++ b/tests/108-param-constr-3-OK.asn1.-P @@ -22,7 +22,7 @@ xer_type_encoder_f MinMax_16P0_encode_xer; int MinMax_16P0_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -168,7 +168,7 @@ xer_type_encoder_f ThreePlus_encode_xer; int ThreePlus_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const MinMax_16P0_t *st = (const MinMax_16P0_t *)sptr; long value; diff --git a/tests/110-param-3-OK.asn1.-P b/tests/110-param-3-OK.asn1.-P index 37ab930e..429bf583 100644 --- a/tests/110-param-3-OK.asn1.-P +++ b/tests/110-param-3-OK.asn1.-P @@ -43,10 +43,10 @@ extern asn_TYPE_descriptor_t asn_DEF_Flag_16P1; static int field_7_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -306,10 +306,10 @@ xer_type_encoder_f IntegerColorFlag_encode_xer; int IntegerColorFlag_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Flag_16P0.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -429,10 +429,10 @@ xer_type_encoder_f EnumeratedColorFlag_encode_xer; int EnumeratedColorFlag_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Flag_16P1.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P index 272cceec..a11ef62f 100644 --- a/tests/19-param-OK.asn1.-P +++ b/tests/19-param-OK.asn1.-P @@ -33,7 +33,7 @@ extern asn_TYPE_descriptor_t asn_DEF_SIGNED_15P0; static int memb_signature_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const BIT_STRING_t *st = (const BIT_STRING_t *)sptr; size_t size; @@ -230,10 +230,10 @@ xer_type_encoder_f Certificate_encode_xer; int Certificate_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_SIGNED_15P0.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -453,7 +453,7 @@ static int check_permitted_alphabet_2(const void *sptr) { static int memb_IA5String_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { diff --git a/tests/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF index 1fa4e101..d0059b21 100644 --- a/tests/32-sequence-of-OK.asn1.-EF +++ b/tests/32-sequence-of-OK.asn1.-EF @@ -13,4 +13,14 @@ Error ::= SEQUENCE { maxSize INTEGER ::= 10 +SeqWithMandatory ::= SEQUENCE { + someString UTF8String, + seqOfMan [0] EXPLICIT SEQUENCE OF Error +} + +SeqWithOptional ::= SEQUENCE { + someString UTF8String, + seqOfOpt [0] EXPLICIT SEQUENCE OF Error OPTIONAL +} + END diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P index fd34d5f4..e95c541a 100644 --- a/tests/32-sequence-of-OK.asn1.-P +++ b/tests/32-sequence-of-OK.asn1.-P @@ -200,3 +200,287 @@ asn_TYPE_descriptor_t asn_DEF_Error = { &asn_SPC_Error_specs_1 /* Additional specs */ }; + +/*** <<< INCLUDES [SeqWithMandatory] >>> ***/ + +#include <UTF8String.h> +#include <asn_SEQUENCE_OF.h> +#include <constr_SEQUENCE_OF.h> +#include <constr_SEQUENCE.h> + +/*** <<< FWD-DECLS [SeqWithMandatory] >>> ***/ + +struct Error; + +/*** <<< TYPE-DECLS [SeqWithMandatory] >>> ***/ + +typedef struct SeqWithMandatory { + UTF8String_t someString; + struct seqOfMan { + A_SEQUENCE_OF(struct Error) list; + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; + } seqOfMan; + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} SeqWithMandatory_t; + +/*** <<< FUNC-DECLS [SeqWithMandatory] >>> ***/ + +extern asn_TYPE_descriptor_t asn_DEF_SeqWithMandatory; + +/*** <<< POST-INCLUDE [SeqWithMandatory] >>> ***/ + +#include <Error.h> + +/*** <<< STAT-DEFS [SeqWithMandatory] >>> ***/ + +static asn_TYPE_member_t asn_MBR_seqOfMan_3[] = { + { ATF_POINTER, 0, 0, + .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + .tag_mode = 0, + .type = &asn_DEF_Error, + .memb_constraints = 0, /* Defer constraints checking to the member type */ + .per_constraints = 0, /* PER is not compiled, use -gen-PER */ + .default_value = 0, + .name = "" + }, +}; +static ber_tlv_tag_t asn_DEF_seqOfMan_tags_3[] = { + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_SET_OF_specifics_t asn_SPC_seqOfMan_specs_3 = { + sizeof(struct seqOfMan), + offsetof(struct seqOfMan, _asn_ctx), + 0, /* XER encoding is XMLDelimitedItemList */ +}; +static /* Use -fall-defs-global to expose */ +asn_TYPE_descriptor_t asn_DEF_seqOfMan_3 = { + "seqOfMan", + "seqOfMan", + SEQUENCE_OF_free, + SEQUENCE_OF_print, + SEQUENCE_OF_constraint, + SEQUENCE_OF_decode_ber, + SEQUENCE_OF_encode_der, + SEQUENCE_OF_decode_xer, + SEQUENCE_OF_encode_xer, + 0, /* No PER decoder, -gen-PER to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_seqOfMan_tags_3, + sizeof(asn_DEF_seqOfMan_tags_3) + /sizeof(asn_DEF_seqOfMan_tags_3[0]), /* 2 */ + asn_DEF_seqOfMan_tags_3, /* Same as above */ + sizeof(asn_DEF_seqOfMan_tags_3) + /sizeof(asn_DEF_seqOfMan_tags_3[0]), /* 2 */ + 0, /* No PER visible constraints */ + asn_MBR_seqOfMan_3, + 1, /* Single element */ + &asn_SPC_seqOfMan_specs_3 /* Additional specs */ +}; + +static asn_TYPE_member_t asn_MBR_SeqWithMandatory_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct SeqWithMandatory, someString), + .tag = (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), + .tag_mode = 0, + .type = &asn_DEF_UTF8String, + .memb_constraints = 0, /* Defer constraints checking to the member type */ + .per_constraints = 0, /* PER is not compiled, use -gen-PER */ + .default_value = 0, + .name = "someString" + }, + { ATF_NOFLAGS, 0, offsetof(struct SeqWithMandatory, seqOfMan), + .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + .tag_mode = +1, /* EXPLICIT tag at current level */ + .type = &asn_DEF_seqOfMan_3, + .memb_constraints = 0, /* Defer constraints checking to the member type */ + .per_constraints = 0, /* PER is not compiled, use -gen-PER */ + .default_value = 0, + .name = "seqOfMan" + }, +}; +static ber_tlv_tag_t asn_DEF_SeqWithMandatory_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_TYPE_tag2member_t asn_MAP_SeqWithMandatory_tag2el_1[] = { + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 }, /* someString at 25 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 } /* seqOfMan at 27 */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_SeqWithMandatory_specs_1 = { + sizeof(struct SeqWithMandatory), + offsetof(struct SeqWithMandatory, _asn_ctx), + asn_MAP_SeqWithMandatory_tag2el_1, + 2, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + -1, /* Start extensions */ + -1 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_SeqWithMandatory = { + "SeqWithMandatory", + "SeqWithMandatory", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, /* No PER decoder, -gen-PER to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_SeqWithMandatory_tags_1, + sizeof(asn_DEF_SeqWithMandatory_tags_1) + /sizeof(asn_DEF_SeqWithMandatory_tags_1[0]), /* 1 */ + asn_DEF_SeqWithMandatory_tags_1, /* Same as above */ + sizeof(asn_DEF_SeqWithMandatory_tags_1) + /sizeof(asn_DEF_SeqWithMandatory_tags_1[0]), /* 1 */ + 0, /* No PER visible constraints */ + asn_MBR_SeqWithMandatory_1, + 2, /* Elements count */ + &asn_SPC_SeqWithMandatory_specs_1 /* Additional specs */ +}; + + +/*** <<< INCLUDES [SeqWithOptional] >>> ***/ + +#include <UTF8String.h> +#include <asn_SEQUENCE_OF.h> +#include <constr_SEQUENCE_OF.h> +#include <constr_SEQUENCE.h> + +/*** <<< FWD-DECLS [SeqWithOptional] >>> ***/ + +struct Error; + +/*** <<< TYPE-DECLS [SeqWithOptional] >>> ***/ + +typedef struct SeqWithOptional { + UTF8String_t someString; + struct seqOfOpt { + A_SEQUENCE_OF(struct Error) list; + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; + } *seqOfOpt; + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} SeqWithOptional_t; + +/*** <<< FUNC-DECLS [SeqWithOptional] >>> ***/ + +extern asn_TYPE_descriptor_t asn_DEF_SeqWithOptional; + +/*** <<< POST-INCLUDE [SeqWithOptional] >>> ***/ + +#include <Error.h> + +/*** <<< STAT-DEFS [SeqWithOptional] >>> ***/ + +static asn_TYPE_member_t asn_MBR_seqOfOpt_3[] = { + { ATF_POINTER, 0, 0, + .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + .tag_mode = 0, + .type = &asn_DEF_Error, + .memb_constraints = 0, /* Defer constraints checking to the member type */ + .per_constraints = 0, /* PER is not compiled, use -gen-PER */ + .default_value = 0, + .name = "" + }, +}; +static ber_tlv_tag_t asn_DEF_seqOfOpt_tags_3[] = { + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_SET_OF_specifics_t asn_SPC_seqOfOpt_specs_3 = { + sizeof(struct seqOfOpt), + offsetof(struct seqOfOpt, _asn_ctx), + 0, /* XER encoding is XMLDelimitedItemList */ +}; +static /* Use -fall-defs-global to expose */ +asn_TYPE_descriptor_t asn_DEF_seqOfOpt_3 = { + "seqOfOpt", + "seqOfOpt", + SEQUENCE_OF_free, + SEQUENCE_OF_print, + SEQUENCE_OF_constraint, + SEQUENCE_OF_decode_ber, + SEQUENCE_OF_encode_der, + SEQUENCE_OF_decode_xer, + SEQUENCE_OF_encode_xer, + 0, /* No PER decoder, -gen-PER to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_seqOfOpt_tags_3, + sizeof(asn_DEF_seqOfOpt_tags_3) + /sizeof(asn_DEF_seqOfOpt_tags_3[0]), /* 2 */ + asn_DEF_seqOfOpt_tags_3, /* Same as above */ + sizeof(asn_DEF_seqOfOpt_tags_3) + /sizeof(asn_DEF_seqOfOpt_tags_3[0]), /* 2 */ + 0, /* No PER visible constraints */ + asn_MBR_seqOfOpt_3, + 1, /* Single element */ + &asn_SPC_seqOfOpt_specs_3 /* Additional specs */ +}; + +static asn_TYPE_member_t asn_MBR_SeqWithOptional_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct SeqWithOptional, someString), + .tag = (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), + .tag_mode = 0, + .type = &asn_DEF_UTF8String, + .memb_constraints = 0, /* Defer constraints checking to the member type */ + .per_constraints = 0, /* PER is not compiled, use -gen-PER */ + .default_value = 0, + .name = "someString" + }, + { ATF_POINTER, 1, offsetof(struct SeqWithOptional, seqOfOpt), + .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + .tag_mode = +1, /* EXPLICIT tag at current level */ + .type = &asn_DEF_seqOfOpt_3, + .memb_constraints = 0, /* Defer constraints checking to the member type */ + .per_constraints = 0, /* PER is not compiled, use -gen-PER */ + .default_value = 0, + .name = "seqOfOpt" + }, +}; +static ber_tlv_tag_t asn_DEF_SeqWithOptional_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_TYPE_tag2member_t asn_MAP_SeqWithOptional_tag2el_1[] = { + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 }, /* someString at 30 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 } /* seqOfOpt at 31 */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_SeqWithOptional_specs_1 = { + sizeof(struct SeqWithOptional), + offsetof(struct SeqWithOptional, _asn_ctx), + asn_MAP_SeqWithOptional_tag2el_1, + 2, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + -1, /* Start extensions */ + -1 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_SeqWithOptional = { + "SeqWithOptional", + "SeqWithOptional", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, /* No PER decoder, -gen-PER to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_SeqWithOptional_tags_1, + sizeof(asn_DEF_SeqWithOptional_tags_1) + /sizeof(asn_DEF_SeqWithOptional_tags_1[0]), /* 1 */ + asn_DEF_SeqWithOptional_tags_1, /* Same as above */ + sizeof(asn_DEF_SeqWithOptional_tags_1) + /sizeof(asn_DEF_SeqWithOptional_tags_1[0]), /* 1 */ + 0, /* No PER visible constraints */ + asn_MBR_SeqWithOptional_1, + 2, /* Elements count */ + &asn_SPC_SeqWithOptional_specs_1 /* Additional specs */ +}; + diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index 7e752afe..37b5858e 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -41,7 +41,7 @@ extern asn_TYPE_descriptor_t asn_DEF_LogLine; static int memb_varsets_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { size_t size; if(!sptr) { @@ -215,7 +215,7 @@ extern asn_TYPE_descriptor_t asn_DEF_VariablePartSet; static int memb_vparts_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -229,7 +229,7 @@ memb_vparts_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Nothing is here. See below */ } - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } @@ -397,7 +397,7 @@ extern asn_TYPE_descriptor_t asn_DEF_VariablePart; static int memb_vset_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { size_t size; if(!sptr) { @@ -644,10 +644,10 @@ extern asn_TYPE_descriptor_t asn_DEF_ActionItem; static int accept_as_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR index 449707e2..426a9dbb 100644 --- a/tests/46-redefine-OK.asn1.-PR +++ b/tests/46-redefine-OK.asn1.-PR @@ -22,10 +22,10 @@ xer_type_encoder_f PrimitiveType_encode_xer; int PrimitiveType_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_OCTET_STRING.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -216,10 +216,10 @@ xer_type_encoder_f T_encode_xer; int T_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ConstructedType.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/50-constraint-OK.asn1.-P b/tests/50-constraint-OK.asn1.-P index 6426a939..43fe3ef5 100644 --- a/tests/50-constraint-OK.asn1.-P +++ b/tests/50-constraint-OK.asn1.-P @@ -22,10 +22,10 @@ xer_type_encoder_f Int1_encode_xer; int Int1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -145,7 +145,7 @@ xer_type_encoder_f Int2_encode_xer; int Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int1_t *st = (const Int1_t *)sptr; long value; @@ -287,7 +287,7 @@ xer_type_encoder_f Int3_encode_xer; int Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int2_t *st = (const Int2_t *)sptr; long value; @@ -433,7 +433,7 @@ xer_type_encoder_f Int4_encode_xer; int Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int3_t *st = (const Int3_t *)sptr; long value; @@ -579,7 +579,7 @@ xer_type_encoder_f Int5_encode_xer; int Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int4_t *st = (const Int4_t *)sptr; long value; @@ -725,7 +725,7 @@ xer_type_encoder_f ExtensibleExtensions_encode_xer; int ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -871,10 +871,10 @@ xer_type_encoder_f Str1_encode_xer; int Str1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_IA5String.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -1010,7 +1010,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Str1_t *st = (const Str1_t *)sptr; size_t size; @@ -1179,7 +1179,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Str2_t *st = (const Str2_t *)sptr; size_t size; @@ -1337,7 +1337,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { @@ -1492,7 +1492,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { @@ -1647,7 +1647,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -1802,7 +1802,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -1957,7 +1957,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2112,7 +2112,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2267,7 +2267,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; size_t size; @@ -2425,7 +2425,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; size_t size; @@ -2583,7 +2583,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2732,7 +2732,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Utf8_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const UTF8String_t *st = (const UTF8String_t *)sptr; if(!sptr) { @@ -2900,7 +2900,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Utf8_2_t *st = (const Utf8_2_t *)sptr; size_t size; @@ -3048,7 +3048,7 @@ xer_type_encoder_f Utf8_2_encode_xer; int Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Utf8_1_t *st = (const Utf8_1_t *)sptr; size_t size; @@ -3195,10 +3195,10 @@ xer_type_encoder_f Utf8_1_encode_xer; int Utf8_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_UTF8String.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -3346,7 +3346,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Identifier_t *st = (const Identifier_t *)sptr; size_t size; @@ -3514,10 +3514,10 @@ extern asn_TYPE_descriptor_t asn_DEF_Sequence; static int enum_c_6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -3586,7 +3586,7 @@ enum_c_6_encode_xer(asn_TYPE_descriptor_t *td, void *structure, static int memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int1_t *st = (const Int1_t *)sptr; long value; @@ -3617,7 +3617,7 @@ memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int4_t *st = (const Int4_t *)sptr; long value; @@ -3648,7 +3648,7 @@ memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int5_t *st = (const Int5_t *)sptr; long value; @@ -3962,10 +3962,10 @@ xer_type_encoder_f Enum0_encode_xer; int Enum0_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -4107,7 +4107,7 @@ xer_type_encoder_f Enum1_encode_xer; int Enum1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -4290,7 +4290,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const VisibleString_t *st = (const VisibleString_t *)sptr; size_t size; diff --git a/tests/50-constraint-OK.asn1.-Pgen-PER b/tests/50-constraint-OK.asn1.-Pgen-PER index 5092b01b..7f9affba 100644 --- a/tests/50-constraint-OK.asn1.-Pgen-PER +++ b/tests/50-constraint-OK.asn1.-Pgen-PER @@ -23,10 +23,10 @@ per_type_decoder_f Int1_decode_uper; int Int1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -154,7 +154,7 @@ per_type_decoder_f Int2_decode_uper; int Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int1_t *st = (const Int1_t *)sptr; long value; @@ -308,7 +308,7 @@ per_type_decoder_f Int3_decode_uper; int Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int2_t *st = (const Int2_t *)sptr; long value; @@ -466,7 +466,7 @@ per_type_decoder_f Int4_decode_uper; int Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int3_t *st = (const Int3_t *)sptr; long value; @@ -624,7 +624,7 @@ per_type_decoder_f Int5_decode_uper; int Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int4_t *st = (const Int4_t *)sptr; long value; @@ -782,7 +782,7 @@ per_type_decoder_f ExtensibleExtensions_decode_uper; int ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -940,10 +940,10 @@ per_type_decoder_f Str1_decode_uper; int Str1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_IA5String.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -1087,7 +1087,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Str1_t *st = (const Str1_t *)sptr; size_t size; @@ -1268,7 +1268,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Str2_t *st = (const Str2_t *)sptr; size_t size; @@ -1438,7 +1438,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { @@ -1605,7 +1605,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { @@ -1772,7 +1772,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -1939,7 +1939,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2106,7 +2106,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2273,7 +2273,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2440,7 +2440,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; size_t size; @@ -2610,7 +2610,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; size_t size; @@ -2780,7 +2780,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { @@ -2941,7 +2941,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Utf8_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const UTF8String_t *st = (const UTF8String_t *)sptr; if(!sptr) { @@ -3121,7 +3121,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Utf8_2_t *st = (const Utf8_2_t *)sptr; size_t size; @@ -3281,7 +3281,7 @@ per_type_decoder_f Utf8_2_decode_uper; int Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Utf8_1_t *st = (const Utf8_1_t *)sptr; size_t size; @@ -3440,10 +3440,10 @@ per_type_decoder_f Utf8_1_decode_uper; int Utf8_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_UTF8String.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -3599,7 +3599,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Identifier_t *st = (const Identifier_t *)sptr; size_t size; @@ -3774,10 +3774,10 @@ extern asn_TYPE_descriptor_t asn_DEF_Sequence; static int enum_c_6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -3853,7 +3853,7 @@ enum_c_6_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, static int memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int1_t *st = (const Int1_t *)sptr; long value; @@ -3884,7 +3884,7 @@ memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int4_t *st = (const Int4_t *)sptr; long value; @@ -3915,7 +3915,7 @@ memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const Int5_t *st = (const Int5_t *)sptr; long value; @@ -4256,10 +4256,10 @@ per_type_decoder_f Enum0_decode_uper; int Enum0_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -4413,7 +4413,7 @@ per_type_decoder_f Enum1_decode_uper; int Enum1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -4608,7 +4608,7 @@ static int check_permitted_alphabet_1(const void *sptr) { int Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const VisibleString_t *st = (const VisibleString_t *)sptr; size_t size; diff --git a/tests/65-multi-tag-OK.asn1.-P b/tests/65-multi-tag-OK.asn1.-P index f4b39077..a77bd3e2 100644 --- a/tests/65-multi-tag-OK.asn1.-P +++ b/tests/65-multi-tag-OK.asn1.-P @@ -22,10 +22,10 @@ xer_type_encoder_f T1_encode_xer; int T1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T2.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -156,10 +156,10 @@ xer_type_encoder_f T2_encode_xer; int T2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T3.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -288,10 +288,10 @@ xer_type_encoder_f T3_encode_xer; int T3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T4.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -418,10 +418,10 @@ xer_type_encoder_f T4_encode_xer; int T4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T5.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -543,10 +543,10 @@ xer_type_encoder_f T5_encode_xer; int T5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T6.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -667,10 +667,10 @@ xer_type_encoder_f T6_encode_xer; int T6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_REAL.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -790,10 +790,10 @@ xer_type_encoder_f T_encode_xer; int T_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Ts.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types index fd5b46fb..76642fb2 100644 --- a/tests/65-multi-tag-OK.asn1.-Pfnative-types +++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types @@ -22,10 +22,10 @@ xer_type_encoder_f T1_encode_xer; int T1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T2.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -156,10 +156,10 @@ xer_type_encoder_f T2_encode_xer; int T2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T3.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -288,10 +288,10 @@ xer_type_encoder_f T3_encode_xer; int T3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T4.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -418,10 +418,10 @@ xer_type_encoder_f T4_encode_xer; int T4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T5.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -543,10 +543,10 @@ xer_type_encoder_f T5_encode_xer; int T5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_T6.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -667,10 +667,10 @@ xer_type_encoder_f T6_encode_xer; int T6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeReal.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -790,10 +790,10 @@ xer_type_encoder_f T_encode_xer; int T_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Ts.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/66-ref-simple-OK.asn1.-P b/tests/66-ref-simple-OK.asn1.-P index b424e478..b6dc5ced 100644 --- a/tests/66-ref-simple-OK.asn1.-P +++ b/tests/66-ref-simple-OK.asn1.-P @@ -95,10 +95,10 @@ xer_type_encoder_f SimpleType_encode_xer; int SimpleType_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/69-reserved-words-OK.asn1.-P b/tests/69-reserved-words-OK.asn1.-P index 897295d7..f6f4168c 100644 --- a/tests/69-reserved-words-OK.asn1.-P +++ b/tests/69-reserved-words-OK.asn1.-P @@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_T; static int memb_char_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr; size_t size; diff --git a/tests/70-xer-test-OK.asn1.-P b/tests/70-xer-test-OK.asn1.-P index b3d2ff9c..a5a4d608 100644 --- a/tests/70-xer-test-OK.asn1.-P +++ b/tests/70-xer-test-OK.asn1.-P @@ -528,10 +528,10 @@ extern asn_TYPE_descriptor_t asn_DEF_ExtensibleSet; static int enum_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -1057,10 +1057,10 @@ extern asn_TYPE_descriptor_t asn_DEF_SetOfEnums; static int Member_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -1377,10 +1377,10 @@ extern asn_TYPE_descriptor_t asn_DEF_NamedSetOfEnums; static int name_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/72-same-names-OK.asn1.-P b/tests/72-same-names-OK.asn1.-P index 4b804ea9..3ef0465d 100644 --- a/tests/72-same-names-OK.asn1.-P +++ b/tests/72-same-names-OK.asn1.-P @@ -411,7 +411,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Type2; static int memb_a_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const BIT_STRING_t *st = (const BIT_STRING_t *)sptr; size_t size; @@ -442,7 +442,7 @@ memb_a_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_a_constraint_8(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const BIT_STRING_t *st = (const BIT_STRING_t *)sptr; size_t size; diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P index 5fe6fc33..d9852b8c 100644 --- a/tests/73-circular-OK.asn1.-P +++ b/tests/73-circular-OK.asn1.-P @@ -151,10 +151,10 @@ xer_type_encoder_f EpytRef_encode_xer; int EpytRef_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Epyt.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -494,7 +494,7 @@ static int check_permitted_alphabet_7(const void *sptr) { static int memb_patest1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { @@ -518,7 +518,7 @@ memb_patest1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_patest2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { @@ -724,10 +724,10 @@ xer_type_encoder_f EnumType_encode_xer; int EnumType_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_ENUMERATED.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/84-param-tags-OK.asn1.-P b/tests/84-param-tags-OK.asn1.-P index d3a61c67..4c684850 100644 --- a/tests/84-param-tags-OK.asn1.-P +++ b/tests/84-param-tags-OK.asn1.-P @@ -29,7 +29,7 @@ extern asn_TYPE_descriptor_t asn_DEF_TestType_16P1; static int memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -299,7 +299,7 @@ extern asn_TYPE_descriptor_t asn_DEF_AutoType_34P1; static int memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -324,7 +324,7 @@ memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, static int memb_common_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { BOOLEAN_t value; if(!sptr) { diff --git a/tests/88-integer-enum-OK.asn1.-P b/tests/88-integer-enum-OK.asn1.-P index bbd437aa..af25491d 100644 --- a/tests/88-integer-enum-OK.asn1.-P +++ b/tests/88-integer-enum-OK.asn1.-P @@ -29,10 +29,10 @@ xer_type_encoder_f T_encode_xer; int T_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/90-cond-int-type-OK.asn1.-P b/tests/90-cond-int-type-OK.asn1.-P index aae3b126..ebcfb63f 100644 --- a/tests/90-cond-int-type-OK.asn1.-P +++ b/tests/90-cond-int-type-OK.asn1.-P @@ -22,10 +22,10 @@ xer_type_encoder_f CN_IntegerUnlimited_encode_xer; int CN_IntegerUnlimited_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -145,7 +145,7 @@ xer_type_encoder_f CN_IntegerMinMax_encode_xer; int CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; if(!sptr) { @@ -162,7 +162,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -282,7 +282,7 @@ xer_type_encoder_f CN_IntegerMinLow_encode_xer; int CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -428,7 +428,7 @@ xer_type_encoder_f NO_IntegerMinHigh_encode_xer; int NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -574,7 +574,7 @@ xer_type_encoder_f NO_IntegerLowHigh_encode_xer; int NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -720,7 +720,7 @@ xer_type_encoder_f CN_IntegerLowMax_encode_xer; int CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -866,7 +866,7 @@ xer_type_encoder_f NO_IntegerHighMax_encode_xer; int NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1012,7 +1012,7 @@ xer_type_encoder_f NO_IntegerLowestMax_encode_xer; int NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1158,7 +1158,7 @@ xer_type_encoder_f NO_IntegerOutRange_encode_xer; int NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1304,7 +1304,7 @@ xer_type_encoder_f NO_IntegerOutValue_encode_xer; int NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1450,7 +1450,7 @@ xer_type_encoder_f OK_IntegerInRange1_encode_xer; int OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1590,7 +1590,7 @@ xer_type_encoder_f OK_IntegerInRange2_encode_xer; int OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1730,7 +1730,7 @@ xer_type_encoder_f OK_IntegerInRange3_encode_xer; int OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1870,7 +1870,7 @@ xer_type_encoder_f OK_IntegerInRange4_encode_xer; int OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -2010,7 +2010,7 @@ xer_type_encoder_f OK_IntegerInRange5_encode_xer; int OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -2156,7 +2156,7 @@ xer_type_encoder_f NO_IntegerInRange6_encode_xer; int NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -2309,10 +2309,10 @@ xer_type_encoder_f CN_IntegerEnumerated1_encode_xer; int CN_IntegerEnumerated1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -2439,10 +2439,10 @@ xer_type_encoder_f NO_IntegerEnumerated2_encode_xer; int NO_IntegerEnumerated2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/90-cond-int-type-OK.asn1.-Pfnative-types b/tests/90-cond-int-type-OK.asn1.-Pfnative-types index 765d2847..efcd3dc6 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pfnative-types +++ b/tests/90-cond-int-type-OK.asn1.-Pfnative-types @@ -22,10 +22,10 @@ xer_type_encoder_f CN_IntegerUnlimited_encode_xer; int CN_IntegerUnlimited_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -145,7 +145,7 @@ xer_type_encoder_f CN_IntegerMinMax_encode_xer; int CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -161,7 +161,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -281,7 +281,7 @@ xer_type_encoder_f CN_IntegerMinLow_encode_xer; int CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -421,7 +421,7 @@ xer_type_encoder_f NO_IntegerMinHigh_encode_xer; int NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -567,7 +567,7 @@ xer_type_encoder_f NO_IntegerLowHigh_encode_xer; int NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -713,7 +713,7 @@ xer_type_encoder_f CN_IntegerLowMax_encode_xer; int CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -853,7 +853,7 @@ xer_type_encoder_f NO_IntegerHighMax_encode_xer; int NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -999,7 +999,7 @@ xer_type_encoder_f NO_IntegerLowestMax_encode_xer; int NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1145,7 +1145,7 @@ xer_type_encoder_f NO_IntegerOutRange_encode_xer; int NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1291,7 +1291,7 @@ xer_type_encoder_f NO_IntegerOutValue_encode_xer; int NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1437,7 +1437,7 @@ xer_type_encoder_f OK_IntegerInRange1_encode_xer; int OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1577,7 +1577,7 @@ xer_type_encoder_f OK_IntegerInRange2_encode_xer; int OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1717,7 +1717,7 @@ xer_type_encoder_f OK_IntegerInRange3_encode_xer; int OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1857,7 +1857,7 @@ xer_type_encoder_f OK_IntegerInRange4_encode_xer; int OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1997,7 +1997,7 @@ xer_type_encoder_f OK_IntegerInRange5_encode_xer; int OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -2137,7 +2137,7 @@ xer_type_encoder_f NO_IntegerInRange6_encode_xer; int NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -2290,10 +2290,10 @@ xer_type_encoder_f CN_IntegerEnumerated1_encode_xer; int CN_IntegerEnumerated1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -2420,10 +2420,10 @@ xer_type_encoder_f NO_IntegerEnumerated2_encode_xer; int NO_IntegerEnumerated2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/90-cond-int-type-OK.asn1.-Pgen-PER index 88d7b33f..0516de85 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pgen-PER +++ b/tests/90-cond-int-type-OK.asn1.-Pgen-PER @@ -23,10 +23,10 @@ per_type_decoder_f CN_IntegerUnlimited_decode_uper; int CN_IntegerUnlimited_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -154,7 +154,7 @@ per_type_decoder_f CN_IntegerMinMax_decode_uper; int CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; if(!sptr) { @@ -171,7 +171,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -303,7 +303,7 @@ per_type_decoder_f CN_IntegerMinLow_decode_uper; int CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -461,7 +461,7 @@ per_type_decoder_f NO_IntegerMinHigh_decode_uper; int NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -619,7 +619,7 @@ per_type_decoder_f NO_IntegerLowHigh_decode_uper; int NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -777,7 +777,7 @@ per_type_decoder_f CN_IntegerLowMax_decode_uper; int CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -935,7 +935,7 @@ per_type_decoder_f NO_IntegerHighMax_decode_uper; int NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1093,7 +1093,7 @@ per_type_decoder_f NO_IntegerLowestMax_decode_uper; int NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1251,7 +1251,7 @@ per_type_decoder_f NO_IntegerOutRange_decode_uper; int NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1409,7 +1409,7 @@ per_type_decoder_f NO_IntegerOutValue_decode_uper; int NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -1567,7 +1567,7 @@ per_type_decoder_f OK_IntegerInRange1_decode_uper; int OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1719,7 +1719,7 @@ per_type_decoder_f OK_IntegerInRange2_decode_uper; int OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -1871,7 +1871,7 @@ per_type_decoder_f OK_IntegerInRange3_decode_uper; int OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -2023,7 +2023,7 @@ per_type_decoder_f OK_IntegerInRange4_decode_uper; int OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { long value; if(!sptr) { @@ -2175,7 +2175,7 @@ per_type_decoder_f OK_IntegerInRange5_decode_uper; int OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -2333,7 +2333,7 @@ per_type_decoder_f NO_IntegerInRange6_decode_uper; int NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; long value; @@ -2498,10 +2498,10 @@ per_type_decoder_f CN_IntegerEnumerated1_decode_uper; int CN_IntegerEnumerated1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -2636,10 +2636,10 @@ per_type_decoder_f NO_IntegerEnumerated2_decode_uper; int NO_IntegerEnumerated2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE index 1164e418..0bf1fd55 100644 --- a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE +++ b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE @@ -22,7 +22,7 @@ xer_type_encoder_f OK_Integer1_encode_xer; int OK_Integer1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -38,7 +38,7 @@ OK_Integer1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -158,7 +158,7 @@ xer_type_encoder_f OK_Integer2_encode_xer; int OK_Integer2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -174,7 +174,7 @@ OK_Integer2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -294,7 +294,7 @@ xer_type_encoder_f OK_Integer3_encode_xer; int OK_Integer3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -310,7 +310,7 @@ OK_Integer3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -430,7 +430,7 @@ xer_type_encoder_f OK_Integer4_encode_xer; int OK_Integer4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -446,7 +446,7 @@ OK_Integer4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeInteger.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* @@ -566,7 +566,7 @@ xer_type_encoder_f NO_Integer5_encode_xer; int NO_Integer5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; if(!sptr) { @@ -583,7 +583,7 @@ NO_Integer5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Replace with underlying type checker */ td->check_constraints = asn_DEF_INTEGER.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/92-circular-loops-OK.asn1.-P b/tests/92-circular-loops-OK.asn1.-P index 5e161af1..48d0c149 100644 --- a/tests/92-circular-loops-OK.asn1.-P +++ b/tests/92-circular-loops-OK.asn1.-P @@ -931,10 +931,10 @@ xer_type_encoder_f TypeRef_encode_xer; int TypeRef_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Sequence.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice index 7f0c3859..66e63c15 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice +++ b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice @@ -932,10 +932,10 @@ xer_type_encoder_f TypeRef_encode_xer; int TypeRef_constraint(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_Sequence.check_constraints; - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } /* diff --git a/tests/98-attribute-class-OK.asn1.-P b/tests/98-attribute-class-OK.asn1.-P index c018f87c..a200048a 100644 --- a/tests/98-attribute-class-OK.asn1.-P +++ b/tests/98-attribute-class-OK.asn1.-P @@ -23,7 +23,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Attribute; static int memb_identifier_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_consume_bytes_f *app_errlog, void *app_key) { + asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { _ASN_ERRLOG(app_errlog, app_key, @@ -37,7 +37,7 @@ memb_identifier_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Nothing is here. See below */ } - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } |