From ed86bc80231074f7a67122c569dc8692f8dc971d Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 18 Feb 2011 01:28:18 +0000 Subject: [PATCH] Just for fun, see whether using __declspec(noreturn) on the exception routines is sufficient to convince the Visual Studio code analyzer that REPORT_DISSECTOR_BUG() never returns. (That would probably require that abort() be tagged with __declspec(noreturn); let's hope Microsoft did the right thing there.) svn path=/trunk/; revision=35996 --- epan/dissectors/packet-iwarp-mpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index f76adcff6c..0afdad6a9a 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -826,7 +826,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Markers are used by either the Initiator or the Responder or both. */ - if ((state->ini_exp_m_res || state->res_exp_m_ini) && endpoint <= MPA_RESPONDER) { + if (state->ini_exp_m_res || state->res_exp_m_ini) { /* find the TCP sequence number of the first FPDU */ if (!state->minfo[endpoint].valid) { @@ -844,7 +844,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; /* removes Markers if any and prepares new tvbuff for next dissector */ - if (endpoint <= MPA_RESPONDER && state->minfo[endpoint].valid + if (state->minfo[endpoint].valid && number_of_markers(state, tcpinfo, endpoint) > 0) { next_tvb = tvb_new_subset(remove_markers(tvb, pinfo, get_first_marker_offset(state, tcpinfo, endpoint),