diff options
author | Lev Walkin <vlm@lionet.info> | 2006-07-13 13:28:32 +0000 |
---|---|---|
committer | Lev Walkin <vlm@lionet.info> | 2006-07-13 13:28:32 +0000 |
commit | 739d9bfb59545f571b054003809e0938f6007ce0 (patch) | |
tree | 37189f88ce6064889ed5b523b3fe957b01766dd7 /tests | |
parent | c8c2cb54d55fcb258089c4a48c6a7fd5e089ca4e (diff) |
updated to ERRLOG -> CTFAIL
Diffstat (limited to 'tests')
-rw-r--r-- | tests/106-param-constr-OK.asn1.-P | 12 | ||||
-rw-r--r-- | tests/108-param-constr-3-OK.asn1.-P | 12 | ||||
-rw-r--r-- | tests/19-param-OK.asn1.-P | 8 | ||||
-rw-r--r-- | tests/42-real-life-OK.asn1.-PR | 14 | ||||
-rw-r--r-- | tests/50-constraint-OK.asn1.-P | 118 | ||||
-rw-r--r-- | tests/50-constraint-OK.asn1.-Pgen-PER | 118 | ||||
-rw-r--r-- | tests/69-reserved-words-OK.asn1.-P | 4 | ||||
-rw-r--r-- | tests/72-same-names-OK.asn1.-P | 8 | ||||
-rw-r--r-- | tests/73-circular-OK.asn1.-P | 8 | ||||
-rw-r--r-- | tests/84-param-tags-OK.asn1.-P | 12 | ||||
-rw-r--r-- | tests/90-cond-int-type-OK.asn1.-P | 78 | ||||
-rw-r--r-- | tests/90-cond-int-type-OK.asn1.-Pfnative-types | 72 | ||||
-rw-r--r-- | tests/90-cond-int-type-OK.asn1.-Pgen-PER | 78 | ||||
-rw-r--r-- | tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE | 10 | ||||
-rw-r--r-- | tests/98-attribute-class-OK.asn1.-P | 2 |
15 files changed, 277 insertions, 277 deletions
diff --git a/tests/106-param-constr-OK.asn1.-P b/tests/106-param-constr-OK.asn1.-P index 545e1637..de054e40 100644 --- a/tests/106-param-constr-OK.asn1.-P +++ b/tests/106-param-constr-OK.asn1.-P @@ -27,7 +27,7 @@ memb_narrow1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -39,7 +39,7 @@ memb_narrow1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -52,7 +52,7 @@ memb_narrow2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -64,7 +64,7 @@ memb_narrow2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -77,7 +77,7 @@ memb_narrow3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -89,7 +89,7 @@ memb_narrow3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/108-param-constr-3-OK.asn1.-P b/tests/108-param-constr-3-OK.asn1.-P index 0f00d5da..4088926a 100644 --- a/tests/108-param-constr-3-OK.asn1.-P +++ b/tests/108-param-constr-3-OK.asn1.-P @@ -27,14 +27,14 @@ MinMax_16P0_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -44,7 +44,7 @@ MinMax_16P0_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -173,14 +173,14 @@ ThreePlus_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -190,7 +190,7 @@ ThreePlus_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P index a11ef62f..e3e71e7e 100644 --- a/tests/19-param-OK.asn1.-P +++ b/tests/19-param-OK.asn1.-P @@ -38,7 +38,7 @@ memb_signature_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -55,7 +55,7 @@ memb_signature_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -457,7 +457,7 @@ memb_IA5String_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -468,7 +468,7 @@ memb_IA5String_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index 37b5858e..309aad17 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -45,7 +45,7 @@ memb_varsets_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -56,9 +56,9 @@ memb_varsets_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, if((size >= 1)) { /* Perform validation of the inner elements */ - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -218,7 +218,7 @@ memb_vparts_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -401,7 +401,7 @@ memb_vset_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -412,9 +412,9 @@ memb_vset_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, if((size >= 1)) { /* Perform validation of the inner elements */ - return td->check_constraints(td, sptr, app_errlog, app_key); + return td->check_constraints(td, sptr, ctfailcb, app_key); } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/50-constraint-OK.asn1.-P b/tests/50-constraint-OK.asn1.-P index 43fe3ef5..8928dd64 100644 --- a/tests/50-constraint-OK.asn1.-P +++ b/tests/50-constraint-OK.asn1.-P @@ -150,7 +150,7 @@ Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -163,7 +163,7 @@ Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -292,14 +292,14 @@ Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -309,7 +309,7 @@ Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -438,14 +438,14 @@ Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -455,7 +455,7 @@ Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -584,14 +584,14 @@ Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -601,7 +601,7 @@ Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -730,14 +730,14 @@ ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -747,7 +747,7 @@ ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1015,7 +1015,7 @@ Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1028,7 +1028,7 @@ Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1184,7 +1184,7 @@ Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1197,7 +1197,7 @@ Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1341,7 +1341,7 @@ Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1352,7 +1352,7 @@ Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1496,7 +1496,7 @@ PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1507,7 +1507,7 @@ PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1651,7 +1651,7 @@ PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1662,7 +1662,7 @@ PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1806,7 +1806,7 @@ Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1817,7 +1817,7 @@ Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1961,7 +1961,7 @@ Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1972,7 +1972,7 @@ Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2116,7 +2116,7 @@ Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2127,7 +2127,7 @@ Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2272,7 +2272,7 @@ SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2285,7 +2285,7 @@ SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2430,7 +2430,7 @@ SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2443,7 +2443,7 @@ SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2587,7 +2587,7 @@ Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2598,7 +2598,7 @@ Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2736,7 +2736,7 @@ Utf8_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const UTF8String_t *st = (const UTF8String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2747,7 +2747,7 @@ Utf8_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2905,7 +2905,7 @@ Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2913,7 +2913,7 @@ Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size = UTF8String_length(st); if((ssize_t)size < 0) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: UTF-8: broken encoding (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2924,7 +2924,7 @@ Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3053,7 +3053,7 @@ Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3061,7 +3061,7 @@ Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size = UTF8String_length(st); if((ssize_t)size < 0) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: UTF-8: broken encoding (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3071,7 +3071,7 @@ Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3351,7 +3351,7 @@ VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3364,7 +3364,7 @@ VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3591,14 +3591,14 @@ memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3608,7 +3608,7 @@ memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3622,14 +3622,14 @@ memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3639,7 +3639,7 @@ memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3653,14 +3653,14 @@ memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3670,7 +3670,7 @@ memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4111,7 +4111,7 @@ Enum1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4123,7 +4123,7 @@ Enum1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4295,7 +4295,7 @@ Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4308,7 +4308,7 @@ Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/50-constraint-OK.asn1.-Pgen-PER b/tests/50-constraint-OK.asn1.-Pgen-PER index 7f9affba..8736e4cb 100644 --- a/tests/50-constraint-OK.asn1.-Pgen-PER +++ b/tests/50-constraint-OK.asn1.-Pgen-PER @@ -159,7 +159,7 @@ Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -172,7 +172,7 @@ Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -313,14 +313,14 @@ Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -330,7 +330,7 @@ Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -471,14 +471,14 @@ Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -488,7 +488,7 @@ Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -629,14 +629,14 @@ Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -646,7 +646,7 @@ Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -787,14 +787,14 @@ ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -804,7 +804,7 @@ ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1092,7 +1092,7 @@ Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1105,7 +1105,7 @@ Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1273,7 +1273,7 @@ Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1286,7 +1286,7 @@ Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1442,7 +1442,7 @@ Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1453,7 +1453,7 @@ Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1609,7 +1609,7 @@ PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1620,7 +1620,7 @@ PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1776,7 +1776,7 @@ PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1787,7 +1787,7 @@ PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1943,7 +1943,7 @@ Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1954,7 +1954,7 @@ Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2110,7 +2110,7 @@ Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2121,7 +2121,7 @@ Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2277,7 +2277,7 @@ Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2288,7 +2288,7 @@ Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2445,7 +2445,7 @@ SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2458,7 +2458,7 @@ SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2615,7 +2615,7 @@ SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2628,7 +2628,7 @@ SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2784,7 +2784,7 @@ Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const PER_Visible_t *st = (const PER_Visible_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2795,7 +2795,7 @@ Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2945,7 +2945,7 @@ Utf8_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const UTF8String_t *st = (const UTF8String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2956,7 +2956,7 @@ Utf8_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3126,7 +3126,7 @@ Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3134,7 +3134,7 @@ Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size = UTF8String_length(st); if((ssize_t)size < 0) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: UTF-8: broken encoding (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3145,7 +3145,7 @@ Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3286,7 +3286,7 @@ Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3294,7 +3294,7 @@ Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size = UTF8String_length(st); if((ssize_t)size < 0) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: UTF-8: broken encoding (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3304,7 +3304,7 @@ Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3604,7 +3604,7 @@ VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3617,7 +3617,7 @@ VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3858,14 +3858,14 @@ memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3875,7 +3875,7 @@ memb_int1_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3889,14 +3889,14 @@ memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3906,7 +3906,7 @@ memb_int4_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3920,14 +3920,14 @@ memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -3937,7 +3937,7 @@ memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4417,7 +4417,7 @@ Enum1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4429,7 +4429,7 @@ Enum1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4613,7 +4613,7 @@ Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -4626,7 +4626,7 @@ Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/69-reserved-words-OK.asn1.-P b/tests/69-reserved-words-OK.asn1.-P index f6f4168c..ee44e593 100644 --- a/tests/69-reserved-words-OK.asn1.-P +++ b/tests/69-reserved-words-OK.asn1.-P @@ -53,7 +53,7 @@ memb_char_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -65,7 +65,7 @@ memb_char_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/72-same-names-OK.asn1.-P b/tests/72-same-names-OK.asn1.-P index 3ef0465d..d384da3e 100644 --- a/tests/72-same-names-OK.asn1.-P +++ b/tests/72-same-names-OK.asn1.-P @@ -416,7 +416,7 @@ memb_a_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -433,7 +433,7 @@ memb_a_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -447,7 +447,7 @@ memb_a_constraint_8(asn_TYPE_descriptor_t *td, const void *sptr, size_t size; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -464,7 +464,7 @@ memb_a_constraint_8(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P index d9852b8c..89d5e302 100644 --- a/tests/73-circular-OK.asn1.-P +++ b/tests/73-circular-OK.asn1.-P @@ -498,7 +498,7 @@ memb_patest1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -509,7 +509,7 @@ memb_patest1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -522,7 +522,7 @@ memb_patest2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, const IA5String_t *st = (const IA5String_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -533,7 +533,7 @@ memb_patest2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/84-param-tags-OK.asn1.-P b/tests/84-param-tags-OK.asn1.-P index 4c684850..367f943b 100644 --- a/tests/84-param-tags-OK.asn1.-P +++ b/tests/84-param-tags-OK.asn1.-P @@ -33,7 +33,7 @@ memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -45,7 +45,7 @@ memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -303,7 +303,7 @@ memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -315,7 +315,7 @@ memb_common_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -328,7 +328,7 @@ memb_common_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, BOOLEAN_t value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -340,7 +340,7 @@ memb_common_constraint_3(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/90-cond-int-type-OK.asn1.-P b/tests/90-cond-int-type-OK.asn1.-P index ebcfb63f..965fba20 100644 --- a/tests/90-cond-int-type-OK.asn1.-P +++ b/tests/90-cond-int-type-OK.asn1.-P @@ -149,7 +149,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const INTEGER_t *st = (const INTEGER_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -287,14 +287,14 @@ CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -304,7 +304,7 @@ CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -433,14 +433,14 @@ NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -450,7 +450,7 @@ NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -579,14 +579,14 @@ NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -596,7 +596,7 @@ NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -725,14 +725,14 @@ CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -742,7 +742,7 @@ CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -871,14 +871,14 @@ NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -888,7 +888,7 @@ NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1017,14 +1017,14 @@ NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1034,7 +1034,7 @@ NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1163,14 +1163,14 @@ NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1180,7 +1180,7 @@ NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1309,14 +1309,14 @@ NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1326,7 +1326,7 @@ NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1454,7 +1454,7 @@ OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1466,7 +1466,7 @@ OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1594,7 +1594,7 @@ OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1606,7 +1606,7 @@ OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1734,7 +1734,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1746,7 +1746,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1874,7 +1874,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1886,7 +1886,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2015,14 +2015,14 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2032,7 +2032,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2161,14 +2161,14 @@ NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2178,7 +2178,7 @@ NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/90-cond-int-type-OK.asn1.-Pfnative-types b/tests/90-cond-int-type-OK.asn1.-Pfnative-types index efcd3dc6..c39c534f 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pfnative-types +++ b/tests/90-cond-int-type-OK.asn1.-Pfnative-types @@ -148,7 +148,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -285,7 +285,7 @@ CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -297,7 +297,7 @@ CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -426,14 +426,14 @@ NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -443,7 +443,7 @@ NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -572,14 +572,14 @@ NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -589,7 +589,7 @@ NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -717,7 +717,7 @@ CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -729,7 +729,7 @@ CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -858,14 +858,14 @@ NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -875,7 +875,7 @@ NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1004,14 +1004,14 @@ NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1021,7 +1021,7 @@ NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1150,14 +1150,14 @@ NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1167,7 +1167,7 @@ NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1296,14 +1296,14 @@ NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1313,7 +1313,7 @@ NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1441,7 +1441,7 @@ OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1453,7 +1453,7 @@ OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1581,7 +1581,7 @@ OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1593,7 +1593,7 @@ OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1721,7 +1721,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1733,7 +1733,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1861,7 +1861,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1873,7 +1873,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2001,7 +2001,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2013,7 +2013,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2142,14 +2142,14 @@ NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2159,7 +2159,7 @@ NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/90-cond-int-type-OK.asn1.-Pgen-PER index 0516de85..4f29f49f 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pgen-PER +++ b/tests/90-cond-int-type-OK.asn1.-Pgen-PER @@ -158,7 +158,7 @@ CN_IntegerMinMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const INTEGER_t *st = (const INTEGER_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -308,14 +308,14 @@ CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -325,7 +325,7 @@ CN_IntegerMinLow_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -466,14 +466,14 @@ NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -483,7 +483,7 @@ NO_IntegerMinHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -624,14 +624,14 @@ NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -641,7 +641,7 @@ NO_IntegerLowHigh_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -782,14 +782,14 @@ CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -799,7 +799,7 @@ CN_IntegerLowMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -940,14 +940,14 @@ NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -957,7 +957,7 @@ NO_IntegerHighMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1098,14 +1098,14 @@ NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1115,7 +1115,7 @@ NO_IntegerLowestMax_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1256,14 +1256,14 @@ NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1273,7 +1273,7 @@ NO_IntegerOutRange_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1414,14 +1414,14 @@ NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1431,7 +1431,7 @@ NO_IntegerOutValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1571,7 +1571,7 @@ OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1583,7 +1583,7 @@ OK_IntegerInRange1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1723,7 +1723,7 @@ OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1735,7 +1735,7 @@ OK_IntegerInRange2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1875,7 +1875,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -1887,7 +1887,7 @@ OK_IntegerInRange3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2027,7 +2027,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2039,7 +2039,7 @@ OK_IntegerInRange4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2180,14 +2180,14 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2197,7 +2197,7 @@ OK_IntegerInRange5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2338,14 +2338,14 @@ NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, long value; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; } if(asn_INTEGER2long(st, &value)) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value too large (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -2355,7 +2355,7 @@ NO_IntegerInRange6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, /* Constraint check succeeded */ return 0; } else { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: constraint failed (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE index 0bf1fd55..443e955e 100644 --- a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE +++ b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE @@ -25,7 +25,7 @@ OK_Integer1_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -161,7 +161,7 @@ OK_Integer2_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -297,7 +297,7 @@ OK_Integer3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -433,7 +433,7 @@ OK_Integer4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; @@ -570,7 +570,7 @@ NO_Integer5_constraint(asn_TYPE_descriptor_t *td, const void *sptr, const INTEGER_t *st = (const INTEGER_t *)sptr; if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; diff --git a/tests/98-attribute-class-OK.asn1.-P b/tests/98-attribute-class-OK.asn1.-P index a200048a..16ad64e0 100644 --- a/tests/98-attribute-class-OK.asn1.-P +++ b/tests/98-attribute-class-OK.asn1.-P @@ -26,7 +26,7 @@ memb_identifier_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { if(!sptr) { - _ASN_ERRLOG(app_errlog, app_key, + _ASN_CTFAIL(app_key, td, sptr, "%s: value not given (%s:%d)", td->name, __FILE__, __LINE__); return -1; |