From 549fd92f877238a9dc80eb3f29049c91f009f155 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 24 Apr 2020 11:01:15 -0700 Subject: [PATCH] change Server::listSource() --- src/pvxs/server.h | 2 +- src/server.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pvxs/server.h b/src/pvxs/server.h index ad74337..45c305a 100644 --- a/src/pvxs/server.h +++ b/src/pvxs/server.h @@ -102,7 +102,7 @@ public: int order =0); //! List all source names and priorities. - void listSource(std::vector >& names); + std::vector > listSource(); explicit operator bool() const { return !!pvt; } diff --git a/src/server.cpp b/src/server.cpp index cdad577..14d8e25 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -118,12 +118,11 @@ std::shared_ptr Server::getSource(const std::string& name, int order) return ret; } -void Server::listSource(std::vector > &names) +std::vector > Server::listSource() { if(!pvt) throw std::logic_error("NULL Server"); - - names.clear(); + std::vector > names; auto G(pvt->sourcesLock.lockReader()); @@ -132,6 +131,8 @@ void Server::listSource(std::vector > &names) for(auto& pair : pvt->sources) { names.emplace_back(pair.first.second, pair.first.first); } + + return names; } const Config& Server::config() const