Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-23 04:04:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'Konstantinacc-master'

Browse Source
This commit is contained in:
William Woodall 2014-07-02 15:02:06 -07:00
commit 23770f9581
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/impl/unix.cc
View File

@ -437,8 +437,13 @@ Serial::SerialImpl::close ()
{ {
if (is_open_ == true) { if (is_open_ == true) {
if (fd_ != -1) { if (fd_ != -1) {
::close (fd_); // Ignoring the outcome int ret;
ret = ::close (fd_);
if (ret == 0) {
fd_ = -1; fd_ = -1;
} else {
THROW (IOException, errno);
}
} }
is_open_ = false; is_open_ = false;
} }

11
src/impl/win.cc
View File

@ -2,6 +2,8 @@
/* Copyright 2012 William Woodall and John Harrison */ /* Copyright 2012 William Woodall and John Harrison */
#include <sstream>
#include "serial/impl/win.h" #include "serial/impl/win.h"
using std::string; using std::string;
@ -260,9 +262,16 @@ Serial::SerialImpl::close ()
{ {
if (is_open_ == true) { if (is_open_ == true) {
if (fd_ != INVALID_HANDLE_VALUE) { if (fd_ != INVALID_HANDLE_VALUE) {
CloseHandle(fd_); int ret;
ret = CloseHandle(fd_);
if (ret == 0) {
stringstream ss;
ss << "Error while closing serial port: " << GetLastError();
THROW (IOException, ss.str().c_str());
} else {
fd_ = INVALID_HANDLE_VALUE; fd_ = INVALID_HANDLE_VALUE;
} }
}
is_open_ = false; is_open_ = false;
} }
} }