diff options
author | Lev Walkin <vlm@lionet.info> | 2004-08-22 12:47:03 +0000 |
---|---|---|
committer | Lev Walkin <vlm@lionet.info> | 2004-08-22 12:47:03 +0000 |
commit | 775885e94cbca6706ab1ebc419c21b30400bfe07 (patch) | |
tree | e2db24153f7bafbec6265022a49820b44fff8c3b /tests | |
parent | 6db2f09fb2427854cfd45b5e977a1464554bb930 (diff) |
proper constraints return values
Diffstat (limited to 'tests')
-rw-r--r-- | tests/19-param-OK.asn1.-P | 6 | ||||
-rw-r--r-- | tests/42-real-life-OK.asn1.-PR | 4 | ||||
-rw-r--r-- | tests/50-constraint-OK.asn1.-P | 64 |
3 files changed, 37 insertions, 37 deletions
diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P index 6d3b865f..17066a28 100644 --- a/tests/19-param-OK.asn1.-P +++ b/tests/19-param-OK.asn1.-P @@ -246,9 +246,9 @@ static int check_permitted_alphabet_1(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!table[cv]) return 0; + if(!table[cv]) return -1; } - return 1; + return 0; } @@ -268,7 +268,7 @@ memb_IA5String_1_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(check_permitted_alphabet_1(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index aaa2e9f5..a934fff1 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -52,7 +52,7 @@ memb_varsets_1_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((size >= 1)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -359,7 +359,7 @@ memb_vset_3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((size >= 1)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); diff --git a/tests/50-constraint-OK.asn1.-P b/tests/50-constraint-OK.asn1.-P index 38416dbe..6fca2aad 100644 --- a/tests/50-constraint-OK.asn1.-P +++ b/tests/50-constraint-OK.asn1.-P @@ -140,7 +140,7 @@ Int2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((value >= 0)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -259,7 +259,7 @@ Int3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((value >= 0 && value <= 10)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -491,7 +491,7 @@ Int5_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((value == 5)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -810,9 +810,9 @@ static int check_permitted_alphabet_1(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv <= 127)) return 0; + if(!(cv <= 127)) return -1; } - return 1; + return 0; } @@ -836,7 +836,7 @@ Str2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(((size <= 20) || (size >= 25 && size <= 30)) && check_permitted_alphabet_1(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -953,9 +953,9 @@ static int check_permitted_alphabet_2(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!table[cv]) return 0; + if(!table[cv]) return -1; } - return 1; + return 0; } @@ -979,7 +979,7 @@ Str3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(((size >= 10 && size <= 20) || (size >= 25 && size <= 27)) && check_permitted_alphabet_2(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -1085,9 +1085,9 @@ static int check_permitted_alphabet_3(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv >= 65 && cv <= 70)) return 0; + if(!(cv >= 65 && cv <= 70)) return -1; } - return 1; + return 0; } @@ -1108,7 +1108,7 @@ PER_Visible_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(check_permitted_alphabet_3(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -1214,9 +1214,9 @@ static int check_permitted_alphabet_4(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv >= 69 && cv <= 70)) return 0; + if(!(cv >= 69 && cv <= 70)) return -1; } - return 1; + return 0; } @@ -1237,7 +1237,7 @@ PER_Visible_2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(check_permitted_alphabet_4(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -1343,9 +1343,9 @@ static int check_permitted_alphabet_5(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv >= 65 && cv <= 70)) return 0; + if(!(cv >= 65 && cv <= 70)) return -1; } - return 1; + return 0; } @@ -1366,7 +1366,7 @@ Not_PER_Visible_1_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(check_permitted_alphabet_5(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -1698,9 +1698,9 @@ static int check_permitted_alphabet_6(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv >= 65 && cv <= 70)) return 0; + if(!(cv >= 65 && cv <= 70)) return -1; } - return 1; + return 0; } @@ -1724,7 +1724,7 @@ SIZE_but_not_FROM_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((size >= 1 && size <= 4) && check_permitted_alphabet_6(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -1830,9 +1830,9 @@ static int check_permitted_alphabet_7(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv >= 65 && cv <= 68)) return 0; + if(!(cv >= 65 && cv <= 68)) return -1; } - return 1; + return 0; } @@ -1856,7 +1856,7 @@ SIZE_and_FROM_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((size >= 1 && size <= 4) && check_permitted_alphabet_7(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -1962,9 +1962,9 @@ static int check_permitted_alphabet_8(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(!(cv >= 65 && cv <= 70)) return 0; + if(!(cv >= 65 && cv <= 70)) return -1; } - return 1; + return 0; } @@ -1985,7 +1985,7 @@ Neither_SIZE_nor_FROM_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if(check_permitted_alphabet_8(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -2103,10 +2103,10 @@ static int check_permitted_alphabet_9(const void *sptr) { for(; ch < end; ch++) { uint8_t cv = *ch; - if(cv >= 0x80) return 0; - if(!table[cv]) return 0; + if(cv >= 0x80) return -1; + if(!table[cv]) return -1; } - return 1; + return 0; } @@ -2131,7 +2131,7 @@ Utf8_3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((size >= 1 && size <= 2) && check_permitted_alphabet_9(sptr)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); @@ -2247,7 +2247,7 @@ Utf8_2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr, if((size >= 1 && size <= 2)) { /* Constraint check succeeded */ - return 1; + return 0; } else { _ASN_ERRLOG(app_errlog, app_key, "%s: constraint failed", td->name); |