X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffile.cpp;fp=source%2Ffile.cpp;h=0b153cf44b08460a42338decd2918faccb9f166e;hp=6ef338888b24b610b0d61f7bcaa06d9fec2594fa;hb=73a21b6f495e16707ede460a2c9d8f1474bb4d93;hpb=48926b1ed17db1fed149f89140ea99f6d968adc2

diff --git a/source/file.cpp b/source/file.cpp
index 6ef3388..0b153cf 100644
--- a/source/file.cpp
+++ b/source/file.cpp
@@ -34,62 +34,62 @@ File::File(const string &fn, Mode m, CreateMode cm)
 	if(cm&~(C_CREATE|C_TRUNCATE))
 		throw InvalidParameterValue("Invalid create mode");
 
-	mode=m;
+	mode = m;
 
 #ifdef WIN32
-	int flags=0;
-	int create_flags=OPEN_EXISTING;
+	int flags = 0;
+	int create_flags = OPEN_EXISTING;
 
 	if(mode&M_READ)
-		flags|=GENERIC_READ;
+		flags |= GENERIC_READ;
 	else if(mode&M_WRITE)
 	{
-		flags|=GENERIC_WRITE;
+		flags |= GENERIC_WRITE;
 
 		switch(static_cast<int>(cm))
 		{
-		case C_NONE:     create_flags=OPEN_EXISTING; break;
-		case C_CREATE:   create_flags=OPEN_ALWAYS; break;
-		case C_TRUNCATE: create_flags=TRUNCATE_EXISTING; break;
-		case C_CREATE+C_TRUNCATE: create_flags=CREATE_ALWAYS; break;
+		case C_NONE:     create_flags = OPEN_EXISTING; break;
+		case C_CREATE:   create_flags = OPEN_ALWAYS; break;
+		case C_TRUNCATE: create_flags = TRUNCATE_EXISTING; break;
+		case C_CREATE+C_TRUNCATE: create_flags = CREATE_ALWAYS; break;
 		}
 	}
 
-	handle=CreateFile(fn.c_str(), flags, 0, 0, create_flags, FILE_ATTRIBUTE_NORMAL, 0);
+	handle = CreateFile(fn.c_str(), flags, 0, 0, create_flags, FILE_ATTRIBUTE_NORMAL, 0);
 	if(handle==INVALID_HANDLE_VALUE)
 	{
-		int err=GetLastError();
+		int err = GetLastError();
 		if(err==ERROR_FILE_NOT_FOUND)
 			throw FileNotFound("Can't find file "+fn, fn);
 		else
 			throw SystemError(format("Can't open file '%s'", fn), GetLastError());
 	}
 #else
-	int flags=0;
+	int flags = 0;
 	switch(mode&M_RDWR)
 	{
-	case M_READ:  flags|=O_RDONLY; break;
-	case M_WRITE: flags|=O_WRONLY; break;
-	case M_RDWR:  flags|=O_RDWR; break;
+	case M_READ:  flags |= O_RDONLY; break;
+	case M_WRITE: flags |= O_WRONLY; break;
+	case M_RDWR:  flags |= O_RDWR; break;
 	default:;
 	}
 
 	if(mode&M_WRITE)
 	{
 		if(cm&C_CREATE)
-			flags|=O_CREAT;
+			flags |= O_CREAT;
 		if(cm&C_TRUNCATE)
-			flags|=O_TRUNC;
+			flags |= O_TRUNC;
 	}
 	if(mode&M_APPEND)
-		flags|=O_APPEND;
+		flags |= O_APPEND;
 	if(mode&M_NONBLOCK)
-		flags|=O_NONBLOCK;
+		flags |= O_NONBLOCK;
 
-	handle=::open(fn.c_str(), flags, 0666);
+	handle = ::open(fn.c_str(), flags, 0666);
 	if(handle==-1)
 	{
-		int err=errno;
+		int err = errno;
 		if(err==ENOENT)
 			throw FileNotFound("Can't find file "+fn, fn);
 		else
@@ -119,7 +119,7 @@ void File::close()
 	::close(handle);
 #endif
 
-	handle=MSP_IO_INVALID_HANDLE;
+	handle = MSP_IO_INVALID_HANDLE;
 	signal_closed.emit();
 }
 
@@ -131,11 +131,11 @@ void File::set_block(bool b)
 {
 	check_access(M_NONE);
 
-	mode=(mode&~M_NONBLOCK);
+	mode = (mode&~M_NONBLOCK);
 	if(b)
-		mode=(mode|M_NONBLOCK);
+		mode = (mode|M_NONBLOCK);
 #ifndef WIN32
-	int flags=fcntl(handle, F_GETFD);
+	int flags = fcntl(handle, F_GETFD);
 	fcntl(handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
 #endif
 }
@@ -163,18 +163,18 @@ int File::seek(int off, SeekType st)
 
 	signal_flush_required.emit();
 
-	int type=sys_seek_type(st);
+	int type = sys_seek_type(st);
 #ifdef WIN32
-	DWORD ret=SetFilePointer(handle, off, 0, type);
+	DWORD ret = SetFilePointer(handle, off, 0, type);
 	if(ret==INVALID_SET_FILE_POINTER)
 		throw SystemError("Seek failed", GetLastError());
 #else
-	int ret=lseek(handle, off, type);
+	int ret = lseek(handle, off, type);
 	if(ret==-1)
 		throw SystemError("Seek failed", errno);
 #endif
 
-	eof_flag=false;
+	eof_flag = false;
 
 	return ret;
 }
@@ -187,11 +187,11 @@ int File::tell() const
 	check_access(M_NONE);
 
 #ifdef WIN32
-	DWORD ret=SetFilePointer(handle, 0, 0, FILE_CURRENT);
+	DWORD ret = SetFilePointer(handle, 0, 0, FILE_CURRENT);
 	if(ret==INVALID_SET_FILE_POINTER)
 		throw SystemError("Tell failed", GetLastError());
 #else
-	int ret=lseek(handle, 0, SEEK_CUR);
+	int ret = lseek(handle, 0, SEEK_CUR);
 	if(ret==-1)
 		throw SystemError("Tell failed", errno);
 #endif
@@ -236,7 +236,7 @@ unsigned File::do_write(const char *buf, unsigned size)
 	if(WriteFile(handle, buf, size, &ret, 0)==0)
 		throw SystemError("Writing to file failed", GetLastError());
 #else
-	int ret=::write(handle, buf, size);
+	int ret = ::write(handle, buf, size);
 	if(ret==-1)
 	{
 		if(errno==EAGAIN)
@@ -269,7 +269,7 @@ unsigned File::do_read(char *buf, unsigned size)
 	if(ReadFile(handle, buf, size, &ret, 0)==0)
 		throw SystemError("Reading from file failed", GetLastError());
 #else
-	int ret=::read(handle, buf, size);
+	int ret = ::read(handle, buf, size);
 	if(ret==-1)
 	{
 		if(errno==EAGAIN)
@@ -281,7 +281,7 @@ unsigned File::do_read(char *buf, unsigned size)
 
 	if(ret==0)
 	{
-		eof_flag=true;
+		eof_flag = true;
 		signal_end_of_file.emit();
 	}