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-cisco-wids.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-cisco-wids.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-wids.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 93a07f6eb8..854a414be7 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -77,7 +77,6 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti, *cwids_tree; volatile int offset = 0; guint16 capturelen; - void *pd_save; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS"); col_set_str(pinfo->cinfo, COL_INFO, "Cwids: "); @@ -107,17 +106,11 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) wlan_tvb = tvb_new_subset_length(tvb, offset, capturelen); /* Continue after ieee80211 dissection errors */ - pd_save = pinfo->private_data; TRY { call_dissector(ieee80211_handle, wlan_tvb, pinfo, tree); } CATCH_BOUNDS_ERRORS { show_exception(wlan_tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE); - /* 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; expert_add_info(pinfo, ti, &ie_ieee80211_subpacket); } ENDTRY; |