From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Tue, 9 May 2023 14:21:17 +0000 (+0200)
Subject: cleaning
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=9ff99d58afc8ab47edc102927f244e9e683784d8;p=webserver.git

cleaning
---

diff --git a/server.c b/server.c
index 0a50df1..9a4d83e 100644
--- a/server.c
+++ b/server.c
@@ -52,13 +52,14 @@ socket_t open_listening_socket (int port)
     WSADATA WSAData;
     WSAStartup (MAKEWORD(2,0), &WSAData);
     assert (INVALID_SOCKET == (socket_t)-1);
-    assert (SOCKET_ERROR == (socket_t)-1);
+    assert (SOCKET_ERROR == -1);
 #endif
 
     VERBOSE (DEBUG, fprintf (stdout, "Opening socket\n"));
     socket_t sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if ((sock == INVALID_SOCKET) || (sock < 0))
+    if (sock == INVALID_SOCKET) {
         return -1;
+    }
 
     struct sockaddr_in addr = {0};
     addr.sin_family = PF_INET;
@@ -67,18 +68,17 @@ socket_t open_listening_socket (int port)
 
     VERBOSE (DEBUG, fprintf (stdout, "Binding socket\n"));
     int rc = bind (sock, (struct sockaddr *)&addr, sizeof (addr));
-    if ((rc == SOCKET_ERROR) || (rc < 0)) {
+    if (rc == SOCKET_ERROR) {
         VERBOSE (ERROR, fprintf (stderr, "error: %d\n", ERRNO));
         rc = closesocket (sock);
-        if ((rc == SOCKET_ERROR) || (rc < 0)) {
+        if (rc == SOCKET_ERROR) {
             VERBOSE (ERROR, fprintf (stderr, "error: %d\n", ERRNO));
         }
         return -1;
     }
 
     VERBOSE (DEBUG, fprintf (stdout, "Configuring socket\n"));
-#ifdef _WIN32 /* Windows */
-#else /* Posix */
+#ifndef _WIN32 /* Posix */
     fcntl (sock, F_SETFL, O_NONBLOCK);
 #endif
     int val = 1;
@@ -86,6 +86,9 @@ socket_t open_listening_socket (int port)
     if (rc < 0) {
         VERBOSE (ERROR, fprintf (stderr, "%s\n", "setsockopt/TCP_NODELAY"));
         closesocket (sock);
+        if (rc == SOCKET_ERROR) {
+            VERBOSE (ERROR, fprintf (stderr, "error: %d\n", ERRNO));
+        }
         return -1;
     }
 
@@ -95,7 +98,10 @@ socket_t open_listening_socket (int port)
 /* close listening socket */
 void close_listening_socket (socket_t sock)
 {
-    closesocket (sock);
+    int rc = closesocket (sock);
+    if (rc == SOCKET_ERROR) {
+        VERBOSE (ERROR, fprintf (stderr, "error: %d\n", ERRNO));
+    }
 #ifdef _WIN32 /* Windows */
     WSACleanup ();
 #endif