aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2018-01-22 18:49:42 +0100
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2018-01-22 18:23:06 +0000
commit98305ba621f0e50199372fb31e4675b594830af9 (patch)
tree215a541c5aa785a2e736787450ba730a818fa43d
parentebc01bcce5f022662a516d0035bfda2e1a6b9bad (diff)
packet-ieee80211: fix dead store/ dead increment and assignment.
offset was not used after increment/assignment, just return it to relax clang. Found by clang scan. Change-Id: I21dece4e31075ca2da8d3ba942336fb4858636b6 Reviewed-on: https://code.wireshark.org/review/25419 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-rw-r--r--epan/dissectors/packet-ieee80211.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 502d8a6970..546917d34d 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -17387,7 +17387,7 @@ dissect_muac_param_record(tvbuff_t *tvb, proto_tree *tree, int offset)
return offset;
}
-static void
+static int
dissect_mu_edca_parameter_set(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
int offset, int len _U_)
{
@@ -17414,6 +17414,8 @@ dissect_mu_edca_parameter_set(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
param_tree = proto_tree_add_subtree(tree, tvb, offset, 3, ett_he_mu_edca_param,
NULL, "MUAC_VO Parameter Record");
offset = dissect_muac_param_record(tvb, param_tree, offset);
+
+ return offset;
}
#define SRP_DISALLOWED 0x01
@@ -17432,7 +17434,7 @@ static const int *sr_control_field_headers[] = {
NULL
};
-static void
+static int
dissect_spatial_reuse_parameter_set(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree *tree, int offset, int len _U_)
{
@@ -17464,6 +17466,8 @@ dissect_spatial_reuse_parameter_set(tvbuff_t *tvb, packet_info *pinfo _U_,
tvb, offset, 8, ENC_NA);
offset += 8;
}
+
+ return offset;
}
static void