From 6c4af9020f4af505becefeef117ddb40f8b42d37 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Thu, 24 Mar 2011 08:43:43 +0100
Subject: [PATCH] close(fd) instead of (void) close(fd)

---
 libowlps/libowlps.c                  | 2 +-
 owlps-aggregator/owlps-aggregatord.c | 8 ++++----
 owlps-client/owlps-client.c          | 4 ++--
 owlps-listener/owlps-listenerd.c     | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libowlps/libowlps.c b/libowlps/libowlps.c
index 8d4e48a..1e44c1a 100644
--- a/libowlps/libowlps.c
+++ b/libowlps/libowlps.c
@@ -305,7 +305,7 @@ int owl_create_udp_listening_socket(uint_fast16_t port)
   if (ret < 0)
     {
       perror("Cannot bind the UDP socket") ;
-      (void) close(sockfd) ;
+      close(sockfd) ;
       return ret ;
     }
 
diff --git a/owlps-aggregator/owlps-aggregatord.c b/owlps-aggregator/owlps-aggregatord.c
index d8e8a3b..9925f80 100644
--- a/owlps-aggregator/owlps-aggregatord.c
+++ b/owlps-aggregator/owlps-aggregatord.c
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
 
   /* Last cleaning tasks */
  exit:
-  (void) close(sockfd) ; // Close socket
+  close(sockfd) ; // Close socket
   free_request_list() ;
   free_ap_list() ;
   cfg_free(cfg) ; // Clean configuration
@@ -653,7 +653,7 @@ void* monitor_requests(void *NULL_value)
   /* Close output file & socket */
   if (fclose(fd) != 0)
     perror("Error closing output file") ;
-  (void) close(sockfd) ;
+  close(sockfd) ;
 
   pthread_exit(NULL_value) ;
 }
@@ -852,7 +852,7 @@ void* listen_for_aps(void *NULL_value)
       update_ap(message.ap_mac_addr_bytes, ap_ip_addr) ;
     }
 
-  (void) close(listen_sockfd) ;
+  close(listen_sockfd) ;
 
   pthread_exit(NULL_value) ;
 }
@@ -1091,7 +1091,7 @@ void order_send(ap_list *ap)
       exit(ERR_SENDING_INFO) ;
     }
 
-  (void) close(sockfd) ;
+  close(sockfd) ;
 }
 
 
diff --git a/owlps-client/owlps-client.c b/owlps-client/owlps-client.c
index 75426e3..8ef709b 100644
--- a/owlps-client/owlps-client.c
+++ b/owlps-client/owlps-client.c
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
   make_packet() ;
   send_request() ;
 
-  (void) close(sockfd) ;
+  close(sockfd) ;
 
   if (options.listening_port > 0)
     receive_position() ;
@@ -367,7 +367,7 @@ void receive_position()
   recvfrom(sockfd, &x, sizeof(float), 0, NULL, NULL) ;
   recvfrom(sockfd, &y, sizeof(float), 0, NULL, NULL) ;
   recvfrom(sockfd, &z, sizeof(float), 0, NULL, NULL) ;
-  (void) close(sockfd) ;
+  close(sockfd) ;
 
   printf("Computed position: (%.4f;%.4f;%.4f)\n", x, y, z) ;
 }
diff --git a/owlps-listener/owlps-listenerd.c b/owlps-listener/owlps-listenerd.c
index e9bddb2..032bc45 100644
--- a/owlps-listener/owlps-listenerd.c
+++ b/owlps-listener/owlps-listenerd.c
@@ -607,7 +607,7 @@ int capture()
     pcap_loop(handle, 1, read_packet, NULL) ;
 
   pcap_close(handle) ; // Stop capture
-  (void) close(aggregation_sockfd) ; // Close socket
+  close(aggregation_sockfd) ; // Close socket
 
   return 0 ;
 }
@@ -1053,7 +1053,7 @@ void* autocalibrate_hello(void *NULL_value)
       sleep(GET_AUTOCALIBRATION_HELLO_DELAY()) ;
     }
 
-  (void) close(send_sockfd) ;
+  close(send_sockfd) ;
 
   pthread_exit(NULL_value) ;
 }
@@ -1112,7 +1112,7 @@ void* autocalibrate(void *NULL_value)
                 "Autocalibration order unknown: %d.\n", message.order) ;
     }
 
-  (void) close(listen_sockfd) ;
+  close(listen_sockfd) ;
 
   pthread_exit(NULL_value) ;
 }