#include <stdio.h> not needed.

(Note: the change in  a generated function name looks benign:
  dissect_x411_PrintableString_SIZE_CONSTR4299806048 ==>
    dissect_x411_PrintableString_SIZE_CONSTR32134928)

svn path=/trunk/; revision=32407

2 files changed, 13 insertions, 15 deletions

diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index adf3b8095f..9c3ae29f88 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -34,7 +34,6 @@
 #include <epan/asn1.h>
 #include <epan/expert.h>
 
-#include <stdio.h>
 #include <string.h>
 
 #include "packet-ber.h"
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index dfef782898..9b1fc5f5e5 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -42,7 +42,6 @@
 #include <epan/asn1.h>
 #include <epan/expert.h>
 
-#include <stdio.h>
 #include <string.h>
 
 #include "packet-ber.h"
@@ -502,7 +501,7 @@ static int hf_x411_UniversalOrganizationalUnitNames_item = -1;  /* UniversalOrga
 static int hf_x411_character_encoding = -1;       /* T_character_encoding */
 static int hf_x411_two_octets = -1;               /* BMPString_SIZE_1_ub_string_length */
 static int hf_x411_four_octets = -1;              /* UniversalString_SIZE_1_ub_string_length */
-static int hf_x411_iso_639_language_code = -1;    /* PrintableString_SIZE_CONSTR4299806048 */
+static int hf_x411_iso_639_language_code = -1;    /* PrintableString_SIZE_CONSTR32134928 */
 static int hf_x411_x121_dcc_code_01 = -1;         /* T_x121_dcc_code_01 */
 static int hf_x411_iso_3166_alpha2_code_01 = -1;  /* T_iso_3166_alpha2_code_01 */
 static int hf_x411_numeric_code = -1;             /* T_numeric_code */
@@ -670,7 +669,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1;
 static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1;
 
 /*--- End of included file: packet-x411-hf.c ---*/
-#line 85 "packet-x411-template.c"
+#line 84 "packet-x411-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_x411 = -1;
@@ -872,7 +871,7 @@ static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmiss
 static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields = -1;
 
 /*--- End of included file: packet-x411-ett.c ---*/
-#line 96 "packet-x411-template.c"
+#line 95 "packet-x411-template.c"
 
 /* Dissector tables */
 static dissector_table_t x411_extension_dissector_table;
@@ -923,7 +922,7 @@ static const value_string p3_err_code_string_vals[] = {
 
 
 /*--- End of included file: packet-x411-table.c ---*/
-#line 103 "packet-x411-template.c"
+#line 102 "packet-x411-template.c"
 
 
 /*--- Included file: packet-x411-fn.c ---*/
@@ -6508,7 +6507,7 @@ dissect_x411_T_character_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static int
-dissect_x411_PrintableString_SIZE_CONSTR4299806048(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_x411_PrintableString_SIZE_CONSTR32134928(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
                                                         actx, tree, tvb, offset,
                                                         2, 5, hf_index, NULL);
@@ -6519,7 +6518,7 @@ dissect_x411_PrintableString_SIZE_CONSTR4299806048(gboolean implicit_tag _U_, tv
 
 static const ber_sequence_t UniversalOrBMPString_set[] = {
   { &hf_x411_character_encoding, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_T_character_encoding },
-  { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR4299806048 },
+  { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR32134928 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -8555,7 +8554,7 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p
 
 
 /*--- End of included file: packet-x411-fn.c ---*/
-#line 105 "packet-x411-template.c"
+#line 104 "packet-x411-template.c"
 
 
 /*--- Included file: packet-x411-table11.c ---*/
@@ -8587,7 +8586,7 @@ static const ros_opr_t p3_opr_tab[] = {
 
 
 /*--- End of included file: packet-x411-table11.c ---*/
-#line 107 "packet-x411-template.c"
+#line 106 "packet-x411-template.c"
 
 /*--- Included file: packet-x411-table21.c ---*/
 #line 1 "packet-x411-table21.c"
@@ -8632,7 +8631,7 @@ static const ros_err_t p3_err_tab[] = {
 
 
 /*--- End of included file: packet-x411-table21.c ---*/
-#line 108 "packet-x411-template.c"
+#line 107 "packet-x411-template.c"
 
 static const ros_info_t p3_ros_info = {
   "P3",
@@ -10420,7 +10419,7 @@ void proto_register_x411(void) {
     { &hf_x411_iso_639_language_code,
       { "iso-639-language-code", "x411.iso_639_language_code",
         FT_STRING, BASE_NONE, NULL, 0,
-        "x411.PrintableString_SIZE_CONSTR4299806048", HFILL }},
+        "x411.PrintableString_SIZE_CONSTR32134928", HFILL }},
     { &hf_x411_x121_dcc_code_01,
       { "x121-dcc-code", "x411.x121_dcc_code",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -11079,7 +11078,7 @@ void proto_register_x411(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-x411-hfarr.c ---*/
-#line 250 "packet-x411-template.c"
+#line 249 "packet-x411-template.c"
   };
 
   /* List of subtrees */
@@ -11283,7 +11282,7 @@ void proto_register_x411(void) {
     &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields,
 
 /*--- End of included file: packet-x411-ettarr.c ---*/
-#line 263 "packet-x411-template.c"
+#line 262 "packet-x411-template.c"
   };
 
   module_t *x411_module;
@@ -11475,7 +11474,7 @@ void proto_reg_handoff_x411(void) {
 
 
 /*--- End of included file: packet-x411-dis-tab.c ---*/
-#line 298 "packet-x411-template.c"
+#line 297 "packet-x411-template.c"
 
   /* APPLICATION CONTEXT */