aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-03-08 10:20:27 +0100
committerAnders Broman <a.broman58@gmail.com>2018-03-08 14:25:47 +0000
commitb91ef7da5168143ff558785b6bc04a68f72b19ec (patch)
tree8e59613b6c9eaaf21520ca363b4b54e30c0c427d
parent7ddfccec199f21bb9d9f23ff99e663299371a395 (diff)
ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I0f945332c8aebb66ee5748506f3aa3b5dedb6323 Reviewed-on: https://code.wireshark.org/review/26358 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-ieee80211.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index fc706cd759..59f2c066c7 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -7018,7 +7018,7 @@ dissect_hs20_subscription_remediation(tvbuff_t *tvb, packet_info *pinfo _U_,
offset++;
}
- return tvb_captured_length(tvb);
+ return offset;
}
static int
@@ -7047,7 +7047,7 @@ dissect_hs20_deauthentication_imminent(tvbuff_t *tvb, packet_info *pinfo _U_,
offset += url_len;
PROTO_ITEM_SET_URL(pi);
}
- return tvb_captured_length(tvb);
+ return offset;
}
#define HS20_ANQP_HS_QUERY_LIST 1
@@ -11660,7 +11660,7 @@ dissect_hs20_osen(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void*
ett_osen_group_management_cipher_suite,
"OSEN Group Management Cipher Suite");
- return tvb_captured_length(tvb);
+ return offset;
}
static const value_string hs20_indication_release_number_vals[] = {
@@ -11700,7 +11700,7 @@ dissect_hs20_indication(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
offset += 2;
}
- return len;
+ return offset;
}
static void