Changeset 32830 in vbox for trunk

Timestamp:

Sep 29, 2010 7:36:36 PM (14 years ago)

Author:

vboxsync

Message:

tcp.cpp: Make the outlined fix for rtTcpClose work

File:

• trunk/src/VBox/Runtime/r3/tcp.cpp (modified) (1 diff)

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

@@ -1020 +1020 @@
 
                 char abBitBucket[16*_1K];
-                size_t cbRead;
 #ifdef FIX_FOR_3_2
-                ssize_t cbBytesRead = recv(hNative, &abBitBucket[0], sizeof(abBitBucket), MSG_NOSIGNAL);
-                if (cbBytesRead == 0)
+                ssize_t cbRead = recv(hNative, &abBitBucket[0], sizeof(abBitBucket), MSG_NOSIGNAL);
+                if (cbRead == 0)
                     break; /* orderly shutdown in progress */
-                if (cbBytesRead < 0 && errno != EAGAIN)
+                if (cbRead < 0 && errno != EAGAIN)
                     break; /* some kind of error, never mind which... */
 #else
+                size_t cbRead;
                 rc = RTSocketReadNB(Sock, &abBitBucket[0], sizeof(abBitBucket), &cbRead);
                 if (RT_FAILURE(rc))