X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fbuffered.cpp;h=b8a2dbee7255628fa899c691cac3b041e94f164a;hp=09cc0994840d9e4959bef8a28e062208273c0a44;hb=73a21b6f495e16707ede460a2c9d8f1474bb4d93;hpb=d6b80800099c85df8d6f49b5b9d11e43f86c79b0

diff --git a/source/buffered.cpp b/source/buffered.cpp
index 09cc099..b8a2dbe 100644
--- a/source/buffered.cpp
+++ b/source/buffered.cpp
@@ -4,6 +4,8 @@ This file is part of libmspio
 Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
+#include <cstring>
 #include "buffered.h"
 #include "except.h"
 
@@ -20,7 +22,7 @@ Buffered::Buffered(Base &b, unsigned s):
 	end(buf),
 	cur_op(M_NONE)
 {
-	mode=below.get_mode();
+	mode = below.get_mode();
 	below.signal_flush_required.connect(sigc::mem_fun(this, &Buffered::flush));
 }
 
@@ -30,7 +32,7 @@ unsigned Buffered::put(char c)
 
 	if(end<buf+buf_size)
 	{
-		*end++=c;
+		*end++ = c;
 		return 1;
 	}
 	else
@@ -41,19 +43,19 @@ void Buffered::flush()
 {
 	if(cur_op==M_WRITE)
 	{
-		unsigned used=end-begin;
+		unsigned used = end-begin;
 		if(used)
 		{
-			unsigned len=below.write(begin, used);
+			unsigned len = below.write(begin, used);
 
-			begin=end=buf;
+			begin=end = buf;
 
 			if(len<used)
 				throw Exception("Couldn't flush all data");
 		}
 	}
 	else if(cur_op==M_READ)
-		begin=end=buf;
+		begin=end = buf;
 }
 
 bool Buffered::getline(std::string &line)
@@ -64,7 +66,7 @@ bool Buffered::getline(std::string &line)
 		if(*i=='\n')
 		{
 			line.assign(begin, i-begin);
-			begin=i+1;
+			begin = i+1;
 			return true;
 		}
 
@@ -110,7 +112,7 @@ void Buffered::set_op(Mode op)
 {
 	if(op!=cur_op)
 		flush();
-	cur_op=op;
+	cur_op = op;
 }
 
 unsigned Buffered::do_write(const char *data, unsigned size)
@@ -121,7 +123,7 @@ unsigned Buffered::do_write(const char *data, unsigned size)
 	{
 		// All data fits in buffer with whatever is already there
 		memcpy(end, data, size);
-		end+=size;
+		end += size;
 
 		return size;
 	}
@@ -134,7 +136,7 @@ unsigned Buffered::do_write(const char *data, unsigned size)
 		{
 			// Put new data in the buffer to wait for more
 			memcpy(end, data, size);
-			end+=size;
+			end += size;
 
 			return size;
 		}
@@ -152,9 +154,9 @@ unsigned Buffered::do_read(char *data, unsigned size)
 	{
 		// The request can be served from the buffer
 		memcpy(data, begin, size);
-		begin+=size;
+		begin += size;
 
-		eof_flag=(below.eof() && begin==end);
+		eof_flag = (below.eof() && begin==end);
 
 		return size;
 	}
@@ -162,28 +164,28 @@ unsigned Buffered::do_read(char *data, unsigned size)
 	{
 		// Give out whatever is in the buffer already
 		memcpy(data, begin, end-begin);
-		unsigned ret=end-begin;
-		begin=end=buf;
+		unsigned ret = end-begin;
+		begin=end = buf;
 
-		data+=ret;
-		size-=ret;
+		data += ret;
+		size -= ret;
 
 		if(size<buf_size)
 		{
 			// Fill the buffer and serve the rest of the request from it
-			unsigned len=below.read(end, buf+buf_size-end);
-			end+=len;
+			unsigned len = below.read(end, buf+buf_size-end);
+			end += len;
 
-			len=min(static_cast<unsigned>(end-begin), size);
+			len = min(static_cast<unsigned>(end-begin), size);
 			memcpy(data, begin, len);
-			begin+=len;
-			ret+=len;
+			begin += len;
+			ret += len;
 		}
 		else
 			// Read the rest directly from the underlying object
-			ret+=below.read(data, size);
+			ret += below.read(data, size);
 
-		eof_flag=(below.eof() && begin==end);
+		eof_flag = (below.eof() && begin==end);
 
 		return ret;
 	}