aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-vlan.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-10-25 21:03:36 -0400
committerMichael Mann <mmann78@netscape.net>2015-10-26 11:28:41 +0000
commit7f591e4c07e10168f06a6a0dbb04bc66613836a7 (patch)
treea064d584a8e7b70bcdee795c96c5efe56fa937c8 /epan/dissectors/packet-vlan.c
parente2203f5aed1eef900c7568b6d14f3e303e271b7c (diff)
Clean up more unnecessary use of the 'volatile' key word.
Change-Id: I3e72fddc6ed380780d7e2e1c8df87e580138188d Reviewed-on: https://code.wireshark.org/review/11271 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-vlan.c')
-rw-r--r--epan/dissectors/packet-vlan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index 5f7d258bcc..e87c559f70 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -139,9 +139,9 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti;
guint16 tci;
- volatile guint16 encap_proto;
- volatile gboolean is_802_2;
- proto_tree *volatile vlan_tree;
+ guint16 encap_proto;
+ gboolean is_802_2;
+ proto_tree *vlan_tree;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "VLAN");
col_clear(pinfo->cinfo, COL_INFO);