diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-07 19:07:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-07 19:38:25 +0200 |
| commit | 5ac2a699407a3e11344d0c024dbb774ec85eca15 (patch) | |
| tree | 67972bd99747d72683621250182407023c48eb51 /src/input | |
| parent | 8278a12af9932fb54cb4472991ced591fc69d7ec (diff) | |
| download | mpd-5ac2a699407a3e11344d0c024dbb774ec85eca15.tar.gz mpd-5ac2a699407a3e11344d0c024dbb774ec85eca15.tar.xz mpd-5ac2a699407a3e11344d0c024dbb774ec85eca15.zip | |
input/TextInputStream: move ReadBufferedLine() to util/TextFile.hxx
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/TextInputStream.cxx | 22 | ||||
| -rw-r--r-- | src/input/TextInputStream.hxx | 3 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/input/TextInputStream.cxx b/src/input/TextInputStream.cxx index 1c46c2f2c..c23616782 100644 --- a/src/input/TextInputStream.cxx +++ b/src/input/TextInputStream.cxx @@ -21,31 +21,15 @@ #include "TextInputStream.hxx" #include "InputStream.hxx" #include "util/Error.hxx" +#include "util/TextFile.hxx" #include "Log.hxx" #include <assert.h> -#include <string.h> - -char * -TextInputStream::ReadBufferedLine() -{ - auto r = buffer.Read(); - char *newline = reinterpret_cast<char*>(memchr(r.data, '\n', r.size)); - if (newline == nullptr) - return nullptr; - - buffer.Consume(newline + 1 - r.data); - - if (newline > r.data && newline[-1] == '\r') - --newline; - *newline = 0; - return r.data; -} char * TextInputStream::ReadLine() { - char *line = ReadBufferedLine(); + char *line = ReadBufferedLine(buffer); if (line != nullptr) return line; @@ -76,7 +60,7 @@ TextInputStream::ReadLine() return nullptr; } - line = ReadBufferedLine(); + line = ReadBufferedLine(buffer); if (line != nullptr) return line; diff --git a/src/input/TextInputStream.hxx b/src/input/TextInputStream.hxx index ce1eaddff..6f39d22cf 100644 --- a/src/input/TextInputStream.hxx +++ b/src/input/TextInputStream.hxx @@ -47,9 +47,6 @@ public: * @return a pointer to the line, or nullptr on end-of-file or error */ char *ReadLine(); - -private: - char *ReadBufferedLine(); }; #endif |