From c712ef235da67799a1c7eaac5e228a0fe1c18261 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Tue, 24 Aug 2021 12:47:20 +0200 Subject: [PATCH 1/1] please clang static analyser --- examples/cpp/comm-failure/s4u-comm-failure.cpp | 5 ++--- examples/cpp/exec-failure/s4u-exec-failure.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/examples/cpp/comm-failure/s4u-comm-failure.cpp b/examples/cpp/comm-failure/s4u-comm-failure.cpp index cc9a1271d6..ac12fd345e 100644 --- a/examples/cpp/comm-failure/s4u-comm-failure.cpp +++ b/examples/cpp/comm-failure/s4u-comm-failure.cpp @@ -44,9 +44,8 @@ public: std::vector pending_comms; pending_comms.push_back(comm1); pending_comms.push_back(comm2); - long index; try { - index = sg4::Comm::wait_any(pending_comms); + long index = sg4::Comm::wait_any(pending_comms); XBT_INFO("Wait any returned index %ld (comm to %s)", index, pending_comms.at(index)->get_mailbox()->get_cname()); } catch (simgrid::NetworkFailureException& e) { XBT_INFO("Sender has experienced a network failure exception, so it knows that something went wrong"); @@ -63,7 +62,7 @@ public: } XBT_INFO("Wait for remaining comm, just to be nice"); pending_comms.erase(pending_comms.begin()); - index = simgrid::s4u::Comm::wait_any(pending_comms); + simgrid::s4u::Comm::wait_any(pending_comms); } }; diff --git a/examples/cpp/exec-failure/s4u-exec-failure.cpp b/examples/cpp/exec-failure/s4u-exec-failure.cpp index f2f9b7e436..9d5d1adea2 100644 --- a/examples/cpp/exec-failure/s4u-exec-failure.cpp +++ b/examples/cpp/exec-failure/s4u-exec-failure.cpp @@ -33,9 +33,8 @@ static void dispatcher(sg4::Host* host1, sg4::Host* host2) exec2->start(); XBT_INFO("Calling wait_any.."); - long index; try { - index = sg4::Exec::wait_any(pending_execs); + long index = sg4::Exec::wait_any(pending_execs); XBT_INFO("Wait any returned index %ld (exec on %s)", index, pending_execs.at(index)->get_host()->get_cname()); } catch (simgrid::HostFailureException& e) { XBT_INFO("Dispatcher has experienced a host failure exception, so it knows that something went wrong"); @@ -52,7 +51,7 @@ static void dispatcher(sg4::Host* host1, sg4::Host* host2) } pending_execs.pop_back(); XBT_INFO("Wait for remaining exec, just to be nice"); - index = simgrid::s4u::Exec::wait_any(pending_execs); + simgrid::s4u::Exec::wait_any(pending_execs); XBT_INFO("Dispatcher ends"); } -- 2.20.1