From 9b2845e1691b5587d731c3dae9f695ca2db0be1a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 15 Jan 2016 15:57:32 +0100 Subject: return correct position in APT::StringView::(r)find The position returned is supposed to be the position of the character counted from the start of the string, but if we used the substr calling overloads the skipped over prefix wasn't considered. The pos parameter of rfind had also the wrong semantic. --- apt-pkg/contrib/string_view.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/apt-pkg/contrib/string_view.h b/apt-pkg/contrib/string_view.h index 5b6411a33..d4ff80028 100644 --- a/apt-pkg/contrib/string_view.h +++ b/apt-pkg/contrib/string_view.h @@ -29,6 +29,7 @@ class StringView { public: static constexpr size_t npos = static_cast(-1); + static_assert(APT::StringView::npos == std::string::npos, "npos values are different"); /* Constructors */ constexpr StringView() : data_(""), size_(0) {} @@ -43,10 +44,15 @@ public: return StringView(data_ + pos, n > (size_ - pos) ? (size_ - pos) : n); } - size_t find(int c, size_t pos=0) const { - if (pos != 0) - return substr(pos).find(c); - + size_t find(int c, size_t pos) const { + if (pos == 0) + return find(c); + size_t const found = substr(pos).find(c); + if (found == npos) + return npos; + return pos + found; + } + size_t find(int c) const { const char *found = static_cast(memchr(data_, c, size_)); if (found == NULL) @@ -55,10 +61,12 @@ public: return found - data_; } - size_t rfind(int c, size_t pos=npos) const { - if (pos != npos) - return substr(0, pos).rfind(c); - + size_t rfind(int c, size_t pos) const { + if (pos == npos) + return rfind(c); + return APT::StringView(data_, pos).rfind(c); + } + size_t rfind(int c) const { const char *found = static_cast(memrchr(data_, c, size_)); if (found == NULL) -- cgit v1.2.3