Improve socket init and close in tests

Stéphane Raimbault
1 parent b4753f7e
Showing 3 changed files with 12 additions and 6 deletions
tests/bandwidth-server-many-up.c
tests/random-test-server.c
tests/unit-test-server.c
@@ -35,12 +35,14 @@
 #define NB_CONNECTION    5
  
 modbus_t *ctx = NULL;
-int server_socket;
+int server_socket = -1;
 modbus_mapping_t *mb_mapping;
  
 static void close_sigint(int dummy)
 {
-    close(server_socket);
+    if (server_socket != -1) {
+        close(server_socket);
+    }
     modbus_free(ctx);
     modbus_mapping_free(mb_mapping);
  
@@ -26,7 +26,7 @@
  
 int main(void)
 {
-    int socket;
+    int socket = -1;
     modbus_t *ctx;
     modbus_mapping_t *mb_mapping;
  
@@ -60,7 +60,9 @@ int main(void)
  
     printf("Quit the loop: %s\n", modbus_strerror(errno));
  
-    close(socket);
+    if (socket != -1) {
+        close(socket);
+    }
     modbus_mapping_free(mb_mapping);
     modbus_close(ctx);
     modbus_free(ctx);
@@ -32,7 +32,7 @@ enum {
  
 int main(int argc, char*argv[])
 {
-    int socket;
+    int socket = -1;
     modbus_t *ctx;
     modbus_mapping_t *mb_mapping;
     int rc;
@@ -187,7 +187,9 @@ int main(int argc, char*argv[])
     printf("Quit the loop: %s\n", modbus_strerror(errno));
  
     if (use_backend == TCP) {
-        close(socket);
+        if (socket != -1) {
+            close(socket);
+        }
     }
     modbus_mapping_free(mb_mapping);
     free(query);