Get rid of ber_last_created_item().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24008 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 19 insertions, 20 deletions

diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 0e71f48843..ccb12e302a 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -1239,7 +1239,7 @@ dissect_x420_G3FacsimileBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_x420_Interchange_Data_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 226 "x420.cnf"
+#line 225 "x420.cnf"
 /* XXX Not implemented yet */
 
 
@@ -1480,7 +1480,7 @@ dissect_x420_BilaterallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_x420_NationallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 229 "x420.cnf"
+#line 228 "x420.cnf"
 /* XXX Not implemented yet */
 
 
@@ -1999,7 +1999,7 @@ dissect_x420_BodyPartNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 
 static const ber_sequence_t T_stored_body_part_sequence[] = {
-  { &hf_x420_message_entry  , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
+  { &hf_x420_message_entry  , -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
   { &hf_x420_body_part_number, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_x420_BodyPartNumber },
   { NULL, 0, 0, 0, NULL }
 };
@@ -2498,13 +2498,12 @@ static int
 dissect_x420_CharacterSetRegistration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 218 "x420.cnf"
   guint32 crs;
-  proto_item *pi;
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
                                   &crs);
 
 
-  if((pi = get_ber_last_created_item()))
-    proto_item_append_text(pi, " (%s)", val_to_str(crs, charsetreg_vals, "unknown"));
+  if(actx->created_item)
+    proto_item_append_text(actx->created_item, " (%s)", val_to_str(crs, charsetreg_vals, "unknown"));
 
 
 
@@ -2738,7 +2737,7 @@ dissect_x420_Document_Type_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_x420_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 232 "x420.cnf"
+#line 231 "x420.cnf"
 /* XXX: Not implemented yet */
 
 
@@ -2894,7 +2893,7 @@ dissect_x420_EnvironmentParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_x420_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 235 "x420.cnf"
+#line 234 "x420.cnf"
     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
 
 
@@ -2906,7 +2905,7 @@ dissect_x420_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_x420_T_compression_algorithm_param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 238 "x420.cnf"
+#line 237 "x420.cnf"
 /* XXX: Not implemented yet */
 
 
@@ -3419,7 +3418,7 @@ dissect_x420_BodyPartSignatureVerification(gboolean implicit_tag _U_, tvbuff_t *
 
 
 static const ber_sequence_t SET_OF_SequenceNumber_set_of[1] = {
-  { &hf_x420_stored_item    , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
+  { &hf_x420_stored_item    , -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
 };
 
 static int
@@ -3471,7 +3470,7 @@ dissect_x420_DeliveredReplyStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t SEQUENCE_OF_SequenceNumber_sequence_of[1] = {
-  { &hf_x420_received_replies_item, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
+  { &hf_x420_received_replies_item, -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_p7_SequenceNumber },
 };
 
 static int
@@ -5014,11 +5013,11 @@ void proto_register_x420(void) {
         "x420.BodyPartReference", HFILL }},
     { &hf_x420_stored_entry,
       { "stored-entry", "x420.stored_entry",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_stored_content,
       { "stored-content", "x420.stored_content",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_submitted_body_part,
       { "submitted-body-part", "x420.submitted_body_part",
@@ -5030,7 +5029,7 @@ void proto_register_x420(void) {
         "x420.T_stored_body_part", HFILL }},
     { &hf_x420_message_entry,
       { "message-entry", "x420.message_entry",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_body_part_number,
       { "body-part-number", "x420.body_part_number",
@@ -5518,7 +5517,7 @@ void proto_register_x420(void) {
         "x420.NonMessageBodyPartSynopsis", HFILL }},
     { &hf_x420_number,
       { "number", "x420.number",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_synopsis,
       { "synopsis", "x420.synopsis",
@@ -5550,7 +5549,7 @@ void proto_register_x420(void) {
         "x420.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x420_this_child_entry,
       { "this-child-entry", "x420.this_child_entry",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_position,
       { "position", "x420.position",
@@ -5566,7 +5565,7 @@ void proto_register_x420(void) {
         "x420.BodyPartNumber", HFILL }},
     { &hf_x420_body_part_signature_status,
       { "body-part-signature", "x420.body_part_signature",
-        FT_INT32, BASE_DEC, VALS(p7_SignatureStatus_vals), 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SignatureStatus", HFILL }},
     { &hf_x420_stored,
       { "stored", "x420.stored",
@@ -5574,7 +5573,7 @@ void proto_register_x420(void) {
         "x420.SET_OF_SequenceNumber", HFILL }},
     { &hf_x420_stored_item,
       { "Item", "x420.stored_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_absent,
       { "absent", "x420.absent",
@@ -5590,7 +5589,7 @@ void proto_register_x420(void) {
         "x420.SEQUENCE_OF_SequenceNumber", HFILL }},
     { &hf_x420_received_replies_item,
       { "Item", "x420.received_replies_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_no_ipn_received,
       { "no-ipn-received", "x420.no_ipn_received",
@@ -5602,7 +5601,7 @@ void proto_register_x420(void) {
         "x420.SEQUENCE_OF_SequenceNumber", HFILL }},
     { &hf_x420_ipns_received_item,
       { "Item", "x420.ipns_received_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "p7.SequenceNumber", HFILL }},
     { &hf_x420_content_or_arguments,
       { "content-or-arguments", "x420.content_or_arguments",