From 9ba562e55858809a17871de256276a62257234a9 Mon Sep 17 00:00:00 2001 From: Stéphane Raimbault Date: Fri, 10 May 2013 01:27:50 +0200 Subject: [PATCH] Improve socket init and close in tests --- tests/bandwidth-server-many-up.c | 6 ++++-- tests/random-test-server.c | 6 ++++-- tests/unit-test-server.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/bandwidth-server-many-up.c b/tests/bandwidth-server-many-up.c index a1147f8..32d9705 100644 --- a/tests/bandwidth-server-many-up.c +++ b/tests/bandwidth-server-many-up.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); diff --git a/tests/random-test-server.c b/tests/random-test-server.c index cccc199..772eb0b 100644 --- a/tests/random-test-server.c +++ b/tests/random-test-server.c @@ -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); diff --git a/tests/unit-test-server.c b/tests/unit-test-server.c index f60d16c..e231391 100644 --- a/tests/unit-test-server.c +++ b/tests/unit-test-server.c @@ -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); -- libgit2 0.21.4