diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-06-20 13:37:22 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-06-20 13:37:22 +0000 |
| commit | 29fb9f460bb8b876ba340700c4ca132bd3d5fd34 (patch) | |
| tree | cb855606ce26cf4e53e7d846b046b9dbbd8a4f8a | |
| parent | 96a3da3e057bdba524e0783ca21d57d6d205f174 (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7383 :
Put back items into the correct dtap_tree tree and comment pd_tree that is unused for now
svn path=/trunk/; revision=43408
| -rw-r--r-- | epan/dissectors/packet-gmr1_dtap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c index 05b9bbc62b..969c87469f 100644 --- a/epan/dissectors/packet-gmr1_dtap.c +++ b/epan/dissectors/packet-gmr1_dtap.c @@ -60,7 +60,7 @@ dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint ett_tree; int hf_idx; proto_item *dtap_item = NULL, *pd_item = NULL; - proto_tree *dtap_tree = NULL, *pd_tree = NULL; + proto_tree *dtap_tree = NULL/*, *pd_tree = NULL*/; guint32 oct[2]; guint8 pd; @@ -123,14 +123,14 @@ dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str(pd, gmr1_pd_vals, "Unknown (%u)") ); - pd_tree = proto_item_add_subtree(pd_item, ett_gmr1_pd); + /*pd_tree =*/ proto_item_add_subtree(pd_item, ett_gmr1_pd); /* Move on */ offset++; /* Message type - [1] 11.4 */ proto_tree_add_uint_format( - pd_tree, hf_idx, tvb, offset, 1, oct[1], + dtap_tree, hf_idx, tvb, offset, 1, oct[1], "Message Type: %s", msg_str ? msg_str : "(Unknown)" ); @@ -138,9 +138,9 @@ dissect_gmr1_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Decode elements */ if (msg_func) { - (*msg_func)(tvb, pd_tree, pinfo, offset, len - offset); + (*msg_func)(tvb, dtap_tree, pinfo, offset, len - offset); } else { - proto_tree_add_text(pd_tree, tvb, offset, len - offset, + proto_tree_add_text(dtap_tree, tvb, offset, len - offset, "Message Elements"); } |