From cec12c007336441ea0f5ce912c181c3f14e574ca Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 21 Apr 2022 09:34:38 +0200 Subject: [PATCH] minor improvements for fixed slot sequence --- src/fsfw/tasks/FixedSlotSequence.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fsfw/tasks/FixedSlotSequence.cpp b/src/fsfw/tasks/FixedSlotSequence.cpp index d4c67b4d..79e89255 100644 --- a/src/fsfw/tasks/FixedSlotSequence.cpp +++ b/src/fsfw/tasks/FixedSlotSequence.cpp @@ -138,23 +138,22 @@ ReturnValue_t FixedSlotSequence::checkSequence() const { } ReturnValue_t FixedSlotSequence::intializeSequenceAfterTaskCreation() const { - std::set uniqueObjects; - uint32_t count = 0; + std::set uniqueObjects = {}; + uint32_t failedCount = 0; for (const auto& slot : slotList) { // Ensure that each unique object is initialized once. if (uniqueObjects.find(slot.executableObject) == uniqueObjects.end()) { ReturnValue_t result = slot.executableObject->initializeAfterTaskCreation(); if (result != HasReturnvaluesIF::RETURN_OK) { - count++; + failedCount++; } uniqueObjects.emplace(slot.executableObject); } } - if (count > 0) { + if (failedCount > 0) { #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::error << "FixedSlotSequence::intializeSequenceAfterTaskCreation:" - "Counted " - << count << " failed initializations!" << std::endl; + "Counted " << failedCount << " failed initializations" << std::endl; #endif return HasReturnvaluesIF::RETURN_FAILED; }