From: Justin Viiret Date: Fri, 6 May 2016 01:38:24 +0000 (+1000) Subject: unit: clean up getValidFdrEngines() X-Git-Tag: v4.2.0^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f532b89776f537348345d24a45bc22278357f87a;p=thirdparty%2Fvectorscan.git unit: clean up getValidFdrEngines() --- diff --git a/unit/internal/fdr.cpp b/unit/internal/fdr.cpp index d10c25f0..ddfa8bb1 100644 --- a/unit/internal/fdr.cpp +++ b/unit/internal/fdr.cpp @@ -133,23 +133,25 @@ hwlmcb_rv_t decentCallbackT(size_t start, size_t end, u32 id, void *ctxt) { } // namespace -static vector getValidFdrEngines() { +static +vector getValidFdrEngines() { + const auto target = get_current_target(); + vector ret; - vector des; - getFdrDescriptions(&des); - for (vector::const_iterator it = des.begin(); - it != des.end(); ++it) { - if (it->isValidOnTarget(get_current_target())) { - ret.push_back(it->getID()); + + vector fdr_descriptions; + getFdrDescriptions(&fdr_descriptions); + for (const FDREngineDescription &d : fdr_descriptions) { + if (d.isValidOnTarget(target)) { + ret.push_back(d.getID()); } } - vector tDes; - getTeddyDescriptions(&tDes); - for (vector::const_iterator it = tDes.begin(); - it != tDes.end(); ++it) { - if (it->isValidOnTarget(get_current_target())) { - ret.push_back(it->getID()); + vector teddy_descriptions; + getTeddyDescriptions(&teddy_descriptions); + for (const TeddyEngineDescription &d : teddy_descriptions) { + if (d.isValidOnTarget(target)) { + ret.push_back(d.getID()); } }