diff options
author | Lev Walkin <vlm@lionet.info> | 2005-08-29 10:31:14 +0000 |
---|---|---|
committer | Lev Walkin <vlm@lionet.info> | 2005-08-29 10:31:14 +0000 |
commit | ae7bf3fbe8e530f20a2c629530e92c5235921454 (patch) | |
tree | 4f173bf7d27476d128d4bb845b3b7665e70d4281 | |
parent | 0f5c5cfce99074487c5ca6ab7d0641e2aa3aa03f (diff) |
YuanMeng was very helpful in finding these
26 files changed, 249 insertions, 249 deletions
diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c index f8962be5..7b1536b9 100644 --- a/libasn1compiler/asn1c_C.c +++ b/libasn1compiler/asn1c_C.c @@ -1686,7 +1686,7 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr) { && expr->expr_type == ASN_BASIC_INTEGER && expr_elements_count(arg, expr)); if(C99_MODE) OUT(".type = "); - OUT("(void *)&asn_DEF_"); + OUT("&asn_DEF_"); if(complex_contents) { OUT("%s", MKID(expr->Identifier)); if(!(arg->flags & A1C_ALL_DEFS_GLOBAL)) diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P index 5b7fc38f..8ffd6179 100644 --- a/tests/19-param-OK.asn1.-P +++ b/tests/19-param-OK.asn1.-P @@ -69,21 +69,21 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { { ATF_NOFLAGS, 0, offsetof(struct toBeSigned, version), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "version" }, { ATF_NOFLAGS, 0, offsetof(struct toBeSigned, signature), .tag = (ASN_TAG_CLASS_UNIVERSAL | (6 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_OBJECT_IDENTIFIER, + .type = &asn_DEF_OBJECT_IDENTIFIER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "signature" }, { ATF_NOFLAGS, 0, offsetof(struct toBeSigned, issuer), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Name, + .type = &asn_DEF_Name, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "issuer" }, @@ -131,21 +131,21 @@ static asn_TYPE_member_t asn_MBR_Certificate_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Certificate, toBeSigned), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_toBeSigned_2, + .type = &asn_DEF_toBeSigned_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "toBeSigned" }, { ATF_NOFLAGS, 0, offsetof(struct Certificate, algorithm), .tag = (ASN_TAG_CLASS_UNIVERSAL | (6 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_OBJECT_IDENTIFIER, + .type = &asn_DEF_OBJECT_IDENTIFIER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "algorithm" }, { ATF_NOFLAGS, 0, offsetof(struct Certificate, signature), .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = memb_signature_1_constraint, .name = "signature" }, @@ -221,7 +221,7 @@ static asn_TYPE_member_t asn_MBR_Name_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_RelativeDistinguishedName, + .type = &asn_DEF_RelativeDistinguishedName, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -337,7 +337,7 @@ static asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (22 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_IA5String, + .type = &asn_DEF_IA5String, .memb_constraints = memb_IA5String_1_constraint, .name = "" }, diff --git a/tests/30-set-OK.asn1.-P b/tests/30-set-OK.asn1.-P index 0a8ca0d6..439f0de4 100644 --- a/tests/30-set-OK.asn1.-P +++ b/tests/30-set-OK.asn1.-P @@ -47,21 +47,21 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T, i), .tag = (ASN_TAG_CLASS_APPLICATION | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, { ATF_NOFLAGS, 0, offsetof(struct T, s), .tag = (ASN_TAG_CLASS_UNIVERSAL | (22 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_IA5String, + .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "s" }, { ATF_POINTER, 1, offsetof(struct T, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_BOOLEAN, + .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P index 69584ca1..d1e5c82e 100644 --- a/tests/31-set-of-OK.asn1.-P +++ b/tests/31-set-of-OK.asn1.-P @@ -31,7 +31,7 @@ static asn_TYPE_member_t asn_MBR_Forest_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Tree, + .type = &asn_DEF_Tree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -92,14 +92,14 @@ static asn_TYPE_member_t asn_MBR_Tree_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Tree, height), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "height" }, { ATF_NOFLAGS, 0, offsetof(struct Tree, width), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "width" }, @@ -234,7 +234,7 @@ static asn_TYPE_member_t asn_MBR_trees_2[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Forest, + .type = &asn_DEF_Forest, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -275,7 +275,7 @@ static asn_TYPE_member_t asn_MBR_Member_5[] = { { ATF_NOFLAGS, 0, offsetof(struct Member, cup_of_coffee), .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "cup-of-coffee" }, @@ -321,7 +321,7 @@ static asn_TYPE_member_t asn_MBR_anything_4[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Member_5, + .type = &asn_DEF_Member_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -362,14 +362,14 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { { ATF_NOFLAGS, 0, offsetof(struct other, choice.a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct other, choice.b), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -412,21 +412,21 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { { ATF_POINTER, 3, offsetof(struct Stuff, trees), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_trees_2, + .type = &asn_DEF_trees_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "trees" }, { ATF_POINTER, 2, offsetof(struct Stuff, anything), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_anything_4, + .type = &asn_DEF_anything_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "anything" }, { ATF_POINTER, 1, offsetof(struct Stuff, other), .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_other_9, + .type = &asn_DEF_other_9, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "other" }, diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P index f83b74f0..3e2354bd 100644 --- a/tests/32-sequence-of-OK.asn1.-P +++ b/tests/32-sequence-of-OK.asn1.-P @@ -31,7 +31,7 @@ static asn_TYPE_member_t asn_MBR_Programming_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Fault, + .type = &asn_DEF_Fault, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -99,7 +99,7 @@ static asn_TYPE_member_t asn_MBR_Fault_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Error, + .type = &asn_DEF_Error, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, diff --git a/tests/39-sequence-of-OK.asn1.-P b/tests/39-sequence-of-OK.asn1.-P index d0db433d..6339c4bf 100644 --- a/tests/39-sequence-of-OK.asn1.-P +++ b/tests/39-sequence-of-OK.asn1.-P @@ -39,7 +39,7 @@ static asn_TYPE_member_t asn_MBR_collection_3[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_T2, + .type = &asn_DEF_T2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -79,14 +79,14 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T, Int), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "int" }, { ATF_NOFLAGS, 0, offsetof(struct T, collection), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_collection_3, + .type = &asn_DEF_collection_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "collection" }, @@ -155,14 +155,14 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T2, flag), .tag = (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BOOLEAN, + .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "flag" }, { ATF_NOFLAGS, 0, offsetof(struct T2, str), .tag = (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_UTF8String, + .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "str" }, diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index 93397537..6bc0c227 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_varsets_3[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_VariablePartSet, + .type = &asn_DEF_VariablePartSet, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -112,14 +112,14 @@ static asn_TYPE_member_t asn_MBR_LogLine_1[] = { { ATF_NOFLAGS, 0, offsetof(struct LogLine, line_digest), .tag = (ASN_TAG_CLASS_UNIVERSAL | (22 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_IA5String, + .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "line-digest" }, { ATF_NOFLAGS, 0, offsetof(struct LogLine, varsets), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_varsets_3, + .type = &asn_DEF_varsets_3, .memb_constraints = memb_varsets_1_constraint, .name = "varsets" }, @@ -228,7 +228,7 @@ static asn_TYPE_member_t asn_MBR_vparts_2[] = { { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_VariablePart, + .type = &asn_DEF_VariablePart, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -268,14 +268,14 @@ static asn_TYPE_member_t asn_MBR_VariablePartSet_1[] = { { ATF_NOFLAGS, 0, offsetof(struct VariablePartSet, vparts), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_vparts_2, + .type = &asn_DEF_vparts_2, .memb_constraints = memb_vparts_1_constraint, .name = "vparts" }, { ATF_NOFLAGS, 0, offsetof(struct VariablePartSet, resolution), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_ActionItem, + .type = &asn_DEF_ActionItem, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "resolution" }, @@ -406,7 +406,7 @@ static asn_TYPE_member_t asn_MBR_vset_2[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_VisibleString, + .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -446,14 +446,14 @@ static asn_TYPE_member_t asn_MBR_vrange_4[] = { { ATF_NOFLAGS, 0, offsetof(struct vrange, from), .tag = (ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_VisibleString, + .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "from" }, { ATF_NOFLAGS, 0, offsetof(struct vrange, to), .tag = (ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_VisibleString, + .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "to" }, @@ -500,14 +500,14 @@ static asn_TYPE_member_t asn_MBR_VariablePart_1[] = { { ATF_NOFLAGS, 0, offsetof(struct VariablePart, choice.vset), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_vset_2, + .type = &asn_DEF_vset_2, .memb_constraints = memb_vset_1_constraint, .name = "vset" }, { ATF_NOFLAGS, 0, offsetof(struct VariablePart, choice.vrange), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_vrange_4, + .type = &asn_DEF_vrange_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "vrange" }, @@ -722,7 +722,7 @@ static asn_TYPE_member_t asn_MBR_email_9[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (26 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_VisibleString, + .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -762,14 +762,14 @@ static asn_TYPE_member_t asn_MBR_notify_7[] = { { ATF_NOFLAGS, 0, offsetof(struct notify, critical), .tag = (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BOOLEAN, + .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "critical" }, { ATF_NOFLAGS, 0, offsetof(struct notify, email), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_email_9, + .type = &asn_DEF_email_9, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "email" }, @@ -816,14 +816,14 @@ static asn_TYPE_member_t asn_MBR_ActionItem_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ActionItem, accept_as), .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_accept_as_2, + .type = &asn_DEF_accept_as_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "accept-as" }, { ATF_POINTER, 1, offsetof(struct ActionItem, notify), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_notify_7, + .type = &asn_DEF_notify_7, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "notify" }, diff --git a/tests/43-recursion-OK.asn1.-P b/tests/43-recursion-OK.asn1.-P index 03b85225..6416d4bd 100644 --- a/tests/43-recursion-OK.asn1.-P +++ b/tests/43-recursion-OK.asn1.-P @@ -48,7 +48,7 @@ static asn_TYPE_member_t asn_MBR_t_member1_2[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Test_structure_1, + .type = &asn_DEF_Test_structure_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -88,7 +88,7 @@ static asn_TYPE_member_t asn_MBR_t_member2_4[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Test_structure_1, + .type = &asn_DEF_Test_structure_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -128,28 +128,28 @@ static asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Test_structure_1, t_member1), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_t_member1_2, + .type = &asn_DEF_t_member1_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "t-member1" }, { ATF_NOFLAGS, 0, offsetof(struct Test_structure_1, t_member2), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_t_member2_4, + .type = &asn_DEF_t_member2_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "t-member2" }, { ATF_POINTER, 1, offsetof(struct Test_structure_1, t_member3), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Test_structure_1, + .type = &asn_DEF_Test_structure_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "t-member3" }, { ATF_NOFLAGS, 0, offsetof(struct Test_structure_1, t_member4), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "t-member4" }, @@ -249,7 +249,7 @@ static asn_TYPE_member_t asn_MBR_or_3[] = { { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_Choice_1, + .type = &asn_DEF_Choice_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -290,28 +290,28 @@ static asn_TYPE_member_t asn_MBR_Choice_1_1[] = { { ATF_POINTER, 0, offsetof(struct Choice_1, choice.and), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice_1, + .type = &asn_DEF_Choice_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "and" }, { ATF_NOFLAGS, 0, offsetof(struct Choice_1, choice.or), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_or_3, + .type = &asn_DEF_or_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "or" }, { ATF_POINTER, 0, offsetof(struct Choice_1, choice.not), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice_1, + .type = &asn_DEF_Choice_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "not" }, { ATF_NOFLAGS, 0, offsetof(struct Choice_1, choice.other), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "other" }, @@ -397,7 +397,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_2_1[] = { { ATF_POINTER, 1, offsetof(struct Test_structure_2, m1), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Test_structure_3, + .type = &asn_DEF_Test_structure_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m1" }, @@ -490,7 +490,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_3_1[] = { { ATF_POINTER, 1, offsetof(struct Test_structure_3, m1), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Test_structure_2, + .type = &asn_DEF_Test_structure_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m1" }, diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P index bd9dd8d5..28578eef 100644 --- a/tests/44-choice-in-sequence-OK.asn1.-P +++ b/tests/44-choice-in-sequence-OK.asn1.-P @@ -74,14 +74,14 @@ static asn_TYPE_member_t asn_MBR_e_6[] = { { ATF_NOFLAGS, 0, offsetof(struct e, choice.f), .tag = (ASN_TAG_CLASS_PRIVATE | (7 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "f" }, { ATF_NOFLAGS, 0, offsetof(struct e, choice.g), .tag = (ASN_TAG_CLASS_PRIVATE | (8 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, @@ -124,14 +124,14 @@ static asn_TYPE_member_t asn_MBR_h_9[] = { { ATF_NOFLAGS, 0, offsetof(struct h, choice.i), .tag = (ASN_TAG_CLASS_PRIVATE | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, { ATF_NOFLAGS, 0, offsetof(struct h, choice.j), .tag = (ASN_TAG_CLASS_PRIVATE | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "j" }, @@ -174,28 +174,28 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { { ATF_NOFLAGS, 0, offsetof(struct b, choice.c), .tag = (ASN_TAG_CLASS_PRIVATE | (5 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "c" }, { ATF_NOFLAGS, 0, offsetof(struct b, choice.d), .tag = (ASN_TAG_CLASS_PRIVATE | (6 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "d" }, { ATF_NOFLAGS, 0, offsetof(struct b, choice.e), .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_e_6, + .type = &asn_DEF_e_6, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "e" }, { ATF_NOFLAGS, 0, offsetof(struct b, choice.h), .tag = (ASN_TAG_CLASS_PRIVATE | (9 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_h_9, + .type = &asn_DEF_h_9, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "h" }, @@ -241,14 +241,14 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T, a), .tag = (ASN_TAG_CLASS_PRIVATE | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct T, b), .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_b_3, + .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR index d9209047..9521de29 100644 --- a/tests/46-redefine-OK.asn1.-PR +++ b/tests/46-redefine-OK.asn1.-PR @@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_ConstructedType_1[] = { { ATF_NOFLAGS, 0, offsetof(struct ConstructedType, field), .tag = (ASN_TAG_CLASS_CONTEXT | (5 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_PrimitiveType, + .type = &asn_DEF_PrimitiveType, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "field" }, diff --git a/tests/47-set-ext-OK.asn1.-P b/tests/47-set-ext-OK.asn1.-P index 72d605b7..6c04656f 100644 --- a/tests/47-set-ext-OK.asn1.-P +++ b/tests/47-set-ext-OK.asn1.-P @@ -41,7 +41,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T1, i), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, @@ -131,7 +131,7 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T2, i), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, @@ -218,7 +218,7 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T3, choice.i), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, @@ -295,7 +295,7 @@ static asn_TYPE_member_t asn_MBR_T4_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T4, choice.i), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, diff --git a/tests/59-choice-extended-OK.asn1.-P b/tests/59-choice-extended-OK.asn1.-P index de9c55ed..2590eab1 100644 --- a/tests/59-choice-extended-OK.asn1.-P +++ b/tests/59-choice-extended-OK.asn1.-P @@ -50,21 +50,21 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Choice, choice.a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Choice, choice.b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 0, offsetof(struct Choice, choice.c), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice, + .type = &asn_DEF_Choice, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "c" }, diff --git a/tests/60-any-OK.asn1.-P b/tests/60-any-OK.asn1.-P index 3f80bdef..4d2f7e87 100644 --- a/tests/60-any-OK.asn1.-P +++ b/tests/60-any-OK.asn1.-P @@ -25,14 +25,14 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T1, i), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, { ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T1, any), .tag = -1 /* Ambiguous tag (ANY?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_ANY, + .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "any" }, @@ -100,14 +100,14 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T2, i), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "i" }, { ATF_POINTER, 1, offsetof(struct T2, any), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_ANY, + .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "any" }, @@ -175,14 +175,14 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { { ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any1), .tag = -1 /* Ambiguous tag (ANY?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_ANY, + .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "any1" }, { ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any2), .tag = -1 /* Ambiguous tag (ANY?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_ANY, + .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "any2" }, diff --git a/tests/65-multi-tag-OK.asn1.-P b/tests/65-multi-tag-OK.asn1.-P index a1062bb6..25a449d0 100644 --- a/tests/65-multi-tag-OK.asn1.-P +++ b/tests/65-multi-tag-OK.asn1.-P @@ -884,21 +884,21 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Ts, m1), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_T2, + .type = &asn_DEF_T2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m1" }, { ATF_POINTER, 1, offsetof(struct Ts, m2), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_T3, + .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m2" }, { ATF_NOFLAGS, 0, offsetof(struct Ts, m3), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_T3, + .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m3" }, diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types index 14e10989..04a044e9 100644 --- a/tests/65-multi-tag-OK.asn1.-Pfnative-types +++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types @@ -884,21 +884,21 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Ts, m1), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_T2, + .type = &asn_DEF_T2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m1" }, { ATF_POINTER, 1, offsetof(struct Ts, m2), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_T3, + .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m2" }, { ATF_NOFLAGS, 0, offsetof(struct Ts, m3), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_T3, + .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m3" }, diff --git a/tests/66-ref-simple-OK.asn1.-P b/tests/66-ref-simple-OK.asn1.-P index 7cad785f..121e6c86 100644 --- a/tests/66-ref-simple-OK.asn1.-P +++ b/tests/66-ref-simple-OK.asn1.-P @@ -24,7 +24,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_SimpleType, + .type = &asn_DEF_SimpleType, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "named" }, diff --git a/tests/69-reserved-words-OK.asn1.-P b/tests/69-reserved-words-OK.asn1.-P index 33db670b..d7582cd1 100644 --- a/tests/69-reserved-words-OK.asn1.-P +++ b/tests/69-reserved-words-OK.asn1.-P @@ -118,28 +118,28 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T, Int), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "int" }, { ATF_NOFLAGS, 0, offsetof(struct T, Char), .tag = (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_OCTET_STRING, + .type = &asn_DEF_OCTET_STRING, .memb_constraints = memb_char_1_constraint, .name = "char" }, { ATF_NOFLAGS, 0, offsetof(struct T, Class), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_class_4, + .type = &asn_DEF_class_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "class" }, { ATF_NOFLAGS, 0, offsetof(struct T, Double), .tag = (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_REAL, + .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "double" }, diff --git a/tests/70-xer-test-OK.asn1.-P b/tests/70-xer-test-OK.asn1.-P index 4de73163..25a5a4fa 100644 --- a/tests/70-xer-test-OK.asn1.-P +++ b/tests/70-xer-test-OK.asn1.-P @@ -65,70 +65,70 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.sequence), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "sequence" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.set), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.setOf), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_SetOf, + .type = &asn_DEF_SetOf, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "setOf" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.sequenceOf), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_SequenceOf, + .type = &asn_DEF_SequenceOf, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "sequenceOf" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.extensibleSet), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ExtensibleSet, + .type = &asn_DEF_ExtensibleSet, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "extensibleSet" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.extensibleSequence), .tag = (ASN_TAG_CLASS_CONTEXT | (5 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ExtensibleSequence, + .type = &asn_DEF_ExtensibleSequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "extensibleSequence" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.extensibleSequence2), .tag = (ASN_TAG_CLASS_CONTEXT | (6 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ExtensibleSequence2, + .type = &asn_DEF_ExtensibleSequence2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "extensibleSequence2" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.setOfNULL), .tag = (ASN_TAG_CLASS_CONTEXT | (7 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_SetOfNULL, + .type = &asn_DEF_SetOfNULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "setOfNULL" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.setOfEnums), .tag = (ASN_TAG_CLASS_CONTEXT | (8 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_SetOfEnums, + .type = &asn_DEF_SetOfEnums, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "setOfEnums" }, { ATF_NOFLAGS, 0, offsetof(struct PDU, choice.seqOfZuka), .tag = (ASN_TAG_CLASS_CONTEXT | (9 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_SeqOfZuka, + .type = &asn_DEF_SeqOfZuka, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seqOfZuka" }, @@ -212,28 +212,28 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Sequence, integer), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "integer" }, { ATF_POINTER, 2, offsetof(struct Sequence, sequence), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "sequence" }, { ATF_POINTER, 1, offsetof(struct Sequence, bits), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "bits" }, { ATF_NOFLAGS, 0, offsetof(struct Sequence, string), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_UTF8String, + .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "string" }, @@ -319,14 +319,14 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Set, roid), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_RELATIVE_OID, + .type = &asn_DEF_RELATIVE_OID, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "roid" }, { ATF_POINTER, 1, offsetof(struct Set, opaque), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OCTET_STRING, + .type = &asn_DEF_OCTET_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "opaque" }, @@ -538,14 +538,14 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = { { ATF_POINTER, 2, offsetof(struct ExtensibleSet, string), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_UTF8String, + .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "string" }, { ATF_POINTER, 1, offsetof(struct ExtensibleSet, Enum), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_enum_4, + .type = &asn_DEF_enum_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "enum" }, @@ -626,21 +626,21 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { { ATF_POINTER, 3, offsetof(struct ExtensibleSequence, string), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_UTF8String, + .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "string" }, { ATF_POINTER, 2, offsetof(struct ExtensibleSequence, integer), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "integer" }, { ATF_POINTER, 1, offsetof(struct ExtensibleSequence, gtime), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_GeneralizedTime, + .type = &asn_DEF_GeneralizedTime, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "gtime" }, @@ -714,14 +714,14 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence2_1[] = { { ATF_POINTER, 2, offsetof(struct ExtensibleSequence2, string), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_UTF8String, + .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "string" }, { ATF_POINTER, 1, offsetof(struct ExtensibleSequence2, integer), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "integer" }, @@ -789,7 +789,7 @@ static asn_TYPE_member_t asn_MBR_SetOf_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_REAL, + .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -850,7 +850,7 @@ static asn_TYPE_member_t asn_MBR_SetOfNULL_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (5 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -1031,7 +1031,7 @@ static asn_TYPE_member_t asn_MBR_SetOfEnums_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Member_2, + .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -1092,7 +1092,7 @@ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "id" }, @@ -1153,7 +1153,7 @@ static asn_TYPE_member_t asn_MBR_SeqOfZuka_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (5 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_NULL, + .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "zuka" }, diff --git a/tests/72-same-names-OK.asn1.-P b/tests/72-same-names-OK.asn1.-P index 61a0dbed..b183aeb7 100644 --- a/tests/72-same-names-OK.asn1.-P +++ b/tests/72-same-names-OK.asn1.-P @@ -32,14 +32,14 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { { ATF_NOFLAGS, 0, offsetof(struct Member, t1), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Type1, + .type = &asn_DEF_Type1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "t1" }, { ATF_NOFLAGS, 0, offsetof(struct Member, t2), .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_Type2, + .type = &asn_DEF_Type2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "t2" }, @@ -87,7 +87,7 @@ static asn_TYPE_member_t asn_MBR_Type_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Member_2, + .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -169,14 +169,14 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { { ATF_NOFLAGS, 0, offsetof(struct another_name, a), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct another_name, b), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -223,7 +223,7 @@ static asn_TYPE_member_t asn_MBR_one_name_2[] = { { ATF_NOFLAGS, 0, offsetof(struct one_name, choice.another_name), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_another_name_3, + .type = &asn_DEF_another_name_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "another-name" }, @@ -265,7 +265,7 @@ static asn_TYPE_member_t asn_MBR_Type1_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Type1, one_name), .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_one_name_2, + .type = &asn_DEF_one_name_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "one-name" }, @@ -450,14 +450,14 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { { ATF_NOFLAGS, 0, offsetof(struct another_name, a), .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = memb_a_3_constraint, .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct another_name, b), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -504,7 +504,7 @@ static asn_TYPE_member_t asn_MBR_one_name_2[] = { { ATF_NOFLAGS, 0, offsetof(struct one_name, another_name), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_another_name_3, + .type = &asn_DEF_another_name_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "another-name" }, @@ -550,14 +550,14 @@ static asn_TYPE_member_t asn_MBR_another_name_8[] = { { ATF_NOFLAGS, 0, offsetof(struct another_name, a), .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = memb_a_8_constraint, .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct another_name, b), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -604,7 +604,7 @@ static asn_TYPE_member_t asn_MBR_two_name_7[] = { { ATF_NOFLAGS, 0, offsetof(struct two_name, another_name), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_another_name_8, + .type = &asn_DEF_another_name_8, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "another-name" }, @@ -656,14 +656,14 @@ static asn_TYPE_member_t asn_MBR_Type2_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Type2, choice.one_name), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_one_name_2, + .type = &asn_DEF_one_name_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "one-name" }, { ATF_NOFLAGS, 0, offsetof(struct Type2, choice.two_name), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_two_name_7, + .type = &asn_DEF_two_name_7, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "two-name" }, diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P index 3bf20467..596163da 100644 --- a/tests/73-circular-OK.asn1.-P +++ b/tests/73-circular-OK.asn1.-P @@ -37,7 +37,7 @@ static asn_TYPE_member_t asn_MBR_data_2[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_EpytRef, + .type = &asn_DEF_EpytRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -77,7 +77,7 @@ static asn_TYPE_member_t asn_MBR_Type_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Type, data), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_data_2, + .type = &asn_DEF_data_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "data" }, @@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_stype_2[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Type, + .type = &asn_DEF_Type, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -319,21 +319,21 @@ static asn_TYPE_member_t asn_MBR_Epyt_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Epyt, stype), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_stype_2, + .type = &asn_DEF_stype_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "stype" }, { ATF_POINTER, 2, offsetof(struct Epyt, type), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Type, + .type = &asn_DEF_Type, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "type" }, { ATF_POINTER, 1, offsetof(struct Epyt, ypet), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Ypet, + .type = &asn_DEF_Ypet, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ypet" }, @@ -520,7 +520,7 @@ static asn_TYPE_member_t asn_MBR_senums_4[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_EnumType, + .type = &asn_DEF_EnumType, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -560,35 +560,35 @@ static asn_TYPE_member_t asn_MBR_Ypet_1[] = { { ATF_POINTER, 0, offsetof(struct Ypet, epyt), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Epyt, + .type = &asn_DEF_Epyt, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "epyt" }, { ATF_POINTER, 1, offsetof(struct Ypet, plain), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "plain" }, { ATF_NOFLAGS, 0, offsetof(struct Ypet, senums), .tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_senums_4, + .type = &asn_DEF_senums_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "senums" }, { ATF_NOFLAGS, 0, offsetof(struct Ypet, patest1), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_IA5String, + .type = &asn_DEF_IA5String, .memb_constraints = memb_patest1_1_constraint, .name = "patest1" }, { ATF_NOFLAGS, 0, offsetof(struct Ypet, patest2), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_IA5String, + .type = &asn_DEF_IA5String, .memb_constraints = memb_patest2_1_constraint, .name = "patest2" }, diff --git a/tests/84-param-tags-OK.asn1.-P b/tests/84-param-tags-OK.asn1.-P index b45977b0..65987642 100644 --- a/tests/84-param-tags-OK.asn1.-P +++ b/tests/84-param-tags-OK.asn1.-P @@ -75,7 +75,7 @@ static asn_TYPE_member_t asn_MBR_type1_2[] = { { ATF_POINTER, 1, offsetof(struct type1, common), .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_NativeInteger, + .type = &asn_DEF_NativeInteger, .memb_constraints = memb_common_2_constraint, .name = "common" }, @@ -121,7 +121,7 @@ static asn_TYPE_member_t asn_MBR_type2_4[] = { { ATF_POINTER, 1, offsetof(struct type2, common), .tag = (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BOOLEAN, + .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "common" }, @@ -168,14 +168,14 @@ static asn_TYPE_member_t asn_MBR_TestChoice_1[] = { { ATF_NOFLAGS, 0, offsetof(struct TestChoice, choice.type1), .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_type1_2, + .type = &asn_DEF_type1_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "type1" }, { ATF_NOFLAGS, 0, offsetof(struct TestChoice, choice.type2), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_type2_4, + .type = &asn_DEF_type2_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "type2" }, @@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_type1_2[] = { { ATF_NOFLAGS, 0, offsetof(struct type1, common), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_NativeInteger, + .type = &asn_DEF_NativeInteger, .memb_constraints = memb_common_2_constraint, .name = "common" }, @@ -362,7 +362,7 @@ static asn_TYPE_member_t asn_MBR_type2_4[] = { { ATF_NOFLAGS, 0, offsetof(struct type2, common), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_BOOLEAN, + .type = &asn_DEF_BOOLEAN, .memb_constraints = memb_common_4_constraint, .name = "common" }, @@ -409,14 +409,14 @@ static asn_TYPE_member_t asn_MBR_AutoChoice_1[] = { { ATF_NOFLAGS, 0, offsetof(struct AutoChoice, choice.type1), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_type1_2, + .type = &asn_DEF_type1_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "type1" }, { ATF_NOFLAGS, 0, offsetof(struct AutoChoice, choice.type2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_type2_4, + .type = &asn_DEF_type2_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "type2" }, diff --git a/tests/89-bit-string-enum-OK.asn1.-P b/tests/89-bit-string-enum-OK.asn1.-P index 3cd1f356..158a4449 100644 --- a/tests/89-bit-string-enum-OK.asn1.-P +++ b/tests/89-bit-string-enum-OK.asn1.-P @@ -37,7 +37,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T, choice.bs), .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "bs" }, diff --git a/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names b/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names index 9ac69a29..8f5d06c3 100644 --- a/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names +++ b/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names @@ -37,7 +37,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { { ATF_NOFLAGS, 0, offsetof(struct T, choice.bs), .tag = (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_BIT_STRING, + .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "bs" }, diff --git a/tests/92-circular-loops-OK.asn1.-P b/tests/92-circular-loops-OK.asn1.-P index cddd2c92..4bfcab5c 100644 --- a/tests/92-circular-loops-OK.asn1.-P +++ b/tests/92-circular-loops-OK.asn1.-P @@ -50,70 +50,70 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { { ATF_POINTER, 0, offsetof(struct Everything, ch1), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice1, + .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch1" }, { ATF_POINTER, 0, offsetof(struct Everything, ch2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice2, + .type = &asn_DEF_Choice2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch2" }, { ATF_POINTER, 0, offsetof(struct Everything, ch3), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice3, + .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch3" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, set), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, a), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, b), .tag = (ASN_TAG_CLASS_CONTEXT | (5 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, g), .tag = (ASN_TAG_CLASS_CONTEXT | (6 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, ot), .tag = (ASN_TAG_CLASS_CONTEXT | (7 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OneTwo, + .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ot" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, tt), .tag = (ASN_TAG_CLASS_CONTEXT | (8 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "tt" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, to), .tag = (ASN_TAG_CLASS_CONTEXT | (9 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ThreeOne, + .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "to" }, @@ -212,14 +212,14 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { { ATF_POINTER, 0, offsetof(struct Choice1, choice.something), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "something" }, { ATF_POINTER, 0, offsetof(struct Choice1, choice.some2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "some2" }, @@ -307,14 +307,14 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Choice2, choice.typeref), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TypeRef, + .type = &asn_DEF_TypeRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "typeref" }, { ATF_POINTER, 0, offsetof(struct Choice2, choice.some3), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "some3" }, @@ -413,7 +413,7 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { { ATF_POINTER, 0, offsetof(struct a, aa), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "aa" }, @@ -460,7 +460,7 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_Choice3, + .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -501,21 +501,21 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Choice3, choice.a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_a_2, + .type = &asn_DEF_a_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 0, offsetof(struct Choice3, choice.b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_NOFLAGS, 0, offsetof(struct Choice3, choice.c), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_c_5, + .type = &asn_DEF_c_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "c" }, @@ -604,35 +604,35 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { { ATF_NOFLAGS, 0, offsetof(struct Member, Int), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "int" }, { ATF_POINTER, 0, offsetof(struct Member, set), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_POINTER, 0, offsetof(struct Member, seq), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seq" }, { ATF_POINTER, 2, offsetof(struct Member, set2), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set2" }, { ATF_POINTER, 1, offsetof(struct Member, set3), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set3" }, @@ -682,7 +682,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Member_2, + .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -759,28 +759,28 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Sequence, a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 3, offsetof(struct Sequence, seq), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seq" }, { ATF_POINTER, 2, offsetof(struct Sequence, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 1, offsetof(struct Sequence, set), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, @@ -980,7 +980,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { { ATF_POINTER, 1, offsetof(struct b, b), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1027,14 +1027,14 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { { ATF_POINTER, 0, offsetof(struct Alpha, a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Alpha, b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_b_3, + .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1111,14 +1111,14 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { { ATF_POINTER, 2, offsetof(struct Beta, b), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 1, offsetof(struct Beta, g), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, @@ -1198,21 +1198,21 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { { ATF_POINTER, 0, offsetof(struct Gamma, o), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "o" }, { ATF_POINTER, 0, offsetof(struct Gamma, a), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 0, offsetof(struct Gamma, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1301,7 +1301,7 @@ static asn_TYPE_member_t asn_MBR_OneTwo_1[] = { { ATF_POINTER, 0, offsetof(struct OneTwo, m12), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m12" }, @@ -1394,7 +1394,7 @@ static asn_TYPE_member_t asn_MBR_TwoThree_1[] = { { ATF_POINTER, 0, offsetof(struct TwoThree, m23), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ThreeOne, + .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m23" }, @@ -1491,14 +1491,14 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { { ATF_POINTER, 0, offsetof(struct ThreeOne, m31), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OneTwo, + .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m31" }, { ATF_POINTER, 0, offsetof(struct ThreeOne, g), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, diff --git a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice index 3dbef5a4..fd06d826 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice +++ b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice @@ -50,70 +50,70 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { { ATF_POINTER, 0, offsetof(struct Everything, ch1), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice1, + .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch1" }, { ATF_POINTER, 0, offsetof(struct Everything, ch2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice2, + .type = &asn_DEF_Choice2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch2" }, { ATF_POINTER, 0, offsetof(struct Everything, ch3), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = +1, /* EXPLICIT tag at current level */ - .type = (void *)&asn_DEF_Choice3, + .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ch3" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, set), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, a), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, b), .tag = (ASN_TAG_CLASS_CONTEXT | (5 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, g), .tag = (ASN_TAG_CLASS_CONTEXT | (6 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, ot), .tag = (ASN_TAG_CLASS_CONTEXT | (7 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OneTwo, + .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ot" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, tt), .tag = (ASN_TAG_CLASS_CONTEXT | (8 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "tt" }, { ATF_NOFLAGS, 0, offsetof(struct Everything, to), .tag = (ASN_TAG_CLASS_CONTEXT | (9 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ThreeOne, + .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "to" }, @@ -212,14 +212,14 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { { ATF_POINTER, 0, offsetof(struct Choice1, choice.something), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "something" }, { ATF_POINTER, 0, offsetof(struct Choice1, choice.some2), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "some2" }, @@ -308,14 +308,14 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { { ATF_POINTER, 0, offsetof(struct Choice2, choice.typeref), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TypeRef, + .type = &asn_DEF_TypeRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "typeref" }, { ATF_POINTER, 0, offsetof(struct Choice2, choice.some3), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "some3" }, @@ -414,7 +414,7 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { { ATF_POINTER, 0, offsetof(struct a, aa), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "aa" }, @@ -461,7 +461,7 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { { ATF_POINTER, 0, 0, .tag = -1 /* Ambiguous tag (CHOICE?) */, .tag_mode = 0, - .type = (void *)&asn_DEF_Choice3, + .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -502,21 +502,21 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { { ATF_POINTER, 0, offsetof(struct Choice3, choice.a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_a_2, + .type = &asn_DEF_a_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 0, offsetof(struct Choice3, choice.b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Everything, + .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 0, offsetof(struct Choice3, choice.c), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_c_5, + .type = &asn_DEF_c_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "c" }, @@ -605,35 +605,35 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { { ATF_NOFLAGS, 0, offsetof(struct Member, Int), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "int" }, { ATF_POINTER, 0, offsetof(struct Member, set), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, { ATF_POINTER, 0, offsetof(struct Member, seq), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seq" }, { ATF_POINTER, 2, offsetof(struct Member, set2), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set2" }, { ATF_POINTER, 1, offsetof(struct Member, set3), .tag = (ASN_TAG_CLASS_CONTEXT | (4 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set3" }, @@ -683,7 +683,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_Member_2, + .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -760,28 +760,28 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Sequence, a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 3, offsetof(struct Sequence, seq), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "seq" }, { ATF_POINTER, 2, offsetof(struct Sequence, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 1, offsetof(struct Sequence, set), .tag = (ASN_TAG_CLASS_CONTEXT | (3 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Set, + .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "set" }, @@ -981,7 +981,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { { ATF_POINTER, 1, offsetof(struct b, b), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1028,14 +1028,14 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { { ATF_POINTER, 0, offsetof(struct Alpha, a), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_NOFLAGS, 0, offsetof(struct Alpha, b), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_b_3, + .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1112,14 +1112,14 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { { ATF_POINTER, 2, offsetof(struct Beta, b), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, { ATF_POINTER, 1, offsetof(struct Beta, g), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, @@ -1199,21 +1199,21 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { { ATF_POINTER, 0, offsetof(struct Gamma, o), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "o" }, { ATF_POINTER, 0, offsetof(struct Gamma, a), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Alpha, + .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "a" }, { ATF_POINTER, 0, offsetof(struct Gamma, b), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Beta, + .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "b" }, @@ -1302,7 +1302,7 @@ static asn_TYPE_member_t asn_MBR_OneTwo_1[] = { { ATF_POINTER, 0, offsetof(struct OneTwo, m12), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_TwoThree, + .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m12" }, @@ -1395,7 +1395,7 @@ static asn_TYPE_member_t asn_MBR_TwoThree_1[] = { { ATF_POINTER, 0, offsetof(struct TwoThree, m23), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_ThreeOne, + .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m23" }, @@ -1492,14 +1492,14 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { { ATF_POINTER, 0, offsetof(struct ThreeOne, m31), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_OneTwo, + .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "m31" }, { ATF_POINTER, 0, offsetof(struct ThreeOne, g), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Gamma, + .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "g" }, diff --git a/tests/93-asn1c-controls-OK.asn1.-P b/tests/93-asn1c-controls-OK.asn1.-P index 806ee3a7..0f777d50 100644 --- a/tests/93-asn1c-controls-OK.asn1.-P +++ b/tests/93-asn1c-controls-OK.asn1.-P @@ -24,14 +24,14 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Sequence, ainl), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ainl" }, { ATF_POINTER, 0, offsetof(struct Sequence, aptr), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "aptr" }, @@ -122,14 +122,14 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Set, ainl), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ainl" }, { ATF_POINTER, 0, offsetof(struct Set, aptr), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "aptr" }, @@ -232,7 +232,7 @@ static asn_TYPE_member_t asn_MBR_setof_2[] = { { ATF_POINTER, 0, 0, .tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), .tag_mode = 0, - .type = (void *)&asn_DEF_INTEGER, + .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "" }, @@ -273,21 +273,21 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { { ATF_POINTER, 0, offsetof(struct Choice, choice.setof), .tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_setof_2, + .type = &asn_DEF_setof_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "setof" }, { ATF_POINTER, 0, offsetof(struct Choice, choice.aptr), .tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "aptr" }, { ATF_NOFLAGS, 0, offsetof(struct Choice, choice.ainl), .tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)), .tag_mode = -1, /* IMPLICIT tag at current level */ - .type = (void *)&asn_DEF_Sequence, + .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ .name = "ainl" }, |