aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-29 21:09:36 +0200
committerMichael Mann <mmann78@netscape.net>2016-03-30 18:16:00 +0000
commit782191f7662c2cd2849524ba279aad0aafcba4de (patch)
tree16631688068e105185e761d96d1971e7fa6e68b2
parentad52a36fb9d09871e20967e3d1b53856643cb0ca (diff)
TCP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
packet-tcp.c:2155: warning: Value stored to 'relseq' during its initialization is never read packet-tcp.c:3511: warning: Value stored to 'assignedMetaId' is never read packet-tcp.c:3514: warning: Value stored to 'assignedMetaId' is never read Change-Id: I68d8088fc54da5ad52361510d43b893e58bf419f Reviewed-on: https://code.wireshark.org/review/14695 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-tcp.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 6d2eea0816..1770cab4cb 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2152,7 +2152,7 @@ mptcp_analysis_dsn_lookup(packet_info *pinfo , tvbuff_t *tvb,
struct mptcp_analysis* mptcpd = tcpd->mptcp_analysis;
proto_item *item = NULL;
mptcp_dss_mapping_t *mapping = NULL;
- guint32 relseq = tcph->th_seq;
+ guint32 relseq;
guint64 rawdsn = 0;
enum mptcp_dsn_conversion convert;
@@ -3507,15 +3507,6 @@ mptcp_get_meta_from_token(struct tcp_analysis* tcpd, tcp_flow_t *tcp_flow, guint
DISSECTOR_ASSERT(mptcpd);
- if(mptcpd->meta_flow[0].token == token) {
- assignedMetaId = 1;
- }
- else if(mptcpd->meta_flow[1].token == token) {
- assignedMetaId = 0;
- }
- else {
- DISSECTOR_ASSERT_NOT_REACHED();
- }
/* compute the meta id assigned to tcp_flow */
assignedMetaId = (tcp_flow->mptcp_subflow->meta == &mptcpd->meta_flow[0]) ? 0 : 1;