regenerated
diff --git a/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P b/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P
index c45ec25..7c96a85 100644
--- a/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P
+++ b/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P
@@ -130,8 +130,8 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = memb_narrow1_constraint_1 },
- .default_value_cmp = asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */
- .default_value_set = asn_DFL_2_set_3, /* Set DEFAULT 3 */
+ .default_value_cmp = &asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */
+ .default_value_set = &asn_DFL_2_set_3, /* Set DEFAULT 3 */
.name = "narrow1"
},
{ ATF_NOFLAGS, 0, offsetof(struct Narrow_15P0, narrow2),
diff --git a/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfcompound-names b/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfcompound-names
index 9750918..2b9b7e0 100644
--- a/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfcompound-names
+++ b/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfcompound-names
@@ -81,8 +81,8 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_2_cmp_5, /* Compare DEFAULT 5 */
- .default_value_set = asn_DFL_2_set_5, /* Set DEFAULT 5 */
+ .default_value_cmp = &asn_DFL_2_cmp_5, /* Compare DEFAULT 5 */
+ .default_value_set = &asn_DFL_2_set_5, /* Set DEFAULT 5 */
.name = "field"
},
};
@@ -184,8 +184,8 @@
.type = &asn_DEF_field_7,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_7_cmp_5, /* Compare DEFAULT 5 */
- .default_value_set = asn_DFL_7_set_5, /* Set DEFAULT 5 */
+ .default_value_cmp = &asn_DFL_7_cmp_5, /* Compare DEFAULT 5 */
+ .default_value_set = &asn_DFL_7_set_5, /* Set DEFAULT 5 */
.name = "field"
},
};
diff --git a/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER
index 52f1508..1490669 100644
--- a/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER
+++ b/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER
@@ -134,7 +134,7 @@
/*** <<< STAT-DEFS [Singleton] >>> ***/
static int asn_DFL_2_cmp(const void *sptr) {
- static uint8_t defv[] = "z";
+ static const uint8_t defv[] = "z";
const IA5String_t *st = sptr;
if(!st) {
@@ -147,18 +147,18 @@
return 1;
}
static int asn_DFL_2_set(void **sptr) {
- static uint8_t defv[] = "z";
+ static const uint8_t defv[] = "z";
IA5String_t *st = *sptr;
uint8_t *nstr = MALLOC(sizeof(defv));
if(!nstr) return -1;
memcpy(nstr, defv, sizeof(defv));
- if((st = *sptr)) {
+ if(st) {
FREEMEM(st->buf);
} else {
st = (*sptr = CALLOC(1, sizeof(*st)));
- if(!st) { FREEMEM(nptr); return -1; }
+ if(!st) { FREEMEM(nstr); return -1; }
}
st->buf = nstr;
st->size = sizeof(defv) - 1;
@@ -172,8 +172,8 @@
.type = &asn_DEF_IA5String,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_2_cmp, /* Compare DEFAULT "z" */
- .default_value_set = asn_DFL_2_set, /* Set DEFAULT "z" */
+ .default_value_cmp = &asn_DFL_2_cmp, /* Compare DEFAULT "z" */
+ .default_value_set = &asn_DFL_2_set, /* Set DEFAULT "z" */
.name = "opt-z"
},
};
diff --git a/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER b/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER
index 301c17c..28a9055 100644
--- a/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER
+++ b/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER
@@ -466,8 +466,8 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = &asn_OER_memb_signed8_constr_9, .per_constraints = 0, .general_constraints = memb_signed8_constraint_1 },
- .default_value_cmp = asn_DFL_9_cmp_3, /* Compare DEFAULT 3 */
- .default_value_set = asn_DFL_9_set_3, /* Set DEFAULT 3 */
+ .default_value_cmp = &asn_DFL_9_cmp_3, /* Compare DEFAULT 3 */
+ .default_value_set = &asn_DFL_9_set_3, /* Set DEFAULT 3 */
.name = "signed8"
},
{ ATF_POINTER, 5, offsetof(struct T, signed16),
diff --git a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types
index d911711..16b63d3 100644
--- a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types
+++ b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types
@@ -2119,8 +2119,8 @@
.type = &asn_DEF_Int1,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = memb_int1_c_constraint_1 },
- .default_value_cmp = asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */
- .default_value_set = asn_DFL_2_set_3, /* Set DEFAULT 3 */
+ .default_value_cmp = &asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */
+ .default_value_set = &asn_DFL_2_set_3, /* Set DEFAULT 3 */
.name = "int1-c"
},
{ ATF_NOFLAGS, 0, offsetof(struct Sequence, int4),
@@ -2147,8 +2147,8 @@
.type = &asn_DEF_BOOLEAN,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_5_cmp_1, /* Compare DEFAULT 1 */
- .default_value_set = asn_DFL_5_set_1, /* Set DEFAULT 1 */
+ .default_value_cmp = &asn_DFL_5_cmp_1, /* Compare DEFAULT 1 */
+ .default_value_set = &asn_DFL_5_set_1, /* Set DEFAULT 1 */
.name = "bool"
},
{ ATF_NOFLAGS, 0, offsetof(struct Sequence, enum_c),
diff --git a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER
index 4174ea6..e60729e 100644
--- a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER
+++ b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER
@@ -2350,8 +2350,8 @@
.type = &asn_DEF_Int1,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = &asn_PER_memb_int1_c_constr_2, .general_constraints = memb_int1_c_constraint_1 },
- .default_value_cmp = asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */
- .default_value_set = asn_DFL_2_set_3, /* Set DEFAULT 3 */
+ .default_value_cmp = &asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */
+ .default_value_set = &asn_DFL_2_set_3, /* Set DEFAULT 3 */
.name = "int1-c"
},
{ ATF_NOFLAGS, 0, offsetof(struct Sequence, int4),
@@ -2378,8 +2378,8 @@
.type = &asn_DEF_BOOLEAN,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_5_cmp_1, /* Compare DEFAULT 1 */
- .default_value_set = asn_DFL_5_set_1, /* Set DEFAULT 1 */
+ .default_value_cmp = &asn_DFL_5_cmp_1, /* Compare DEFAULT 1 */
+ .default_value_set = &asn_DFL_5_set_1, /* Set DEFAULT 1 */
.name = "bool"
},
{ ATF_NOFLAGS, 0, offsetof(struct Sequence, enum_c),
diff --git a/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types
index 3ddb5ce..f297904 100644
--- a/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types
+++ b/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types
@@ -518,8 +518,8 @@
.type = &asn_DEF_INTEGER,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_3_cmp_7, /* Compare DEFAULT 7 */
- .default_value_set = asn_DFL_3_set_7, /* Set DEFAULT 7 */
+ .default_value_cmp = &asn_DFL_3_cmp_7, /* Compare DEFAULT 7 */
+ .default_value_set = &asn_DFL_3_set_7, /* Set DEFAULT 7 */
.name = "plain"
},
{ ATF_NOFLAGS, 0, offsetof(struct Ypet, senums),
diff --git a/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types
index c2e286d..6d9bba7 100644
--- a/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types
+++ b/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types
@@ -88,8 +88,8 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = memb_common_constraint_1 },
- .default_value_cmp = asn_DFL_2_cmp_0, /* Compare DEFAULT 0 */
- .default_value_set = asn_DFL_2_set_0, /* Set DEFAULT 0 */
+ .default_value_cmp = &asn_DFL_2_cmp_0, /* Compare DEFAULT 0 */
+ .default_value_set = &asn_DFL_2_set_0, /* Set DEFAULT 0 */
.name = "common"
},
};
@@ -153,8 +153,8 @@
.type = &asn_DEF_BOOLEAN,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value_cmp = asn_DFL_4_cmp_0, /* Compare DEFAULT 0 */
- .default_value_set = asn_DFL_4_set_0, /* Set DEFAULT 0 */
+ .default_value_cmp = &asn_DFL_4_cmp_0, /* Compare DEFAULT 0 */
+ .default_value_set = &asn_DFL_4_set_0, /* Set DEFAULT 0 */
.name = "common"
},
};