Changeset 22:d13fbc745959 in xplcommon for src/xplcommon/win32/BufferedStream.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/BufferedStream.cc (modified) (2 diffs)

src/xplcommon/win32/BufferedStream.cc

@@ -64 +64 @@
 {
     DWORD numRead = 0;
-    overlapped->reset();
-    bool result = ReadFile(handle, dest, length, 0, overlapped->get());
-                           // (overlapped==0) ? &numRead : 0,
-                           // (overlapped==0) ? 0 : overlapped->get());
+    if (overlapped!=0) overlapped->reset();
+    bool result = ReadFile(handle, dest, length,
+                           (overlapped==0) ? &numRead : 0,
+                           (overlapped==0) ? 0 : overlapped->get());
     DWORD error = GetLastError();
-    if (!result && (overlapped==0 ||
-                    (error!=ERROR_IO_PENDING && error!=ERROR_IO_INCOMPLETE)))
+    if (!result &&
+        (overlapped==0 ||
+         (error!=ERROR_IO_PENDING && error!=ERROR_IO_INCOMPLETE)))
     {
         setErrorCode(error);
@@ -86 +87 @@
                            Overlapped* overlapped)
 {
+    if (overlapped!=0) overlapped->reset();
     bool result = WriteFile(handle, src, length, 0,
                             (overlapped==0) ? 0 : overlapped->get());
     DWORD error = GetLastError();
-    if (!result && (overlapped==0 ||
-                    (error!=ERROR_IO_PENDING && error!=ERROR_IO_INCOMPLETE)))
+    if (!result &&
+        (overlapped==0 ||
+         (error!=ERROR_IO_PENDING && error!=ERROR_IO_INCOMPLETE)))
     {
         setErrorCode(error);