X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Ftcpip.c;h=667accf49360959eea4e9ba7834ee46e04e205a1;hp=40e3d619e493d19d7aec72422ff56f9f44a6dbbf;hb=8030536c98d595898b316df5eb118b1d6398450c;hpb=48096bb041fcc45b11666ad058963a633a0ec3db

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 40e3d61..667accf 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.22  1998-06-22 11:32:36  adam
+ * Revision 1.25  1998-07-07 15:49:23  adam
+ * Added braces to avoid warning.
+ *
+ * Revision 1.24  1998/06/29 07:59:17  adam
+ * Minor fix.
+ *
+ * Revision 1.23  1998/06/23 15:37:50  adam
+ * Added type cast to prevent warning.
+ *
+ * Revision 1.22  1998/06/22 11:32:36  adam
  * Added 'conditional cs_listen' feature.
  *
  * Revision 1.21  1998/05/20 09:55:32  adam
@@ -460,16 +469,17 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
         memcpy(raddr, &addr, *addrlen = sizeof(struct sockaddr_in));
     else if (addrlen)
         *addrlen = 0;
-
-#if 1
-    if (check_ip && (*check_ip)(cd, &addr.sin_addr, sizeof(addr.sin_addr),
-				AF_INET))
+    if (check_ip && (*check_ip)(cd, (const char *) &addr.sin_addr,
+        sizeof(addr.sin_addr), AF_INET))
     {
 	h->cerrno = CSDENY;
-	close (h->newfd);
+#ifdef WINDOWS
+        closesocket(h->iofile);
+#else
+        close(h->iofile);
+#endif
 	return -1;
     }
-#endif
     h->state = CS_INCON;
     return 0;
 }
@@ -553,6 +563,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
             if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
                 return -1;
         if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
+	{
 #ifdef WINDOWS
             if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
@@ -565,6 +576,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
                 break;
             else
                 return -1;
+	}
         if (!res)
             return 0;
         hasread += res;