diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-26 11:37:52 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-10 22:43:40 +0200 |
| commit | 464767c5fd0671b93f97f79905bdfb987826f6ef (patch) | |
| tree | 371199fc0413bece2b143042e4fc23b2cd9f1e36 /src/lib/upnp/Util.cxx | |
| parent | a9c3ca86065a5db6a9aeed32a25250cb785702a1 (diff) | |
| download | mpd-464767c5fd0671b93f97f79905bdfb987826f6ef.tar.gz mpd-464767c5fd0671b93f97f79905bdfb987826f6ef.tar.xz mpd-464767c5fd0671b93f97f79905bdfb987826f6ef.zip | |
db/upnp/Util: move caturl() to util/UriUtil.cxx
Diffstat (limited to 'src/lib/upnp/Util.cxx')
| -rw-r--r-- | src/lib/upnp/Util.cxx | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/lib/upnp/Util.cxx b/src/lib/upnp/Util.cxx index cf34a47d3..79cfb111c 100644 --- a/src/lib/upnp/Util.cxx +++ b/src/lib/upnp/Util.cxx @@ -39,34 +39,6 @@ trimstring(std::string &s, const char *ws) s.replace(pos + 1, std::string::npos, std::string()); } -std::string -caturl(const std::string &s1, const std::string &s2) -{ - if (s2.front() == '/') { - /* absolute path: replace the whole URI path in s1 */ - - auto i = s1.find("://"); - if (i == s1.npos) - /* no scheme: override s1 completely */ - return s2; - - /* find the first slash after the host part */ - i = s1.find('/', i + 3); - if (i == s1.npos) - /* there's no URI path - simply append s2 */ - i = s1.length(); - - return s1.substr(0, i) + s2; - } - - std::string out(s1); - if (out.back() != '/') - out.push_back('/'); - - out += s2; - return out; -} - static void path_catslash(std::string &s) { |