diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2017-06-05 23:11:33 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-06-19 14:01:50 +0000 |
| commit | 6ecd6b816406597783ec662f00233f3a018553f7 (patch) | |
| tree | 0ca35d7e1d7502c2d878d1012f4b271ab5842c76 /epan | |
| parent | d85db24ce58b624bdd5c4cef3d06fcfba5a3ec25 (diff) | |
| download | wireshark-6ecd6b816406597783ec662f00233f3a018553f7.tar.gz | |
Remove unnecessary volatile qualifiers
Change-Id: Ieebb199e181251fd0730dbabb4b8e71d6ad46a6d
Reviewed-on: https://code.wireshark.org/review/21973
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-general.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index d31344253c..c88e25a188 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -18880,7 +18880,7 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, mpdu_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_parent_tree); do { - tvbuff_t *volatile msdu_tvb; + tvbuff_t *msdu_tvb; guint16 msdu_length; proto_tree *subframe_tree; const gchar *resolve_name; diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 45f30433a1..d401c43d5f 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -13669,7 +13669,7 @@ dissect_zbee_zcl_gp_attr_gps_secur_lvl(tvbuff_t *tvb, proto_tree *tree, guint of * @param offset - pointer to buffer offset */ static void -dissect_zcl_gp_proxy_sink_table_request(proto_tree *tree, tvbuff_t *tvb, volatile guint *offset) +dissect_zcl_gp_proxy_sink_table_request(proto_tree *tree, tvbuff_t *tvb, guint *offset) { /* get Options field */ guint8 options = tvb_get_guint8(tvb, *offset); @@ -13721,7 +13721,7 @@ dissect_zcl_gp_proxy_sink_table_request(proto_tree *tree, tvbuff_t *tvb, volatil * ZBEE_ZCL_ATTR_GPP_PROXY_TABLE) that will be reported */ static void -dissect_zcl_gp_proxy_sink_table_response(proto_tree *tree, tvbuff_t *tvb, volatile guint *offset, guint16 attr_id) +dissect_zcl_gp_proxy_sink_table_response(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id) { guint8 entries_count, start_index; guint i, stop; @@ -13764,7 +13764,7 @@ dissect_zcl_gp_proxy_sink_table_response(proto_tree *tree, tvbuff_t *tvb, volati * @param offset - pointer to buffer offset */ static void -dissect_zcl_gp_sink_comm_mode(proto_tree *tree, tvbuff_t *tvb, volatile guint *offset) +dissect_zcl_gp_sink_comm_mode(proto_tree *tree, tvbuff_t *tvb, guint *offset) { static const int * n_options[] = { &hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_action, @@ -13807,7 +13807,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d }; zbee_zcl_packet *zcl; - volatile guint offset = 0; + guint offset = 0; guint8 cmd_id; /* Reject the packet if data is NULL */ |