oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/upnp/Util: use string::back(), string::front()

Browse Source
This commit is contained in:
Max Kellermann 2014-01-22 19:29:03 +01:00
parent e59d8c9378
commit 9aeb23dfe9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/upnp/Util.cxx
View File

@ -46,11 +46,11 @@ std::string
caturl(const std::string &s1, const std::string &s2) caturl(const std::string &s1, const std::string &s2)
{ {
std::string out(s1); std::string out(s1);
if (out[out.size()-1] == '/') { if (out.back() == '/') {
if (s2[0] == '/') if (s2.front() == '/')
out.erase(out.size()-1); out.erase(out.size()-1);
} else { } else {
if (s2[0] != '/') if (s2.front() != '/')
out.push_back('/'); out.push_back('/');
} }
out += s2; out += s2;
@ -60,7 +60,7 @@ caturl(const std::string &s1, const std::string &s2)
static void static void
path_catslash(std::string &s) path_catslash(std::string &s)
{ {
if (s.empty() || s[s.length() - 1] != '/') if (s.empty() || s.back() != '/')
s += '/'; s += '/';
} }
@ -73,7 +73,7 @@ path_getfather(const std::string &s)
if (father.empty()) if (father.empty())
return "./"; return "./";
if (father[father.length() - 1] == '/') { if (father.back() == '/') {
// Input ends with /. Strip it, handle special case for root // Input ends with /. Strip it, handle special case for root
if (father.length() == 1) if (father.length() == 1)
return father; return father;