From 782191f7662c2cd2849524ba279aad0aafcba4de Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 29 Mar 2016 21:09:36 +0200 Subject: 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 Reviewed-by: Matthieu Coudron Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-tcp.c | 11 +---------- 1 file changed, 1 insertion(+), 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; -- cgit v1.2.3