diff options
| -rw-r--r-- | src/input/TextInputStream.cxx | 22 | ||||
| -rw-r--r-- | src/input/TextInputStream.hxx | 3 | ||||
| -rw-r--r-- | src/util/TextFile.hxx | 52 |
3 files changed, 55 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 diff --git a/src/util/TextFile.hxx b/src/util/TextFile.hxx new file mode 100644 index 000000000..3d7d2d0df --- /dev/null +++ b/src/util/TextFile.hxx @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008-2014 Max Kellermann <max@duempel.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef TEXT_FILE_HXX +#define TEXT_FILE_HXX + +#include <string.h> + +template<typename B> +char * +ReadBufferedLine(B &buffer) +{ + 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; +} + +#endif |