change PIIODevice read* and write* methods size to "ssize_t"
This commit is contained in:
@@ -227,14 +227,21 @@ void PIIODevice::stop(bool hard) {
|
||||
}
|
||||
|
||||
|
||||
PIByteArray PIIODevice::read(int max_size) {
|
||||
PIByteArray PIIODevice::read(ssize_t max_size) {
|
||||
if (max_size <= 0) return PIByteArray();
|
||||
buffer_in.resize(max_size);
|
||||
int ret = readDevice(buffer_in.data(), max_size);
|
||||
ssize_t ret = readDevice(buffer_in.data(), max_size);
|
||||
if (ret < 0) return PIByteArray();
|
||||
return buffer_in.resized(ret);
|
||||
}
|
||||
|
||||
|
||||
ssize_t PIIODevice::write(const void * data, ssize_t max_size) {
|
||||
if (max_size <= 0) return 0;
|
||||
return writeDevice(data, max_size);
|
||||
}
|
||||
|
||||
|
||||
void PIIODevice::_init() {
|
||||
opened_ = init_ = thread_started_ = false;
|
||||
raise_threaded_read_ = true;
|
||||
@@ -352,7 +359,7 @@ void PIIODevice::run() {
|
||||
PIByteArray PIIODevice::readForTime(double timeout_ms) {
|
||||
PIByteArray str;
|
||||
if (timeout_ms <= 0.) return str;
|
||||
int ret;
|
||||
ssize_t ret;
|
||||
uchar * td = new uchar[threaded_read_buffer_size];
|
||||
tm.reset();
|
||||
while (tm.elapsed_m() < timeout_ms) {
|
||||
@@ -408,7 +415,7 @@ bool PIIODevice::close() {
|
||||
return !opened_;
|
||||
}
|
||||
|
||||
int PIIODevice::write(PIByteArray data) {
|
||||
ssize_t PIIODevice::write(PIByteArray data) {
|
||||
return writeDevice(data.data(), data.size_s());
|
||||
}
|
||||
|
||||
@@ -595,7 +602,7 @@ PIMap<PIConstChars, PIIODevice::FabricInfo> & PIIODevice::fabrics() {
|
||||
}
|
||||
|
||||
|
||||
bool PIIODevice::threadedRead(const uchar *readed, int size) {
|
||||
bool PIIODevice::threadedRead(const uchar *readed, ssize_t size) {
|
||||
// piCout << "iodevice threaded read";
|
||||
if (func_read) return func_read(readed, size, ret_data_);
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user