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-bgp.c | |
parent | 449bc19ba9dd11431a3b4be547b1f37981fe77b9 (diff) | |
download | wireshark-a2c2f872f4eb2ba393d091a5623b1168689e6b09.tar.gz |
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-bgp.c')
-rw-r--r-- | epan/dissectors/packet-bgp.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 5e2fc78010..93e0b8c24e 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -6640,7 +6640,6 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint length; volatile gboolean first = TRUE; /* TRUE for the first BGP message in packet */ tvbuff_t *volatile next_tvb; - void *pd_save; col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP"); col_clear(pinfo->cinfo, COL_INFO); @@ -6789,16 +6788,10 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * stop dissecting PDUs within this frame or chunk of reassembled * data. */ - pd_save = pinfo->private_data; TRY { dissect_bgp_pdu(next_tvb, pinfo, tree, first); } 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; |