SerialPort.cpp   SerialPort.cpp 
skipping to change at line 163 skipping to change at line 163
// restore original settings // restore original settings
SetCommState(handle, &dcb_original); SetCommState(handle, &dcb_original);
CloseHandle(handle); CloseHandle(handle);
} }
#else #else
if (fd >= 0) if (fd >= 0)
{ {
// restore original settings // restore original settings
tcsetattr(fd, TCSANOW, &termios_original); tcsetattr(fd, TCSANOW, &termios_original);
close(fd); close(fd);
fd=INVALID_SOCKET; // fix Coverity 48939?
} }
#endif #endif
} }
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
int SerialPort::readNonblocking(char *buf, int count) int SerialPort::readNonblocking(char *buf, int count)
{ {
DWORD rval; DWORD rval;
if (ReadFile(handle, buf, count, &rval, 0)) if (ReadFile(handle, buf, count, &rval, 0))
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/