X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fmemory.cpp;fp=source%2Fmemory.cpp;h=80dde272625a25ed2a7b644460e7f576c853f7aa;hp=c44554ae5a4f9b59f7347befabc552c3fe190bf8;hb=73a21b6f495e16707ede460a2c9d8f1474bb4d93;hpb=48926b1ed17db1fed149f89140ea99f6d968adc2

diff --git a/source/memory.cpp b/source/memory.cpp
index c44554a..80dde27 100644
--- a/source/memory.cpp
+++ b/source/memory.cpp
@@ -27,7 +27,7 @@ Memory::Memory(char *b, char *e)
 
 Memory::Memory(const char *cd, unsigned s)
 {
-	char *d=const_cast<char *>(cd);
+	char *d = const_cast<char *>(cd);
 	init(d, d+s, M_READ);
 }
 
@@ -38,25 +38,25 @@ Memory::Memory(const char *b, const char *e)
 
 void Memory::init(char *b, char *e, Mode m)
 {
-	begin=b;
-	end=e;
-	pos=begin;
-	mode=m;
+	begin = b;
+	end = e;
+	pos = begin;
+	mode = m;
 }
 
 unsigned Memory::put(char c)
 {
 	check_mode(M_WRITE);
-	*pos++=c;
+	*pos++ = c;
 	return 1;
 }
 
 bool Memory::getline(string &line)
 {
-	char *nl=find(pos, end, '\n');
+	char *nl = find(pos, end, '\n');
 	line.assign(pos, nl);
-	bool result=(nl!=pos);
-	pos=nl;
+	bool result = (nl!=pos);
+	pos = nl;
 	return result;
 }
 
@@ -64,7 +64,7 @@ int Memory::get()
 {
 	if(pos==end)
 	{
-		eof_flag=true;
+		eof_flag = true;
 		return -1;
 	}
 
@@ -75,18 +75,18 @@ unsigned Memory::seek(int off, SeekType type)
 {
 	char *new_pos;
 	if(type==S_BEG)
-		new_pos=begin+off;
+		new_pos = begin+off;
 	else if(type==S_CUR)
-		new_pos=pos+off;
+		new_pos = pos+off;
 	else if(type==S_END)
-		new_pos=end+off;
+		new_pos = end+off;
 	else
 		throw InvalidParameterValue("Invalid seek type");
 
 	if(new_pos<begin || new_pos>end)
 		throw InvalidParameterValue("Invalid seek offset");
 
-	pos=new_pos;
+	pos = new_pos;
 	return pos-begin;
 }
 
@@ -99,9 +99,9 @@ unsigned Memory::do_write(const char *buf, unsigned size)
 {
 	check_mode(M_WRITE);
 
-	size=min<unsigned>(size, end-pos);
+	size = min<unsigned>(size, end-pos);
 	memcpy(pos, buf, size);
-	pos+=size;
+	pos += size;
 	return size;
 }
 
@@ -109,13 +109,13 @@ unsigned Memory::do_read(char *buf, unsigned size)
 {
 	if(pos==end)
 	{
-		eof_flag=true;
+		eof_flag = true;
 		return 0;
 	}
 
-	size=min<unsigned>(size, end-pos);
+	size = min<unsigned>(size, end-pos);
 	memcpy(buf, pos, size);
-	pos+=size;
+	pos += size;
 	return size;
 }