updated to ERRLOG -> CTFAIL
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1119 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/50-constraint-OK.asn1.-Pgen-PER b/tests/50-constraint-OK.asn1.-Pgen-PER
index 7f9affb..8736e4c 100644
--- a/tests/50-constraint-OK.asn1.-Pgen-PER
+++ b/tests/50-constraint-OK.asn1.-Pgen-PER
@@ -159,7 +159,7 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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_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 @@
/* 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_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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
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 @@
/* 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 @@
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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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;