From a2c2f872f4eb2ba393d091a5623b1168689e6b09 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 22 Nov 2014 16:15:17 -0500 Subject: 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 Reviewed-by: Michael Mann --- epan/dissectors/packet-ldp.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'epan/dissectors/packet-ldp.c') 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; -- cgit v1.2.3