XER support
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@513 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P
index 8c609e9..0d07f8b 100644
--- a/tests/19-param-OK.asn1.-P
+++ b/tests/19-param-OK.asn1.-P
@@ -108,6 +108,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_toBeSigned = {
"toBeSigned",
+ "toBeSigned",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -168,6 +169,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Certificate = {
"Certificate",
+ "Certificate",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -229,6 +231,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Name = {
"Name",
+ "Name",
SEQUENCE_OF_free,
SEQUENCE_OF_print,
SEQUENCE_OF_constraint,
@@ -345,6 +348,7 @@
};
asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName = {
"RelativeDistinguishedName",
+ "RelativeDistinguishedName",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
diff --git a/tests/30-set-OK.asn1.-P b/tests/30-set-OK.asn1.-P
index 1ffd9b4..f944af7 100644
--- a/tests/30-set-OK.asn1.-P
+++ b/tests/30-set-OK.asn1.-P
@@ -88,6 +88,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
SET_free,
SET_print,
SET_constraint,
diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P
index 143ab8c..c245bf8 100644
--- a/tests/31-set-of-OK.asn1.-P
+++ b/tests/31-set-of-OK.asn1.-P
@@ -40,6 +40,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Forest = {
"Forest",
+ "Forest",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -115,6 +116,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Tree = {
"Tree",
+ "Tree",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -235,6 +237,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_trees = {
"trees",
+ "trees",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -280,6 +283,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_anything_member = {
"",
+ "",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -320,6 +324,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_anything = {
"anything",
+ "anything",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -371,6 +376,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_other = {
"other",
+ "other",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -441,6 +447,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Stuff = {
"Stuff",
+ "Stuff",
SET_free,
SET_print,
SET_constraint,
diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P
index 508eb05..5c2c9b2 100644
--- a/tests/32-sequence-of-OK.asn1.-P
+++ b/tests/32-sequence-of-OK.asn1.-P
@@ -40,6 +40,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Programming = {
"Programming",
+ "Programming",
SEQUENCE_OF_free,
SEQUENCE_OF_print,
SEQUENCE_OF_constraint,
@@ -101,6 +102,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Fault = {
"Fault",
+ "Fault",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -159,6 +161,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Error = {
"Error",
+ "Error",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/39-sequence-of-OK.asn1.-P b/tests/39-sequence-of-OK.asn1.-P
index 6ef4a4f..1fecb6f 100644
--- a/tests/39-sequence-of-OK.asn1.-P
+++ b/tests/39-sequence-of-OK.asn1.-P
@@ -49,6 +49,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_collection = {
"collection",
+ "collection",
SEQUENCE_OF_free,
SEQUENCE_OF_print,
SEQUENCE_OF_constraint,
@@ -101,6 +102,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -177,6 +179,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T2 = {
"T2",
+ "T2",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR
index 1bfd634..951e669 100644
--- a/tests/42-real-life-OK.asn1.-PR
+++ b/tests/42-real-life-OK.asn1.-PR
@@ -85,6 +85,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_varsets = {
"varsets",
+ "varsets",
SEQUENCE_OF_free,
SEQUENCE_OF_print,
SEQUENCE_OF_constraint,
@@ -137,6 +138,7 @@
};
asn_TYPE_descriptor_t asn_DEF_LogLine = {
"LogLine",
+ "LogLine",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -233,6 +235,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_vparts = {
"vparts",
+ "vparts",
SEQUENCE_OF_free,
SEQUENCE_OF_print,
SEQUENCE_OF_constraint,
@@ -285,6 +288,7 @@
};
asn_TYPE_descriptor_t asn_DEF_VariablePartSet = {
"VariablePartSet",
+ "VariablePartSet",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -410,6 +414,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_vset = {
"vset",
+ "vset",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -463,6 +468,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_vrange = {
"vrange",
+ "vrange",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -513,6 +519,7 @@
};
asn_TYPE_descriptor_t asn_DEF_VariablePart = {
"VariablePart",
+ "VariablePart",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -604,6 +611,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_email = {
"email",
+ "email",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -657,6 +665,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_notify = {
"notify",
+ "notify",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -709,6 +718,7 @@
};
asn_TYPE_descriptor_t asn_DEF_ActionItem = {
"ActionItem",
+ "ActionItem",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/43-recursion-OK.asn1.-P b/tests/43-recursion-OK.asn1.-P
index 7f03aad..004e0f0 100644
--- a/tests/43-recursion-OK.asn1.-P
+++ b/tests/43-recursion-OK.asn1.-P
@@ -60,6 +60,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_t_member1 = {
"t-member1",
+ "t-member1",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -99,6 +100,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_t_member2 = {
"t-member2",
+ "t-member2",
SEQUENCE_OF_free,
SEQUENCE_OF_print,
SEQUENCE_OF_constraint,
@@ -167,6 +169,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = {
"Test-structure-1",
+ "Test-structure-1",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -254,6 +257,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_or = {
"or",
+ "or",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -320,6 +324,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Choice_1 = {
"Choice-1",
+ "Choice-1",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -403,6 +408,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Test_structure_2 = {
"Test-structure-2",
+ "Test-structure-2",
SET_free,
SET_print,
SET_constraint,
@@ -488,6 +494,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Test_structure_3 = {
"Test-structure-3",
+ "Test-structure-3",
SET_free,
SET_print,
SET_constraint,
diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P
index 8b3106d..bb51a57 100644
--- a/tests/44-choice-in-sequence-OK.asn1.-P
+++ b/tests/44-choice-in-sequence-OK.asn1.-P
@@ -100,6 +100,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_e = {
"e",
+ "e",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -149,6 +150,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_h = {
"h",
+ "h",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -215,6 +217,7 @@
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_b = {
"b",
+ "b",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -270,6 +273,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR
index 92a81ca..4650b51 100644
--- a/tests/46-redefine-OK.asn1.-PR
+++ b/tests/46-redefine-OK.asn1.-PR
@@ -64,6 +64,7 @@
};
asn_TYPE_descriptor_t asn_DEF_ConstructedType = {
"ConstructedType",
+ "ConstructedType",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -144,7 +145,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T_inherit_TYPE_descriptor(td);
@@ -176,6 +177,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
T_free,
T_print,
T_constraint,
diff --git a/tests/47-set-ext-OK.asn1.-P b/tests/47-set-ext-OK.asn1.-P
index 5aa2ce2..8c2bc27 100644
--- a/tests/47-set-ext-OK.asn1.-P
+++ b/tests/47-set-ext-OK.asn1.-P
@@ -66,6 +66,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T1 = {
"T1",
+ "T1",
SET_free,
SET_print,
SET_constraint,
@@ -153,6 +154,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T2 = {
"T2",
+ "T2",
SET_free,
SET_print,
SET_constraint,
@@ -229,6 +231,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T3 = {
"T3",
+ "T3",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
@@ -303,6 +306,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T4 = {
"T4",
+ "T4",
CHOICE_free,
CHOICE_print,
CHOICE_constraint,
diff --git a/tests/50-constraint-OK.asn1.-P b/tests/50-constraint-OK.asn1.-P
index 9eba469..6f4dac1 100644
--- a/tests/50-constraint-OK.asn1.-P
+++ b/tests/50-constraint-OK.asn1.-P
@@ -97,7 +97,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Int2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Int2_inherit_TYPE_descriptor(td);
@@ -128,6 +128,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Int2 = {
"Int2",
+ "Int2",
Int2_free,
Int2_print,
Int2_constraint,
@@ -230,7 +231,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Int3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Int3_inherit_TYPE_descriptor(td);
@@ -261,6 +262,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Int3 = {
"Int3",
+ "Int3",
Int3_free,
Int3_print,
Int3_constraint,
@@ -363,7 +365,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Int4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Int4_inherit_TYPE_descriptor(td);
@@ -394,6 +396,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Int4 = {
"Int4",
+ "Int4",
Int4_free,
Int4_print,
Int4_constraint,
@@ -496,7 +499,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Int5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Int5_inherit_TYPE_descriptor(td);
@@ -527,6 +530,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Int5 = {
"Int5",
+ "Int5",
Int5_free,
Int5_print,
Int5_constraint,
@@ -629,7 +633,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
ExtensibleExtensions_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
ExtensibleExtensions_inherit_TYPE_descriptor(td);
@@ -660,6 +664,7 @@
};
asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = {
"ExtensibleExtensions",
+ "ExtensibleExtensions",
ExtensibleExtensions_free,
ExtensibleExtensions_print,
ExtensibleExtensions_constraint,
@@ -793,7 +798,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Str2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Str2_inherit_TYPE_descriptor(td);
@@ -824,6 +829,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Str2 = {
"Str2",
+ "Str2",
Str2_free,
Str2_print,
Str2_constraint,
@@ -949,7 +955,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Str3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Str3_inherit_TYPE_descriptor(td);
@@ -980,6 +986,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Str3 = {
"Str3",
+ "Str3",
Str3_free,
Str3_print,
Str3_constraint,
@@ -1091,7 +1098,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Str4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Str4_inherit_TYPE_descriptor(td);
@@ -1122,6 +1129,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Str4 = {
"Str4",
+ "Str4",
Str4_free,
Str4_print,
Str4_constraint,
@@ -1233,7 +1241,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
PER_Visible_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
PER_Visible_inherit_TYPE_descriptor(td);
@@ -1264,6 +1272,7 @@
};
asn_TYPE_descriptor_t asn_DEF_PER_Visible = {
"PER-Visible",
+ "PER-Visible",
PER_Visible_free,
PER_Visible_print,
PER_Visible_constraint,
@@ -1375,7 +1384,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
PER_Visible_2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
PER_Visible_2_inherit_TYPE_descriptor(td);
@@ -1406,6 +1415,7 @@
};
asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = {
"PER-Visible-2",
+ "PER-Visible-2",
PER_Visible_2_free,
PER_Visible_2_print,
PER_Visible_2_constraint,
@@ -1517,7 +1527,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Not_PER_Visible_1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Not_PER_Visible_1_inherit_TYPE_descriptor(td);
@@ -1548,6 +1558,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = {
"Not-PER-Visible-1",
+ "Not-PER-Visible-1",
Not_PER_Visible_1_free,
Not_PER_Visible_1_print,
Not_PER_Visible_1_constraint,
@@ -1659,7 +1670,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Not_PER_Visible_2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Not_PER_Visible_2_inherit_TYPE_descriptor(td);
@@ -1690,6 +1701,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = {
"Not-PER-Visible-2",
+ "Not-PER-Visible-2",
Not_PER_Visible_2_free,
Not_PER_Visible_2_print,
Not_PER_Visible_2_constraint,
@@ -1801,7 +1813,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Not_PER_Visible_3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Not_PER_Visible_3_inherit_TYPE_descriptor(td);
@@ -1832,6 +1844,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = {
"Not-PER-Visible-3",
+ "Not-PER-Visible-3",
Not_PER_Visible_3_free,
Not_PER_Visible_3_print,
Not_PER_Visible_3_constraint,
@@ -1946,7 +1959,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
SIZE_but_not_FROM_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
SIZE_but_not_FROM_inherit_TYPE_descriptor(td);
@@ -1977,6 +1990,7 @@
};
asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = {
"SIZE-but-not-FROM",
+ "SIZE-but-not-FROM",
SIZE_but_not_FROM_free,
SIZE_but_not_FROM_print,
SIZE_but_not_FROM_constraint,
@@ -2091,7 +2105,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
SIZE_and_FROM_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
SIZE_and_FROM_inherit_TYPE_descriptor(td);
@@ -2122,6 +2136,7 @@
};
asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = {
"SIZE-and-FROM",
+ "SIZE-and-FROM",
SIZE_and_FROM_free,
SIZE_and_FROM_print,
SIZE_and_FROM_constraint,
@@ -2233,7 +2248,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Neither_SIZE_nor_FROM_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(td);
@@ -2264,6 +2279,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = {
"Neither-SIZE-nor-FROM",
+ "Neither-SIZE-nor-FROM",
Neither_SIZE_nor_FROM_free,
Neither_SIZE_nor_FROM_print,
Neither_SIZE_nor_FROM_constraint,
@@ -2369,7 +2385,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Utf8_4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Utf8_4_inherit_TYPE_descriptor(td);
@@ -2400,6 +2416,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Utf8_4 = {
"Utf8-4",
+ "Utf8-4",
Utf8_4_free,
Utf8_4_print,
Utf8_4_constraint,
@@ -2533,7 +2550,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Utf8_3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Utf8_3_inherit_TYPE_descriptor(td);
@@ -2564,6 +2581,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Utf8_3 = {
"Utf8-3",
+ "Utf8-3",
Utf8_3_free,
Utf8_3_print,
Utf8_3_constraint,
@@ -2667,7 +2685,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Utf8_2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Utf8_2_inherit_TYPE_descriptor(td);
@@ -2698,6 +2716,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Utf8_2 = {
"Utf8-2",
+ "Utf8-2",
Utf8_2_free,
Utf8_2_print,
Utf8_2_constraint,
@@ -2862,7 +2881,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
Identifier_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
Identifier_inherit_TYPE_descriptor(td);
@@ -2893,6 +2912,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Identifier = {
"Identifier",
+ "Identifier",
Identifier_free,
Identifier_print,
Identifier_constraint,
diff --git a/tests/60-any-OK.asn1.-P b/tests/60-any-OK.asn1.-P
index 59aa7b1..f740e8a 100644
--- a/tests/60-any-OK.asn1.-P
+++ b/tests/60-any-OK.asn1.-P
@@ -54,6 +54,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T1 = {
"T1",
+ "T1",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
@@ -130,6 +131,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T2 = {
"T2",
+ "T2",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/65-multi-tag-OK.asn1.-P b/tests/65-multi-tag-OK.asn1.-P
index 995697e..4ffc4b2 100644
--- a/tests/65-multi-tag-OK.asn1.-P
+++ b/tests/65-multi-tag-OK.asn1.-P
@@ -59,7 +59,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T1_inherit_TYPE_descriptor(td);
@@ -101,6 +101,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T1 = {
"T1",
+ "T1",
T1_free,
T1_print,
T1_constraint,
@@ -180,7 +181,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T2_inherit_TYPE_descriptor(td);
@@ -220,6 +221,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T2 = {
"T2",
+ "T2",
T2_free,
T2_print,
T2_constraint,
@@ -299,7 +301,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T3_inherit_TYPE_descriptor(td);
@@ -337,6 +339,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T3 = {
"T3",
+ "T3",
T3_free,
T3_print,
T3_constraint,
@@ -416,7 +419,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T4_inherit_TYPE_descriptor(td);
@@ -449,6 +452,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T4 = {
"T4",
+ "T4",
T4_free,
T4_print,
T4_constraint,
@@ -528,7 +532,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T5_inherit_TYPE_descriptor(td);
@@ -560,6 +564,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T5 = {
"T5",
+ "T5",
T5_free,
T5_print,
T5_constraint,
@@ -658,7 +663,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T_inherit_TYPE_descriptor(td);
@@ -691,6 +696,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
T_free,
T_print,
T_constraint,
@@ -776,6 +782,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Ts = {
"Ts",
+ "Ts",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types
index faed7c6..796962a 100644
--- a/tests/65-multi-tag-OK.asn1.-Pfnative-types
+++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types
@@ -59,7 +59,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T1_inherit_TYPE_descriptor(td);
@@ -101,6 +101,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T1 = {
"T1",
+ "T1",
T1_free,
T1_print,
T1_constraint,
@@ -180,7 +181,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T2_inherit_TYPE_descriptor(td);
@@ -220,6 +221,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T2 = {
"T2",
+ "T2",
T2_free,
T2_print,
T2_constraint,
@@ -299,7 +301,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T3_inherit_TYPE_descriptor(td);
@@ -337,6 +339,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T3 = {
"T3",
+ "T3",
T3_free,
T3_print,
T3_constraint,
@@ -416,7 +419,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T4_inherit_TYPE_descriptor(td);
@@ -449,6 +452,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T4 = {
"T4",
+ "T4",
T4_free,
T4_print,
T4_constraint,
@@ -528,7 +532,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T5_inherit_TYPE_descriptor(td);
@@ -560,6 +564,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T5 = {
"T5",
+ "T5",
T5_free,
T5_print,
T5_constraint,
@@ -658,7 +663,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
T_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
T_inherit_TYPE_descriptor(td);
@@ -691,6 +696,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
T_free,
T_print,
T_constraint,
@@ -776,6 +782,7 @@
};
asn_TYPE_descriptor_t asn_DEF_Ts = {
"Ts",
+ "Ts",
SEQUENCE_free,
SEQUENCE_print,
SEQUENCE_constraint,
diff --git a/tests/66-ref-simple-OK.asn1.-P b/tests/66-ref-simple-OK.asn1.-P
index 025f7e9..0131c91 100644
--- a/tests/66-ref-simple-OK.asn1.-P
+++ b/tests/66-ref-simple-OK.asn1.-P
@@ -40,6 +40,7 @@
};
asn_TYPE_descriptor_t asn_DEF_T = {
"T",
+ "T",
SET_OF_free,
SET_OF_print,
SET_OF_constraint,
@@ -128,7 +129,7 @@
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
-ber_dec_rval_t
+asn_dec_rval_t
SimpleType_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
void **structure, void *bufptr, size_t size, int tag_mode) {
SimpleType_inherit_TYPE_descriptor(td);
@@ -159,6 +160,7 @@
};
asn_TYPE_descriptor_t asn_DEF_SimpleType = {
"SimpleType",
+ "SimpleType",
SimpleType_free,
SimpleType_print,
SimpleType_constraint,