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-ieee8023.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-ieee8023.c')
| -rw-r--r-- | epan/dissectors/packet-ieee8023.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c index 6747f18c4b..78e1696393 100644 --- a/epan/dissectors/packet-ieee8023.c +++ b/epan/dissectors/packet-ieee8023.c @@ -47,7 +47,6 @@ dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, tvbuff_t *trailer_tvb = NULL; const char *saved_proto; gint captured_length, reported_length; - void *pd_save; length_it = proto_tree_add_uint(fh_tree, length_id, tvb, offset_after_length - 2, 2, length); @@ -81,7 +80,6 @@ dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, exception was thrown, we can still put in an item for the trailer. */ saved_proto = pinfo->current_proto; - pd_save = pinfo->private_data; TRY { if (is_802_2) call_dissector(llc_handle, next_tvb, pinfo, tree); @@ -104,17 +102,13 @@ dissect_802_3(volatile int length, gboolean is_802_2, tvbuff_t *tvb, Just show the exception and then drive on to show the trailer, after noting that a dissector was found and restoring the protocol value that was in effect before we called the subdissector. */ - pinfo->private_data = pd_save; - show_exception(next_tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE); } ENDTRY; /* Restore the protocol value, so that any exception thrown by tvb_new_subset_remaining() refers to the protocol for which - this is a trailer, and restore the private_data structure in - case one of the called dissectors modified it. */ - pinfo->private_data = pd_save; + this is a trailer. */ pinfo->current_proto = saved_proto; /* Construct a tvbuff for the trailer; if the trailer is past the |