From b50d79542c95ab88387418b34999e942e6b6a583 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 11 Jan 2014 01:30:05 +0100 Subject: db/upnp: move stringToTokens() to Util.cxx --- src/db/UpnpDatabasePlugin.cxx | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'src/db/UpnpDatabasePlugin.cxx') diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx index dbc0cdfd7..be035bb00 100644 --- a/src/db/UpnpDatabasePlugin.cxx +++ b/src/db/UpnpDatabasePlugin.cxx @@ -24,6 +24,7 @@ #include "upnp/Discovery.hxx" #include "upnp/ContentDirectoryService.hxx" #include "upnp/Directory.hxx" +#include "upnp/Util.hxx" #include "LazyDatabase.hxx" #include "DatabasePlugin.hxx" #include "DatabaseSelection.hxx" @@ -146,42 +147,6 @@ private: Error &error) const; }; -gcc_pure -static std::vector -stringToTokens(const std::string &str, - const char *delims = "/", bool skipinit = true) -{ - std::vector tokens; - - std::string::size_type startPos = 0; - - // Skip initial delims, return empty if this eats all. - if (skipinit && - (startPos = str.find_first_not_of(delims, 0)) == std::string::npos) - return tokens; - - while (startPos < str.size()) { - // Find next delimiter or end of string (end of token) - auto pos = str.find_first_of(delims, startPos); - - // Add token to the vector and adjust start - if (pos == std::string::npos) { - tokens.push_back(str.substr(startPos)); - break; - } else if (pos == startPos) { - // Dont' push empty tokens after first - if (tokens.empty()) - tokens.push_back(std::string()); - startPos = ++pos; - } else { - tokens.push_back(str.substr(startPos, pos - startPos)); - startPos = ++pos; - } - } - - return tokens; -} - Database * UpnpDatabase::Create(gcc_unused EventLoop &loop, gcc_unused DatabaseListener &listener, -- cgit v1.2.3