Changeset 60910 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 9, 2016 9:00:28 PM (9 years ago)

Author:

vboxsync

Message:

iprt/socket.cpp: set *pcbWritten to 0 on windows too when returning VINF_TRY_AGAIN. Don't bother check whether VINF_SUCCESS is VERR_TRY_AGAIN! Makes the code harder to read and potentially slower.

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -1267 +1267 @@
     }
     else
+    {
         rc = rtSocketError();
-
-    if (rc == VERR_TRY_AGAIN)
-    {
-        *pcbRead = 0;
-        rc = VINF_TRY_AGAIN;
-    }
+        if (rc == VERR_TRY_AGAIN)
+        {
+            *pcbRead = 0;
+            rc = VINF_TRY_AGAIN;
+        }
+    }
+
 #else
     ssize_t cbRead = recv(pThis->hNative, pvBuffer, cbNow, MSG_NOSIGNAL);
@@ -1328 +1330 @@
     }
     else
+    {
         rc = rtSocketError();
-
-    if (rc == VERR_TRY_AGAIN)
-        rc = VINF_TRY_AGAIN;
+        if (rc == VERR_TRY_AGAIN)
+        {
+            *pcbWritten = 0;
+            rc = VINF_TRY_AGAIN;
+        }
+    }
 #else
     ssize_t cbWritten = send(pThis->hNative, pvBuffer, cbBuffer, MSG_NOSIGNAL);