SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

change PIIODevice read* and write* methods size to "ssize_t"

Browse Source
This commit is contained in:
Пелипенко Иван
2022-08-01 18:52:30 +03:00
parent 1b499530c5
commit b1e220e454
39 changed files with 135 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/main/io_devices/piserial.cpp
View File

@@ -793,7 +793,7 @@ void PISerial::setTimeouts() {
//! \returns Количество прочитанных байт, -1 при ошибке
//!
//! \~\sa \a readData(), \a readString()
int PISerial::readDevice(void * read_to, int max_size) {
ssize_t PISerial::readDevice(void * read_to, ssize_t max_size) {
#ifdef WINDOWS
if (!canRead()) return -1;
if (sending) return -1;
@@ -811,7 +811,7 @@ int PISerial::readDevice(void * read_to, int max_size) {
return PRIVATE->readed;
#else
if (!canRead()) return -1;
int ret = ::read(fd, read_to, max_size);
ssize_t ret = ::read(fd, read_to, max_size);
if (ret < 0) {
int err = errno;
if (err == EBADF || err == EFAULT || err == EINVAL || err == EIO) {
@@ -825,7 +825,7 @@ int PISerial::readDevice(void * read_to, int max_size) {
}
int PISerial::writeDevice(const void * data, int max_size) {
ssize_t PISerial::writeDevice(const void * data, ssize_t max_size) {
if (fd == -1 || !canWrite()) {
//piCoutObj << "Can`t write to uninitialized COM";
return -1;
@@ -838,11 +838,11 @@ int PISerial::writeDevice(const void * data, int max_size) {
sending = false;
// piCoutObj << "send ok";// << wrote << " bytes in " << path();
#else
int wrote;
ssize_t wrote;
wrote = ::write(fd, data, max_size);
if (isOptionSet(BlockingWrite)) tcdrain(fd);
#endif
return (int)wrote;
return (ssize_t)wrote;
//piCoutObj << "Error while sending";
}