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-sflow.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-sflow.c')
| -rw-r--r-- | epan/dissectors/packet-sflow.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 052636bfb8..654cd1e0a6 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -632,7 +632,6 @@ dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo, gboolean save_writable; gboolean save_in_error_pkt; address save_dl_src, save_dl_dst, save_net_src, save_net_dst, save_src, save_dst; - void *pd_save; version = tvb_get_ntohl(tvb, 0); header_proto = tvb_get_ntohl(tvb, offset); @@ -695,7 +694,6 @@ dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo, save_net_dst = pinfo->net_dst; save_src = pinfo->src; save_dst = pinfo->dst; - pd_save = pinfo->private_data; TRY { @@ -707,11 +705,6 @@ dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo, } CATCH_BOUNDS_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; } ENDTRY; |