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

util/StringUtil: add StripRight() overload with "end" argument

Browse Source
This commit is contained in:
Max Kellermann
2014-08-07 15:15:56 +02:00
parent 5c5c6a965c
commit 59d38f876a
6 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/input/TextInputStream.cxx
View File

@@ -20,7 +20,7 @@
#include "config.h"
#include "TextInputStream.hxx"
#include "InputStream.hxx"
#include "util/CharUtil.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
@@ -72,8 +72,7 @@ TextInputStream::ReadLine()
buffer.Consume(p - src + 1);
while (p > src && IsWhitespaceFast(p[-1]))
--p;
*p = 0;
char *end = StripRight(src, p);
*end = 0;
return src;
}

9
src/input/plugins/CurlInputPlugin.cxx
View File

@@ -31,7 +31,7 @@
#include "event/Call.hxx"
#include "IOThread.hxx"
#include "util/ASCII.hxx"
#include "util/CharUtil.hxx"
#include "util/StringUtil.hxx"
#include "util/NumberParser.hxx"
#include "util/CircularBuffer.hxx"
#include "util/HugeAllocator.hxx"
@@ -661,11 +661,8 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
/* strip the value */
while (value < end && IsWhitespaceOrNull(*value))
++value;
while (end > value && IsWhitespaceOrNull(end[-1]))
--end;
value = StripLeft(value, end);
end = StripRight(value, end);
c.HeaderReceived(name, std::string(value, end));
return size;