regenerated tests based on Wim L patch

vlm · Oct 13, 2014 · a7591b5 · a7591b5
1 parent 78d604f
commit a7591b5
Show file tree

Hide file tree

Showing 52 changed files with 561 additions and 560 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 
 0.9.??:
+    * Merged constness patch by Wim L <wiml@omnigroup.com> (41bbf1c..78d604f).
 
 0.9.27: 2014-Sep-17
     * Build structure fixes for portability.

diff --git a/skeletons/PrintableString.c b/skeletons/PrintableString.c
@@ -19,7 +19,7 @@ static const int _PrintableString_alphabet[256] = {
  0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
 64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
 };
-static const int _PrintableString_code2value[74] = { 
+static const int _PrintableString_code2value[74] = {
 32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
 55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
 75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,

diff --git a/tests/03-enum-OK.asn1.-Pfwide-types b/tests/03-enum-OK.asn1.-Pfwide-types
@@ -109,21 +109,21 @@ Enum1_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [Enum1] >>> ***/
 
-static asn_INTEGER_enum_map_t asn_MAP_Enum1_value2enum_1[] = {
+static const asn_INTEGER_enum_map_t asn_MAP_Enum1_value2enum_1[] = {
 	{ 0,	3,	"red" },
 	{ 1,	5,	"green" },
 	{ 4,	4,	"blue" },
 	{ 5,	5,	"alpha" }
 	/* This list is extensible */
 };
-static unsigned int asn_MAP_Enum1_enum2value_1[] = {
+static const unsigned int asn_MAP_Enum1_enum2value_1[] = {
 	3,	/* alpha(5) */
 	2,	/* blue(4) */
 	1,	/* green(1) */
 	0	/* red(0) */
 	/* This list is extensible */
 };
-static asn_INTEGER_specifics_t asn_SPC_Enum1_specs_1 = {
+static const asn_INTEGER_specifics_t asn_SPC_Enum1_specs_1 = {
 	asn_MAP_Enum1_value2enum_1,	/* "tag" => N; sorted by tag */
 	asn_MAP_Enum1_enum2value_1,	/* N => "tag"; sorted by N */
 	4,	/* Number of elements in the maps */
@@ -132,7 +132,7 @@ static asn_INTEGER_specifics_t asn_SPC_Enum1_specs_1 = {
 	0,	/* Native long size */
 	0
 };
-static ber_tlv_tag_t asn_DEF_Enum1_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Enum1_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_Enum1 = {
@@ -272,7 +272,7 @@ Enum2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [Enum2] >>> ***/
 
-static asn_INTEGER_enum_map_t asn_MAP_Enum2_value2enum_1[] = {
+static const asn_INTEGER_enum_map_t asn_MAP_Enum2_value2enum_1[] = {
 	{ 0,	3,	"red" },
 	{ 1,	5,	"green" },
 	{ 12,	4,	"beta" },
@@ -282,7 +282,7 @@ static asn_INTEGER_enum_map_t asn_MAP_Enum2_value2enum_1[] = {
 	{ 103,	5,	"gamma" }
 	/* This list is extensible */
 };
-static unsigned int asn_MAP_Enum2_enum2value_1[] = {
+static const unsigned int asn_MAP_Enum2_enum2value_1[] = {
 	5,	/* alpha(46) */
 	2,	/* beta(12) */
 	4,	/* blue(45) */
@@ -292,7 +292,7 @@ static unsigned int asn_MAP_Enum2_enum2value_1[] = {
 	0	/* red(0) */
 	/* This list is extensible */
 };
-static asn_INTEGER_specifics_t asn_SPC_Enum2_specs_1 = {
+static const asn_INTEGER_specifics_t asn_SPC_Enum2_specs_1 = {
 	asn_MAP_Enum2_value2enum_1,	/* "tag" => N; sorted by tag */
 	asn_MAP_Enum2_enum2value_1,	/* N => "tag"; sorted by N */
 	7,	/* Number of elements in the maps */
@@ -301,7 +301,7 @@ static asn_INTEGER_specifics_t asn_SPC_Enum2_specs_1 = {
 	0,	/* Native long size */
 	0
 };
-static ber_tlv_tag_t asn_DEF_Enum2_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Enum2_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_Enum2 = {
@@ -437,19 +437,19 @@ Enum3_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [Enum3] >>> ***/
 
-static asn_INTEGER_enum_map_t asn_MAP_Enum3_value2enum_1[] = {
+static const asn_INTEGER_enum_map_t asn_MAP_Enum3_value2enum_1[] = {
 	{ 0,	1,	"a" },
 	{ 1,	1,	"c" },
 	{ 3,	1,	"b" }
 	/* This list is extensible */
 };
-static unsigned int asn_MAP_Enum3_enum2value_1[] = {
+static const unsigned int asn_MAP_Enum3_enum2value_1[] = {
 	0,	/* a(0) */
 	2,	/* b(3) */
 	1	/* c(1) */
 	/* This list is extensible */
 };
-static asn_INTEGER_specifics_t asn_SPC_Enum3_specs_1 = {
+static const asn_INTEGER_specifics_t asn_SPC_Enum3_specs_1 = {
 	asn_MAP_Enum3_value2enum_1,	/* "tag" => N; sorted by tag */
 	asn_MAP_Enum3_enum2value_1,	/* N => "tag"; sorted by N */
 	3,	/* Number of elements in the maps */
@@ -458,7 +458,7 @@ static asn_INTEGER_specifics_t asn_SPC_Enum3_specs_1 = {
 	0,	/* Native long size */
 	0
 };
-static ber_tlv_tag_t asn_DEF_Enum3_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Enum3_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_Enum3 = {
@@ -595,21 +595,21 @@ Enum4_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [Enum4] >>> ***/
 
-static asn_INTEGER_enum_map_t asn_MAP_Enum4_value2enum_1[] = {
+static const asn_INTEGER_enum_map_t asn_MAP_Enum4_value2enum_1[] = {
 	{ 0,	1,	"a" },
 	{ 1,	1,	"b" },
 	{ 3,	1,	"c" },
 	{ 4,	1,	"d" }
 	/* This list is extensible */
 };
-static unsigned int asn_MAP_Enum4_enum2value_1[] = {
+static const unsigned int asn_MAP_Enum4_enum2value_1[] = {
 	0,	/* a(0) */
 	1,	/* b(1) */
 	2,	/* c(3) */
 	3	/* d(4) */
 	/* This list is extensible */
 };
-static asn_INTEGER_specifics_t asn_SPC_Enum4_specs_1 = {
+static const asn_INTEGER_specifics_t asn_SPC_Enum4_specs_1 = {
 	asn_MAP_Enum4_value2enum_1,	/* "tag" => N; sorted by tag */
 	asn_MAP_Enum4_enum2value_1,	/* N => "tag"; sorted by N */
 	4,	/* Number of elements in the maps */
@@ -618,7 +618,7 @@ static asn_INTEGER_specifics_t asn_SPC_Enum4_specs_1 = {
 	0,	/* Native long size */
 	0
 };
-static ber_tlv_tag_t asn_DEF_Enum4_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Enum4_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_Enum4 = {
@@ -754,19 +754,19 @@ Enum5_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [Enum5] >>> ***/
 
-static asn_INTEGER_enum_map_t asn_MAP_Enum5_value2enum_1[] = {
+static const asn_INTEGER_enum_map_t asn_MAP_Enum5_value2enum_1[] = {
 	{ 0,	1,	"a" },
 	{ 25,	1,	"z" },
 	{ 26,	1,	"d" }
 	/* This list is extensible */
 };
-static unsigned int asn_MAP_Enum5_enum2value_1[] = {
+static const unsigned int asn_MAP_Enum5_enum2value_1[] = {
 	0,	/* a(0) */
 	2,	/* d(26) */
 	1	/* z(25) */
 	/* This list is extensible */
 };
-static asn_INTEGER_specifics_t asn_SPC_Enum5_specs_1 = {
+static const asn_INTEGER_specifics_t asn_SPC_Enum5_specs_1 = {
 	asn_MAP_Enum5_value2enum_1,	/* "tag" => N; sorted by tag */
 	asn_MAP_Enum5_enum2value_1,	/* N => "tag"; sorted by N */
 	3,	/* Number of elements in the maps */
@@ -775,7 +775,7 @@ static asn_INTEGER_specifics_t asn_SPC_Enum5_specs_1 = {
 	0,	/* Native long size */
 	0
 };
-static ber_tlv_tag_t asn_DEF_Enum5_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Enum5_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_Enum5 = {

diff --git a/tests/104-param-1-OK.asn1.-Pfwide-types b/tests/104-param-1-OK.asn1.-Pfwide-types
@@ -39,7 +39,7 @@ static asn_TYPE_member_t asn_MBR_Collection_16P0_1[] = {
 		.name = ""
 		},
 };
-static ber_tlv_tag_t asn_DEF_Collection_16P0_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Collection_16P0_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_Collection_16P0_specs_1 = {
@@ -82,7 +82,7 @@ static asn_TYPE_member_t asn_MBR_Collection_16P1_3[] = {
 		.name = ""
 		},
 };
-static ber_tlv_tag_t asn_DEF_Collection_16P1_tags_3[] = {
+static const ber_tlv_tag_t asn_DEF_Collection_16P1_tags_3[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
 static asn_SET_OF_specifics_t asn_SPC_Collection_16P1_specs_3 = {
@@ -156,10 +156,10 @@ static asn_TYPE_member_t asn_MBR_Bunch_1[] = {
 		.name = "field-IA5String"
 		},
 };
-static ber_tlv_tag_t asn_DEF_Bunch_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Bunch_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_Bunch_tag2el_1[] = {
+static const asn_TYPE_tag2member_t asn_MAP_Bunch_tag2el_1[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 1 }, /* field-REAL */
     { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 1, -1, 0 } /* field-IA5String */
 };

diff --git a/tests/105-param-2-OK.asn1.-Pfwide-types b/tests/105-param-2-OK.asn1.-Pfwide-types
@@ -58,10 +58,10 @@ static asn_TYPE_member_t asn_MBR_SIGNED_16P0_1[] = {
 		.name = "signed"
 		},
 };
-static ber_tlv_tag_t asn_DEF_SIGNED_16P0_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_SIGNED_16P0_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_SIGNED_16P0_tag2el_1[] = {
+static const asn_TYPE_tag2member_t asn_MAP_SIGNED_16P0_tag2el_1[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)), 0, 0, 0 } /* signed */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P0_specs_1 = {
@@ -108,13 +108,13 @@ static asn_TYPE_member_t asn_MBR_signed_4[] = {
 		.name = "a"
 		},
 };
-static ber_tlv_tag_t asn_DEF_signed_tags_4[] = {
+static const ber_tlv_tag_t asn_DEF_signed_tags_4[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_signed_tag2el_4[] = {
+static const asn_TYPE_tag2member_t asn_MAP_signed_tag2el_4[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* a */
 };
-static uint8_t asn_MAP_signed_mmap_4[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = {
+static const uint8_t asn_MAP_signed_mmap_4[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = {
 	(1 << 7)
 };
 static asn_SET_specifics_t asn_SPC_signed_specs_4 = {
@@ -164,10 +164,10 @@ static asn_TYPE_member_t asn_MBR_SIGNED_16P1_3[] = {
 		.name = "signed"
 		},
 };
-static ber_tlv_tag_t asn_DEF_SIGNED_16P1_tags_3[] = {
+static const ber_tlv_tag_t asn_DEF_SIGNED_16P1_tags_3[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_SIGNED_16P1_tag2el_3[] = {
+static const asn_TYPE_tag2member_t asn_MAP_SIGNED_16P1_tag2el_3[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 } /* signed */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P1_specs_3 = {
@@ -302,7 +302,7 @@ SignedREAL_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [SignedREAL] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_SignedREAL_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_SignedREAL_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_SignedREAL = {
@@ -427,7 +427,7 @@ SignedSET_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [SignedSET] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_SignedSET_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_SignedSET_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_SignedSET = {

diff --git a/tests/106-param-constr-OK.asn1.-P b/tests/106-param-constr-OK.asn1.-P
@@ -146,10 +146,10 @@ static asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = {
 		.name = "narrow3"
 		},
 };
-static ber_tlv_tag_t asn_DEF_Narrow_15P0_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Narrow_15P0_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_Narrow_15P0_tag2el_1[] = {
+static const asn_TYPE_tag2member_t asn_MAP_Narrow_15P0_tag2el_1[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* narrow1 */
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* narrow2 */
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* narrow3 */
@@ -286,7 +286,7 @@ NarrowInteger_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [NarrowInteger] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_NarrowInteger_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_NarrowInteger_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_NarrowInteger = {

diff --git a/tests/108-param-constr-3-OK.asn1.-Pfwide-types b/tests/108-param-constr-3-OK.asn1.-Pfwide-types
@@ -120,7 +120,7 @@ MinMax_16P0_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [MinMax] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_MinMax_16P0_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_MinMax_16P0_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_MinMax_16P0 = {
@@ -268,7 +268,7 @@ ThreePlus_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [ThreePlus] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_ThreePlus_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_ThreePlus_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_ThreePlus = {

diff --git a/tests/110-param-3-OK.asn1.-Pfwide-types b/tests/110-param-3-OK.asn1.-Pfwide-types
@@ -149,10 +149,10 @@ static asn_TYPE_member_t asn_MBR_Flag_16P0_1[] = {
 		.name = "field"
 		},
 };
-static ber_tlv_tag_t asn_DEF_Flag_16P0_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_Flag_16P0_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_Flag_16P0_tag2el_1[] = {
+static const asn_TYPE_tag2member_t asn_MAP_Flag_16P0_tag2el_1[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* field */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_Flag_16P0_specs_1 = {
@@ -208,17 +208,17 @@ static int asn_DFL_7_set_5(int set_value, void **sptr) {
 		return (value == 5);
 	}
 }
-static asn_INTEGER_enum_map_t asn_MAP_field_value2enum_7[] = {
+static const asn_INTEGER_enum_map_t asn_MAP_field_value2enum_7[] = {
 	{ 3,	3,	"red" },
 	{ 4,	5,	"green" },
 	{ 5,	4,	"blue" }
 };
-static unsigned int asn_MAP_field_enum2value_7[] = {
+static const unsigned int asn_MAP_field_enum2value_7[] = {
 	2,	/* blue(5) */
 	1,	/* green(4) */
 	0	/* red(3) */
 };
-static asn_INTEGER_specifics_t asn_SPC_field_specs_7 = {
+static const asn_INTEGER_specifics_t asn_SPC_field_specs_7 = {
 	asn_MAP_field_value2enum_7,	/* "tag" => N; sorted by tag */
 	asn_MAP_field_enum2value_7,	/* N => "tag"; sorted by N */
 	3,	/* Number of elements in the maps */
@@ -227,7 +227,7 @@ static asn_INTEGER_specifics_t asn_SPC_field_specs_7 = {
 	0,	/* Native long size */
 	0
 };
-static ber_tlv_tag_t asn_DEF_field_tags_7[] = {
+static const ber_tlv_tag_t asn_DEF_field_tags_7[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 static /* Use -fall-defs-global to expose */
@@ -265,10 +265,10 @@ static asn_TYPE_member_t asn_MBR_Flag_16P1_6[] = {
 		.name = "field"
 		},
 };
-static ber_tlv_tag_t asn_DEF_Flag_16P1_tags_6[] = {
+static const ber_tlv_tag_t asn_DEF_Flag_16P1_tags_6[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
-static asn_TYPE_tag2member_t asn_MAP_Flag_16P1_tag2el_6[] = {
+static const asn_TYPE_tag2member_t asn_MAP_Flag_16P1_tag2el_6[] = {
     { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* field */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_Flag_16P1_specs_6 = {
@@ -403,7 +403,7 @@ IntegerColorFlag_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [IntegerColorFlag] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_IntegerColorFlag_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_IntegerColorFlag_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_IntegerColorFlag = {
@@ -528,7 +528,7 @@ EnumeratedColorFlag_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 
 /*** <<< STAT-DEFS [EnumeratedColorFlag] >>> ***/
 
-static ber_tlv_tag_t asn_DEF_EnumeratedColorFlag_tags_1[] = {
+static const ber_tlv_tag_t asn_DEF_EnumeratedColorFlag_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_EnumeratedColorFlag = {