From a45508a96b32d411784681019193a70710ccbe21 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 1 May 2014 14:31:48 +0200 Subject: [PATCH] fix coverity issues --- Contractor/EdgeBasedGraphFactory.h | 8 ++++---- DataStructures/StaticGraph.h | 21 ++++++++------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index c949f1622..2a777dd3a 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -110,10 +110,10 @@ public: private: struct NodeBasedEdgeData { - NodeBasedEdgeData() { - //TODO: proper c'tor - edgeBasedNodeID = UINT_MAX; - } + NodeBasedEdgeData() : distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID), nameID(std::numeric_limits::max()), + type(std::numeric_limits::max()), isAccessRestricted(false), shortcut(false), forward(false), backward(false), + roundabout(false), ignore_in_grid(false), contraFlow(false) + { } int distance; unsigned edgeBasedNodeID; diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h index e3445c583..8997402b7 100644 --- a/DataStructures/StaticGraph.h +++ b/DataStructures/StaticGraph.h @@ -108,21 +108,16 @@ public: unsigned v = GetTarget(eid); EdgeData & data = GetEdgeData(eid); if(data.shortcut) { - unsigned eid2 = FindEdgeInEitherDirection(u, data.id); - if(eid2 == UINT_MAX) { - SimpleLogger().Write(logWARNING) << - "cannot find first segment of edge (" << - u << "," << data.id << "," << v << "), eid: " << eid; - - data.shortcut = false; + const EdgeID first_edge_id = FindEdgeInEitherDirection(u, data.id); + if (SPECIAL_EDGEID == first_edge_id) + { + SimpleLogger().Write(logWARNING) << "cannot find first segment of edge (" << u << "," << data.id << "," << v << "), eid: " << eid; BOOST_ASSERT(false); } - eid2 = FindEdgeInEitherDirection(data.id, v); - if(eid2 == UINT_MAX) { - SimpleLogger().Write(logWARNING) << - "cannot find second segment of edge (" << - u << "," << data.id << "," << v << "), eid2: " << eid2; - data.shortcut = false; + const EdgeID second_edge_id = FindEdgeInEitherDirection(data.id, v); + if (SPECIAL_EDGEID == second_edge_id) + { + SimpleLogger().Write(logWARNING) << "cannot find second segment of edge (" << u << "," << data.id << "," << v << "), eid: " << eid; BOOST_ASSERT(false); } }