From 0da24caef9f3cd431952e39d0d20cb237980d422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Fri, 19 Aug 2016 20:28:55 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@233 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/io/pipeer.cpp | 9 ++++----- src/io/pipeer.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp index 8a9c57ba..a90aeada 100755 --- a/src/io/pipeer.cpp +++ b/src/io/pipeer.cpp @@ -857,13 +857,12 @@ PIString PIPeer::constructFullPath() const { } -int PIPeer::read(void *read_to, int max_size) { - bool empty = read_buffer.isEmpty(); - while (empty) piMSleep(10); +int PIPeer::read(void * read_to, int max_size) { + while (read_buffer.isEmpty()) piMSleep(10); PIMutexLocker ml(read_buffer_mutex); if (!read_buffer.isEmpty()) { PIByteArray ba = read_buffer.dequeue(); - int sz = piMini(ba.size_s(), max_size); + int sz = piMini(ba.size_s(), max_size); memcpy(read_to, ba.data(), sz); return sz; } @@ -871,7 +870,7 @@ int PIPeer::read(void *read_to, int max_size) { } -int PIPeer::write(const void *data, int size) { +int PIPeer::write(const void * data, int size) { if (trust_peer.isEmpty()) { sendToAll(data, size); return size; diff --git a/src/io/pipeer.h b/src/io/pipeer.h index ebe77df6..f4438537 100755 --- a/src/io/pipeer.h +++ b/src/io/pipeer.h @@ -136,7 +136,7 @@ public: const PIString & trustPeerName() const {return trust_peer;} void setTrustPeerName(const PIString & peer_name) {trust_peer = peer_name;} PIString constructFullPath() const; - int read(void *read_to, int max_size); + int read(void * read_to, int max_size); int write(const void * data, int size);