aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tcp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-11-22 16:15:17 -0500
committerMichael Mann <mmann78@netscape.net>2014-11-26 16:20:59 +0000
commita2c2f872f4eb2ba393d091a5623b1168689e6b09 (patch)
tree35862c173921e51e3bef89d4a40f96fee0b8a1f0 /epan/dissectors/packet-tcp.c
parent449bc19ba9dd11431a3b4be547b1f37981fe77b9 (diff)
Remove the use of pinfo->private_data from dissectors that just save it to restore it.
Change-Id: I13197cc48068bb35ee12a7023cfe5f76bbc4e264 Reviewed-on: https://code.wireshark.org/review/5486 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
-rw-r--r--epan/dissectors/packet-tcp.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index b3aeb20bf4..f801e42955 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2271,7 +2271,6 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvbuff_t *next_tvb;
proto_item *item=NULL;
const char *saved_proto;
- void *pd_save;
while (tvb_reported_length_remaining(tvb, offset) > 0) {
/*
@@ -2416,7 +2415,6 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* data.
*/
saved_proto = pinfo->current_proto;
- pd_save = pinfo->private_data;
TRY {
(*dissect_pdu)(next_tvb, pinfo, tree, dissector_data);
}
@@ -2425,7 +2423,6 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* called dissectors modified it (and, due to the exception,
* was unable to restore it).
*/
- pinfo->private_data = pd_save;
show_exception(tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE);
/*