osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Ahmad Fatoum 2017-06-05 23:11:33 +02:00 committed by Peter Wu
parent d85db24ce5
commit 6ecd6b8164
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ieee80211.c
View File

@ -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); mpdu_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_parent_tree);
do { do {
tvbuff_t *volatile msdu_tvb; tvbuff_t *msdu_tvb;
guint16 msdu_length; guint16 msdu_length;
proto_tree *subframe_tree; proto_tree *subframe_tree;
const gchar *resolve_name; const gchar *resolve_name;

8
epan/dissectors/packet-zbee-zcl-general.c
View File

@ -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 * @param offset - pointer to buffer offset
*/ */
static void 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 */ /* get Options field */
guint8 options = tvb_get_guint8(tvb, *offset); 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 * ZBEE_ZCL_ATTR_GPP_PROXY_TABLE) that will be reported
*/ */
static void 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; guint8 entries_count, start_index;
guint i, stop; 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 * @param offset - pointer to buffer offset
*/ */
static void 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[] = { static const int * n_options[] = {
&hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_action, &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; zbee_zcl_packet *zcl;
volatile guint offset = 0; guint offset = 0;
guint8 cmd_id; guint8 cmd_id;
/* Reject the packet if data is NULL */ /* Reject the packet if data is NULL */