aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aprs.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-06-22 16:01:36 -0400
committerMichael Mann <mmann78@netscape.net>2014-06-22 21:07:16 +0000
commit188aa9a80eea47842988f1b860931d25e1ca08bd (patch)
tree9b6faf83e26edb43fe6befe6d2ff01c4b6daaa89 /epan/dissectors/packet-aprs.c
parent3fc441e7a5008640c68ec985e669d5092414a519 (diff)
convert to proto_tree_add_subtree[_format]
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-aprs.c')
-rw-r--r--epan/dissectors/packet-aprs.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index 3a98576675..ac655edcd7 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -848,17 +848,12 @@ dissect_aprs_storm( tvbuff_t *tvb,
const storm_items_s *storm_items
)
{
- proto_tree *storm_tree = NULL;
+ proto_tree *storm_tree;
+ proto_tree *tc;
- if ( parent_tree )
- {
- proto_tree *tc;
- int data_len;
+ tc = proto_tree_add_item( parent_tree, hf_aprs_storm_idx, tvb, offset, -1, ENC_ASCII|ENC_NA );
+ storm_tree = proto_item_add_subtree( tc, ett_aprs_storm_idx );
- data_len = tvb_reported_length_remaining( tvb, offset );
- tc = proto_tree_add_item( parent_tree, hf_aprs_storm_idx, tvb, offset, data_len, ENC_ASCII|ENC_NA );
- storm_tree = proto_item_add_subtree( tc, ett_aprs_storm_idx );
- }
proto_tree_add_item( storm_tree, *storm_items->hf_aprs_storm_dir, tvb, offset, 3, ENC_BIG_ENDIAN );
offset += 3;
offset += 1;