aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee802154.c
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2008-03-05 22:28:29 +0000
committerStephen Fisher <steve@stephen-fisher.com>2008-03-05 22:28:29 +0000
commit9ba003e8b65ade902816fdfcbdd14e45a26a6aef (patch)
tree14087b80bfca7ff60e1dfec69013cc3e89ec602e /epan/dissectors/packet-ieee802154.c
parenta4798caa7b7c4551e640cb43a63c99eaf43a4c20 (diff)
Mark a couple of variables volatile
Remove two unused dissector handles Comment out a function declaration labeled as "TODO" svn path=/trunk/; revision=24571
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
-rw-r--r--epan/dissectors/packet-ieee802154.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index c0e311ebc5..95ffd3d0f9 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -95,7 +95,7 @@ void proto_register_ieee802154 (void);
static void dissect_ieee802154 (tvbuff_t *, packet_info *, proto_tree *);
static void dissect_ieee802154_nofcs (tvbuff_t *, packet_info *, proto_tree *);
static void dissect_ieee802154_cc24xx (tvbuff_t *, packet_info *, proto_tree *);
-static void dissect_ieee802154_linux (tvbuff_t *, packet_info *, proto_tree *); /* TODO: Implement Me. */
+/*static void dissect_ieee802154_linux (tvbuff_t *, packet_info *, proto_tree *); TODO: Implement Me. */
static void dissect_ieee802154_common (tvbuff_t *, packet_info *, proto_tree *, guint);
static void dissect_ieee802154_beacon (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
static void dissect_ieee802154_cmd (tvbuff_t *, packet_info *, proto_tree *, ieee802154_packet *);
@@ -177,8 +177,6 @@ static gint ett_ieee802154_bcn_pending = -1;
/* Dissector handles */
static dissector_handle_t data_handle;
-static dissector_handle_t ieee802154_bcn_handle;
-static dissector_handle_t ieee802154_cmd_handle;
static heur_dissector_list_t ieee802154_heur_subdissector_list;
/* Name Strings */
@@ -484,8 +482,8 @@ static void
dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options)
{
tvbuff_t *payload_tvb;
- proto_tree *ieee802154_tree = NULL;
- proto_item *proto_root = NULL;
+ proto_tree *volatile ieee802154_tree = NULL;
+ proto_item *volatile proto_root = NULL;
proto_item *ti;
guint offset = 0;