diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-22 16:15:17 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-11-26 16:20:59 +0000 |
| commit | a2c2f872f4eb2ba393d091a5623b1168689e6b09 (patch) | |
| tree | 35862c173921e51e3bef89d4a40f96fee0b8a1f0 /epan/dissectors/packet-tpkt.c | |
| parent | 449bc19ba9dd11431a3b4be547b1f37981fe77b9 (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-tpkt.c')
| -rw-r--r-- | epan/dissectors/packet-tpkt.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 4ba011ba9e..e4e4f54bfe 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -219,7 +219,6 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvbuff_t *volatile next_tvb; const char *saved_proto; guint8 string[4]; - void *pd_save; /* * If we're reassembling segmented TPKT PDUs, empty the COL_INFO @@ -334,17 +333,11 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * we should stop dissecting TPKT messages within this frame * or chunk of reassembled data. */ - pd_save = pinfo->private_data; TRY { call_dissector(subdissector_handle, next_tvb, pinfo, tree); } CATCH_NONFATAL_ERRORS { - /* Restore the private_data structure in case one of the - * 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); } @@ -372,7 +365,6 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, volatile int length; tvbuff_t *volatile next_tvb; const char *saved_proto; - void *pd_save; /* * If we're reassembling segmented TPKT PDUs, empty the COL_INFO @@ -546,18 +538,11 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * messages within this frame or chunk of reassembled * data. */ - pd_save = pinfo->private_data; TRY { call_dissector(subdissector_handle, next_tvb, pinfo, tree); } CATCH_NONFATAL_ERRORS { - /* Restore the private_data structure in case one of the - * 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); } ENDTRY; |