diff options
| -rw-r--r-- | src/db/upnp/Device.cxx | 3 | ||||
| -rw-r--r-- | src/db/upnp/Directory.cxx | 3 | ||||
| -rw-r--r-- | src/db/upnp/Util.cxx | 21 | ||||
| -rw-r--r-- | src/db/upnp/Util.hxx | 5 |
4 files changed, 15 insertions, 17 deletions
diff --git a/src/db/upnp/Device.cxx b/src/db/upnp/Device.cxx index 37d68c232..c947f5a14 100644 --- a/src/db/upnp/Device.cxx +++ b/src/db/upnp/Device.cxx @@ -56,8 +56,7 @@ protected: } virtual void CharacterData(const XML_Char *s, int len) { - std::string str(s, len); - trimstring(str); + std::string str = trimstring(s, len); switch (m_path.back()[0]) { case 'c': if (!m_path.back().compare("controlURL")) diff --git a/src/db/upnp/Directory.cxx b/src/db/upnp/Directory.cxx index 3b6428389..757e2e19d 100644 --- a/src/db/upnp/Directory.cxx +++ b/src/db/upnp/Directory.cxx @@ -156,8 +156,7 @@ protected: virtual void CharacterData(const XML_Char *s, int len) { - std::string str(s, len); - trimstring(str); + std::string str = trimstring(s, len); TagType type = tag_table_lookup(upnp_tags, m_path.back().c_str()); diff --git a/src/db/upnp/Util.cxx b/src/db/upnp/Util.cxx index afe68e619..fc9ef6281 100644 --- a/src/db/upnp/Util.cxx +++ b/src/db/upnp/Util.cxx @@ -18,6 +18,7 @@ */ #include "Util.hxx" +#include "util/CharUtil.hxx" #include <string> #include <map> @@ -27,19 +28,17 @@ #include <upnp/ixml.h> /** Get rid of white space at both ends */ -void -trimstring(std::string &s, const char *ws) +std::string +trimstring(const char *p, size_t length) { - auto pos = s.find_first_not_of(ws); - if (pos == std::string::npos) { - s.clear(); - return; - } - s.replace(0, pos, std::string()); + while (length > 0 && IsWhitespaceOrNull(p[length - 1])) + --length; + + const char *end = p + length; + while (p != end && IsWhitespaceOrNull(*p)) + ++p; - pos = s.find_last_not_of(ws); - if (pos != std::string::npos && pos != s.length()-1) - s.replace(pos + 1, std::string::npos, std::string()); + return std::string(p, end); } std::string diff --git a/src/db/upnp/Util.hxx b/src/db/upnp/Util.hxx index 08fe5f497..ba5633331 100644 --- a/src/db/upnp/Util.hxx +++ b/src/db/upnp/Util.hxx @@ -28,8 +28,9 @@ std::string caturl(const std::string& s1, const std::string& s2); -void -trimstring(std::string &s, const char *ws = " \t\n"); +gcc_pure +std::string +trimstring(const char *p, size_t length); std::string path_getfather(const std::string &s); |