Alexandre Julliard : wininet: Avoid testing errno when it isn't set. Simplify NETCON_getNextLine a bit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9bded7bb2a344dc153fd2ece519bafd12e93040b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9bded7bb2a344dc153fd2ece51...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Aug 26 20:40:09 2008 +0200

wininet: Avoid testing errno when it isn't set. Simplify NETCON_getNextLine a bit.

---

 dlls/wininet/netconnection.c |   33 ++++++++++-----------------------
 1 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index f55fbf2..7f6fed7 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -634,8 +634,8 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
     if (!connection->useSSL)
     {
         struct pollfd pfd;
-	BOOL bSuccess = FALSE;
 	DWORD nRecv = 0;
+        int ret;
 
         pfd.fd = connection->socketFD;
         pfd.events = POLLIN;
@@ -644,16 +644,18 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
 	{
 	    if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0)
 	    {
-		if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0)
+		if ((ret = recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0)) <= 0)
 		{
-		    INTERNET_SetLastError(sock_get_error(errno));
-		    goto lend;
+		    if (ret == -1) INTERNET_SetLastError(sock_get_error(errno));
+                    break;
 		}
 
 		if (lpszBuffer[nRecv] == '\n')
 		{
-		    bSuccess = TRUE;
-		    break;
+                    lpszBuffer[nRecv++] = '\0';
+                    *dwBuffer = nRecv;
+                    TRACE(":%u %s\n", nRecv, lpszBuffer);
+                    return TRUE;
 		}
 		if (lpszBuffer[nRecv] != '\r')
 		    nRecv++;
@@ -661,22 +663,9 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
 	    else
 	    {
 		INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT);
-		goto lend;
+                break;
 	    }
 	}
-
-    lend:             /* FIXME: don't use labels */
-	if (bSuccess)
-	{
-	    lpszBuffer[nRecv++] = '\0';
-	    *dwBuffer = nRecv;
-	    TRACE(":%u %s\n", nRecv, lpszBuffer);
-            return TRUE;
-	}
-	else
-	{
-	    return FALSE;
-	}
     }
     else
     {
@@ -714,11 +703,9 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
 	    TRACE("_SSL:%u %s\n", nRecv, lpszBuffer);
             return TRUE;
 	}
-        return FALSE;
-#else
-	return FALSE;
 #endif
     }
+    return FALSE;
 }