X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fserial.cpp;h=74af366856cd6ceaf99866e00d977e2108c1803c;hp=9df797109d840cc3554136035410977926bc802e;hb=6c40658510b68788fd5ef0488b20873b6aa32938;hpb=c21ab7e49852585df01b4cc19599e25a918b581b

diff --git a/source/io/serial.cpp b/source/io/serial.cpp
index 9df7971..74af366 100644
--- a/source/io/serial.cpp
+++ b/source/io/serial.cpp
@@ -208,11 +208,7 @@ Serial::~Serial()
 
 void Serial::close()
 {
-#ifdef WIN32
-	CloseHandle(*handle);
-#else
-	::close(*handle);
-#endif
+	sys_close(handle);
 }
 
 void Serial::set_block(bool b)
@@ -287,22 +283,7 @@ unsigned Serial::do_write(const char *buf, unsigned size)
 	if(size==0)
 		return 0;
 
-#ifdef WIN32
-	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 Serial::do_read(char *buf, unsigned size)
@@ -310,22 +291,7 @@ unsigned Serial::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
-
-	return ret;
+	return sys_read(handle, buf, size);
 }
 
 const Handle &Serial::get_event_handle()