X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Flog.cpp;h=589cfd909806ee7ba6be55d720c6f06ba486a6bf;hb=e7246d3f0deed22f7d81e8988f656c594720d672;hp=600e715c12680653379b935551aa2e48384bbffe;hpb=5e507c9829942c434a6f1ae7a4f3a488c7e50bef;p=oweals%2Fminetest.git diff --git a/src/log.cpp b/src/log.cpp index 600e715c1..589cfd909 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -34,9 +34,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +const int BUFFER_LENGTH = 256; + class StringBuffer : public std::streambuf { public: - StringBuffer() {} + StringBuffer() { + buffer_index = 0; + } int overflow(int c); virtual void flush(const std::string &buf) = 0; @@ -44,7 +48,8 @@ public: void push_back(char c); private: - std::string buffer; + char buffer[BUFFER_LENGTH]; + int buffer_index; }; @@ -338,11 +343,18 @@ std::streamsize StringBuffer::xsputn(const char *s, std::streamsize n) void StringBuffer::push_back(char c) { if (c == '\n' || c == '\r') { - if (!buffer.empty()) - flush(buffer); - buffer.clear(); + if (buffer_index) + flush(std::string(buffer, buffer_index)); + buffer_index = 0; } else { - buffer.push_back(c); + int index = buffer_index; + buffer[index++] = c; + if (index >= BUFFER_LENGTH) { + flush(std::string(buffer, buffer_index)); + buffer_index = 0; + } else { + buffer_index = index; + } } }