Changeset 22:d13fbc745959 in xplcommon for src/xplcommon/win32/ReadingBuffer.cc

Timestamp:

01/02/13 06:43:16 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Cleaned up and simplified the code

File:

• src/xplcommon/win32/ReadingBuffer.cc (modified) (1 diff)

src/xplcommon/win32/ReadingBuffer.cc

@@ -48 +48 @@
     }
 
-    if (isWaited()) {
-        DWORD size = 0;
-        if (getResult(size, stream.handle)) {
-            removeFromWaiter();
-            overlapped->clear();
-            addLength(size);
-            return true;
-        } else {
-            if (stream.failed()) {
-                overlapped->clear();
-                removeFromWaiter();
-            }
-            return false;
-        }
+    bool result = false;
+    if (checkWaitedResult(result)) {
+        return result;
     }
 
-    ssize_t result = stream.read(getData(), getCapacity(), overlapped);
-    if (result<0) {
+    ssize_t numRead = stream.read(getData(), getCapacity(), overlapped);
+    if (numRead<0) {
         if (!stream.failed()) {
             addTo(stream.getWaiter());
-        } else {
-            overlapped->reset();
         }
     } else {
-        overlapped->reset();
-        addLength(result);
+        addLength(numRead);
     }
-    return result>=0;
+    return numRead>=0;
+}
+
+//------------------------------------------------------------------------------
+
+void ReadingBuffer::handleWaitedResult(DWORD size)
+{
+    addLength(size);
 }