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/90-cond-int-type-OK.asn1.-Pfnative-types b/tests/90-cond-int-type-OK.asn1.-Pfnative-types
index efcd3dc..c39c534 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 @@
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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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 @@
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 @@
/* 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;