aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ldp.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-ldp.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-ldp.c')
-rw-r--r--epan/dissectors/packet-ldp.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 52d8c0fbf8..c974c89e28 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -3104,8 +3104,6 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
guint16 plen;
int length;
tvbuff_t *volatile next_tvb;
- void *pd_save;
-
while (tvb_reported_length_remaining(tvb, offset) != 0) {
length_remaining = tvb_length_remaining(tvb, offset);
@@ -3220,16 +3218,10 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
* stop dissecting PDUs within this frame or chunk of reassembled
* data.
*/
- pd_save = pinfo->private_data;
TRY {
dissect_ldp_pdu(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;