Refactoring conditional directives that break parts of statements.

diff --git a/contrib/exim/local_scan.c b/contrib/exim/local_scan.c
index cffe9de290f7080a50611fe09cf80af194f81405..20d3ba246db6950466e5d34d0bb89b9a866596f9 100644 (file)
--- a/contrib/exim/local_scan.c
+++ b/contrib/exim/local_scan.c
@@ -331,6 +331,7 @@ int GetAndTransferMessage (int fd, char *sFile)
     char answ [4];
     int         iStatus;
     int         Len, ccnt;
+    int         test;
 
     iStatus = GetFiles ((char *)sFile, fd);
 
@@ -344,10 +345,11 @@ int GetAndTransferMessage (int fd, char *sFile)
     for (ccnt = 0; ccnt <= MAX_FAILS_C; ccnt ++)
     {
 #ifdef RSPAM_UNIXSOCKET
-        if (connect (sock, (struct sockaddr *) &ssun, sizeof (struct sockaddr_un)) < 0)
+        test = connect (sock, (struct sockaddr *) &ssun, sizeof (struct sockaddr_un)) < 0;
 #else
-        if (connect (sock, (struct sockaddr *) &ssin, sizeof (struct sockaddr_in)) < 0)
+        test = connect (sock, (struct sockaddr *) &ssin, sizeof (struct sockaddr_in)) < 0;
 #endif
+        if (test)
         {
             if (ccnt < MAX_FAILS_C)
                 usleep (1000);