Move some common operations to helper functions

[libs/core.git] / source / io / file.cpp

diff --git a/source/io/file.cpp b/source/io/file.cpp
index c9e5d4978c5255e418c12d7794146e2d062f0667..1b207a25971f960ef99fa5f4481a0be23239e38d 100644 (file)
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -96,11 +96,7 @@ void File::close()
 
        signal_flush_required.emit();
 
-#ifdef WIN32
-       CloseHandle(*handle);
-#else
-       ::close(*handle);
-#endif
+       sys_close(handle);
 
        handle = Handle();
        signal_closed.emit();
@@ -129,21 +125,9 @@ unsigned File::do_write(const char *buf, unsigned size)
 #ifdef WIN32
        if(mode&M_APPEND)
                seek(0, S_END);
-       DWORD ret;
-       if(WriteFile(*handle, buf, size, &ret, 0)==0)
-               throw system_error("WriteFile");
-#else
-       int ret = ::write(*handle, buf, size);
-       if(ret==-1)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("write");
-       }
 #endif
 
-       return ret;
+       return sys_write(handle, buf, size);
 }
 
 unsigned File::do_read(char *buf, unsigned size)
@@ -153,21 +137,7 @@ unsigned File::do_read(char *buf, unsigned size)
        if(size==0)
                return 0;
 
-#ifdef WIN32
-       DWORD ret;
-       if(ReadFile(*handle, buf, size, &ret, 0)==0)
-               throw system_error("ReadFile");
-#else
-       int ret = ::read(*handle, buf, size);
-       if(ret==-1)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("read");
-       }
-#endif
-
+       unsigned ret = sys_read(handle, buf, size);
        if(ret==0)
        {
                eof_flag = true;