asn1_* renamed into asn_*
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@439 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P
index 09b999a..8b3106d 100644
--- a/tests/44-choice-in-sequence-OK.asn1.-P
+++ b/tests/44-choice-in-sequence-OK.asn1.-P
@@ -24,7 +24,7 @@
h_PR_i,
h_PR_j,
} h_PR;
-extern asn1_TYPE_descriptor_t asn1_DEF_T;
+extern asn_TYPE_descriptor_t asn_DEF_T;
/*** <<< TYPE-DECLS [T] >>> ***/
@@ -44,7 +44,7 @@
} choice;
/* Context for parsing across buffer boundaries */
- ber_dec_ctx_t _ber_dec_ctx;
+ asn_struct_ctx_t _asn_ctx;
} e;
struct h {
h_PR present;
@@ -54,51 +54,51 @@
} choice;
/* Context for parsing across buffer boundaries */
- ber_dec_ctx_t _ber_dec_ctx;
+ asn_struct_ctx_t _asn_ctx;
} h;
} choice;
/* Context for parsing across buffer boundaries */
- ber_dec_ctx_t _ber_dec_ctx;
+ asn_struct_ctx_t _asn_ctx;
} b;
/* Context for parsing across buffer boundaries */
- ber_dec_ctx_t _ber_dec_ctx;
+ asn_struct_ctx_t _asn_ctx;
} T_t;
/*** <<< STAT-DEFS [T] >>> ***/
-static asn1_TYPE_member_t asn1_MBR_e[] = {
+static asn_TYPE_member_t asn_MBR_e[] = {
{ 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 *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual 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 *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual type */
.name = "g"
},
};
-static asn1_TYPE_tag2member_t asn1_DEF_e_tag2el[] = {
+static asn_TYPE_tag2member_t asn_DEF_e_tag2el[] = {
{ (ASN_TAG_CLASS_PRIVATE | (7 << 2)), 0, 0, 0 }, /* f at 20 */
{ (ASN_TAG_CLASS_PRIVATE | (8 << 2)), 1, 0, 0 }, /* g at 21 */
};
-static asn1_CHOICE_specifics_t asn1_DEF_e_specs = {
+static asn_CHOICE_specifics_t asn_DEF_e_specs = {
sizeof(struct e),
- offsetof(struct e, _ber_dec_ctx),
+ offsetof(struct e, _asn_ctx),
offsetof(struct e, present),
sizeof(((struct e *)0)->present),
- asn1_DEF_e_tag2el,
+ asn_DEF_e_tag2el,
2, /* Count of tags in the map */
0 /* Whether extensible */
};
static /* Use -fall-defs-global to expose */
-asn1_TYPE_descriptor_t asn1_DEF_e = {
+asn_TYPE_descriptor_t asn_DEF_e = {
"e",
CHOICE_free,
CHOICE_print,
@@ -112,42 +112,42 @@
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- asn1_MBR_e,
+ asn_MBR_e,
2, /* Elements count */
- &asn1_DEF_e_specs /* Additional specs */
+ &asn_DEF_e_specs /* Additional specs */
};
-static asn1_TYPE_member_t asn1_MBR_h[] = {
+static asn_TYPE_member_t asn_MBR_h[] = {
{ 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 *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual 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 *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual type */
.name = "j"
},
};
-static asn1_TYPE_tag2member_t asn1_DEF_h_tag2el[] = {
+static asn_TYPE_tag2member_t asn_DEF_h_tag2el[] = {
{ (ASN_TAG_CLASS_PRIVATE | (1 << 2)), 0, 0, 0 }, /* i at 24 */
{ (ASN_TAG_CLASS_PRIVATE | (2 << 2)), 1, 0, 0 }, /* j at 25 */
};
-static asn1_CHOICE_specifics_t asn1_DEF_h_specs = {
+static asn_CHOICE_specifics_t asn_DEF_h_specs = {
sizeof(struct h),
- offsetof(struct h, _ber_dec_ctx),
+ offsetof(struct h, _asn_ctx),
offsetof(struct h, present),
sizeof(((struct h *)0)->present),
- asn1_DEF_h_tag2el,
+ asn_DEF_h_tag2el,
2, /* Count of tags in the map */
0 /* Whether extensible */
};
static /* Use -fall-defs-global to expose */
-asn1_TYPE_descriptor_t asn1_DEF_h = {
+asn_TYPE_descriptor_t asn_DEF_h = {
"h",
CHOICE_free,
CHOICE_print,
@@ -161,59 +161,59 @@
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- asn1_MBR_h,
+ asn_MBR_h,
2, /* Elements count */
- &asn1_DEF_h_specs /* Additional specs */
+ &asn_DEF_h_specs /* Additional specs */
};
-static asn1_TYPE_member_t asn1_MBR_b[] = {
+static asn_TYPE_member_t asn_MBR_b[] = {
{ 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 *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual 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 *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual type */
.name = "d"
},
{ ATF_NOFLAGS, 0, offsetof(struct b, choice.e),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
- .type = (void *)&asn1_DEF_e,
+ .type = (void *)&asn_DEF_e,
.memb_constraints = 0, /* Defer to actual 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 *)&asn1_DEF_h,
+ .type = (void *)&asn_DEF_h,
.memb_constraints = 0, /* Defer to actual type */
.name = "h"
},
};
-static asn1_TYPE_tag2member_t asn1_DEF_b_tag2el[] = {
+static asn_TYPE_tag2member_t asn_DEF_b_tag2el[] = {
{ (ASN_TAG_CLASS_PRIVATE | (5 << 2)), 0, 0, 0 }, /* c at 17 */
{ (ASN_TAG_CLASS_PRIVATE | (6 << 2)), 1, 0, 0 }, /* d at 18 */
{ (ASN_TAG_CLASS_PRIVATE | (7 << 2)), 2, 0, 0 }, /* f at 20 */
{ (ASN_TAG_CLASS_PRIVATE | (8 << 2)), 2, 0, 0 }, /* g at 21 */
{ (ASN_TAG_CLASS_PRIVATE | (9 << 2)), 3, 0, 0 }, /* h at 24 */
};
-static asn1_CHOICE_specifics_t asn1_DEF_b_specs = {
+static asn_CHOICE_specifics_t asn_DEF_b_specs = {
sizeof(struct b),
- offsetof(struct b, _ber_dec_ctx),
+ offsetof(struct b, _asn_ctx),
offsetof(struct b, present),
sizeof(((struct b *)0)->present),
- asn1_DEF_b_tag2el,
+ asn_DEF_b_tag2el,
5, /* Count of tags in the map */
0 /* Whether extensible */
};
static /* Use -fall-defs-global to expose */
-asn1_TYPE_descriptor_t asn1_DEF_b = {
+asn_TYPE_descriptor_t asn_DEF_b = {
"b",
CHOICE_free,
CHOICE_print,
@@ -227,32 +227,32 @@
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- asn1_MBR_b,
+ asn_MBR_b,
4, /* Elements count */
- &asn1_DEF_b_specs /* Additional specs */
+ &asn_DEF_b_specs /* Additional specs */
};
-static asn1_TYPE_member_t asn1_MBR_T[] = {
+static asn_TYPE_member_t asn_MBR_T[] = {
{ ATF_NOFLAGS, 0, offsetof(struct T, a),
.tag = (ASN_TAG_CLASS_PRIVATE | (2 << 2)),
.tag_mode = -1, /* IMPLICIT tag at current level */
- .type = (void *)&asn1_DEF_NULL,
+ .type = (void *)&asn_DEF_NULL,
.memb_constraints = 0, /* Defer to actual type */
.name = "a"
},
{ ATF_NOFLAGS, 0, offsetof(struct T, b),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
- .type = (void *)&asn1_DEF_b,
+ .type = (void *)&asn_DEF_b,
.memb_constraints = 0, /* Defer to actual type */
.name = "b"
},
};
-static ber_tlv_tag_t asn1_DEF_T_tags[] = {
+static ber_tlv_tag_t asn_DEF_T_tags[] = {
(ASN_TAG_CLASS_PRIVATE | (1 << 2)),
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
-static asn1_TYPE_tag2member_t asn1_DEF_T_tag2el[] = {
+static asn_TYPE_tag2member_t asn_DEF_T_tag2el[] = {
{ (ASN_TAG_CLASS_PRIVATE | (2 << 2)), 0, 0, 0 }, /* a at 15 */
{ (ASN_TAG_CLASS_PRIVATE | (5 << 2)), 1, 0, 0 }, /* c at 17 */
{ (ASN_TAG_CLASS_PRIVATE | (6 << 2)), 1, 0, 0 }, /* d at 18 */
@@ -260,15 +260,15 @@
{ (ASN_TAG_CLASS_PRIVATE | (8 << 2)), 1, 0, 0 }, /* g at 21 */
{ (ASN_TAG_CLASS_PRIVATE | (9 << 2)), 1, 0, 0 }, /* h at 24 */
};
-static asn1_SEQUENCE_specifics_t asn1_DEF_T_specs = {
+static asn_SEQUENCE_specifics_t asn_DEF_T_specs = {
sizeof(struct T),
- offsetof(struct T, _ber_dec_ctx),
- asn1_DEF_T_tag2el,
+ offsetof(struct T, _asn_ctx),
+ asn_DEF_T_tag2el,
6, /* Count of tags in the map */
-1, /* Start extensions */
-1 /* Stop extensions */
};
-asn1_TYPE_descriptor_t asn1_DEF_T = {
+asn_TYPE_descriptor_t asn_DEF_T = {
"T",
SEQUENCE_free,
SEQUENCE_print,
@@ -278,14 +278,14 @@
0, /* Not implemented yet */
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
- asn1_DEF_T_tags,
- sizeof(asn1_DEF_T_tags)
- /sizeof(asn1_DEF_T_tags[0]) - 1, /* 1 */
- asn1_DEF_T_tags, /* Same as above */
- sizeof(asn1_DEF_T_tags)
- /sizeof(asn1_DEF_T_tags[0]), /* 2 */
- asn1_MBR_T,
+ asn_DEF_T_tags,
+ sizeof(asn_DEF_T_tags)
+ /sizeof(asn_DEF_T_tags[0]) - 1, /* 1 */
+ asn_DEF_T_tags, /* Same as above */
+ sizeof(asn_DEF_T_tags)
+ /sizeof(asn_DEF_T_tags[0]), /* 2 */
+ asn_MBR_T,
2, /* Elements count */
- &asn1_DEF_T_specs /* Additional specs */
+ &asn_DEF_T_specs /* Additional specs */
};