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-ethertype.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-ethertype.c')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 5bb19cc779..d2b8c1f177 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -253,7 +253,6 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat gint captured_length, reported_length; volatile gboolean dissector_found = FALSE; const char *volatile saved_proto; - void *pd_save; ethertype_data_t *ethertype_data; /* Reject the packet if data is NULL */ @@ -298,7 +297,6 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat was reduced by some dissector before an exception was thrown, we can still put in an item for the trailer. */ saved_proto = pinfo->current_proto; - pd_save = pinfo->private_data; TRY { dissector_found = dissector_try_uint(ethertype_dissector_table, ethertype_data->etype, next_tvb, pinfo, tree); @@ -316,11 +314,6 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat before we called the subdissector. */ show_exception(next_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; dissector_found = TRUE; pinfo->current_proto = saved_proto; } |