From 72fb00f9c2d1ef096cb7ab9f9201c7daa1a4ba71 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Sat, 27 Feb 2016 19:26:54 +0100 Subject: SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32 Change-Id: Ie6c6f71e413463f93924c1a47b908a1c97d94407 Reviewed-on: https://code.wireshark.org/review/14209 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-sprt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-sprt.c') diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 4f62ba6a02..868020b642 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -325,7 +325,7 @@ static int hf_sprt_ack_field_items = -1; static int hf_sprt_transport_channel_item = -1; static int hf_sprt_sequence_item = -1; -static int hf_sprt_payload = -1; +static int hf_sprt_payload_length = -1; static int hf_sprt_payload_no_data = -1; static int hf_sprt_payload_reserved_bit = -1; static int hf_sprt_payload_message_id = -1; @@ -885,7 +885,7 @@ dissect_sprt_data(tvbuff_t *tvb, if (payload_length > 0) { - ti = proto_tree_add_uint(sprt_tree, hf_sprt_payload, tvb, offset, 1, payload_length); + ti = proto_tree_add_uint(sprt_tree, hf_sprt_payload_length, tvb, offset, 1, payload_length); proto_item_set_len(ti, payload_length); sprt_payload_tree = proto_item_add_subtree(ti, ett_payload); @@ -1694,10 +1694,10 @@ proto_register_sprt(void) }, /* SPRT payload, if any: */ { - &hf_sprt_payload, + &hf_sprt_payload_length, { "Payload (in bytes)", - "sprt.payload", + "sprt.payload.length", FT_UINT32, BASE_DEC, NULL, -- cgit v1.2.3