Replace EVUTIL_CLOSESOCKET macro with a function

The EVUTIL_CLOSESOCKET() macro required you to include unistd.h in your
source for POSIX.  We might as well turn it into a function: an extra
function call is going to be cheap in comparison with the system call.

We retain the EVUTIL_CLOSESOCKET() macro as an alias for the new
evutil_closesocket() function.

(commit message from email by Nick and Sebastian)

12 files changed, 27 insertions, 27 deletions

diff --git a/test/regress.c b/test/regress.c
index 5ad1342e..513c3c87 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -2088,7 +2088,7 @@ end:
 		if (ev[i])
 			event_free(ev[i]);
 		if (sock[i] >= 0)
-			EVUTIL_CLOSESOCKET(sock[i]);
+			evutil_closesocket(sock[i]);
 	}
 #undef MANY
 }
diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 89495915..291eee6e 100644
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -639,8 +639,8 @@ test_evbuffer_add_file(void *ptr)
 
 	evbuffer_validate(src);
  end:
-	EVUTIL_CLOSESOCKET(pair[0]);
-	EVUTIL_CLOSESOCKET(pair[1]);
+	evutil_closesocket(pair[0]);
+	evutil_closesocket(pair[1]);
 	evbuffer_free(src);
 }
 #endif
diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c
index 49ec004b..ec9c0512 100644
--- a/test/regress_bufferevent.c
+++ b/test/regress_bufferevent.c
@@ -541,7 +541,7 @@ close_socket_cb(evutil_socket_t fd, short what, void *arg)
 {
 	evutil_socket_t *fdp = arg;
 	if (*fdp >= 0) {
-		EVUTIL_CLOSESOCKET(*fdp);
+		evutil_closesocket(*fdp);
 		*fdp = -1;
 	}
 }
@@ -603,7 +603,7 @@ test_bufferevent_connect_fail(void *arg)
 
 end:
 	if (fake_listener >= 0)
-		EVUTIL_CLOSESOCKET(fake_listener);
+		evutil_closesocket(fake_listener);
 
 	if (bev)
 		bufferevent_free(bev);
diff --git a/test/regress_dns.c b/test/regress_dns.c
index 2ffd94b8..4098ee3e 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -425,7 +425,7 @@ end:
 	if (port)
 		evdns_close_server_port(port);
 	if (sock >= 0)
-		EVUTIL_CLOSESOCKET(sock);
+		evutil_closesocket(sock);
 	if (base)
 		evdns_base_free(base, 0);
 }
@@ -1020,7 +1020,7 @@ end:
 	if (listener)
 		evconnlistener_free(listener);
 	if (server_fd>=0)
-		EVUTIL_CLOSESOCKET(server_fd);
+		evutil_closesocket(server_fd);
 	if (port)
 		evdns_close_server_port(port);
 	if (dns)
diff --git a/test/regress_et.c b/test/regress_et.c
index ba932564..98f3dcf2 100644
--- a/test/regress_et.c
+++ b/test/regress_et.c
@@ -145,8 +145,8 @@ test_edgetriggered(void *et)
 	}
 	if (base)
 		event_base_free(base);
-	EVUTIL_CLOSESOCKET(pair[0]);
-	EVUTIL_CLOSESOCKET(pair[1]);
+	evutil_closesocket(pair[0]);
+	evutil_closesocket(pair[1]);
 }
 
 struct testcase_t edgetriggered_testcases[] = {
diff --git a/test/regress_http.c b/test/regress_http.c
index e2c8078e..dd176c5c 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -364,7 +364,7 @@ http_basic_test(void)
 
 	/* connect to the second port */
 	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	fd = http_connect("127.0.0.1", port + 1);
 
@@ -383,7 +383,7 @@ http_basic_test(void)
 	event_dispatch();
 
 	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	evhttp_free(http);
 
@@ -529,7 +529,7 @@ http_bad_request_test(void)
 	event_dispatch();
 
 	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	if (test_ok != 0) {
 		fprintf(stdout, "FAILED\n");
@@ -636,7 +636,7 @@ http_delete_test(void)
 	event_dispatch();
 
 	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	evhttp_free(http);
 
@@ -1463,7 +1463,7 @@ http_failure_test(void)
 	event_dispatch();
 
 	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	evhttp_free(http);
 
@@ -1693,7 +1693,7 @@ http_base_test(void)
 	event_base_dispatch(base);
 
 	bufferevent_free(bev);
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	evhttp_free(http);
 
@@ -1776,7 +1776,7 @@ _http_incomplete_test(int use_timeout)
 
 	bufferevent_free(bev);
 	if (use_timeout) {
-		EVUTIL_CLOSESOCKET(fd);
+		evutil_closesocket(fd);
 	}
 
 	evhttp_free(http);
@@ -2387,7 +2387,7 @@ http_multi_line_header_test(void)
 	if (bev)
 		bufferevent_free(bev);
 	if (fd >= 0)
-		EVUTIL_CLOSESOCKET(fd);
+		evutil_closesocket(fd);
 	if (http)
 		evhttp_free(http);
 }
@@ -2584,7 +2584,7 @@ terminate_chunked_client(evutil_socket_t fd, short event, void *arg)
 {
 	struct terminate_state *state = arg;
 	bufferevent_free(state->bev);
-	EVUTIL_CLOSESOCKET(state->fd);
+	evutil_closesocket(state->fd);
 }
 
 static void
@@ -2639,7 +2639,7 @@ http_terminate_chunked_test(void)
 
  end:
 	if (fd >= 0)
-		EVUTIL_CLOSESOCKET(fd);
+		evutil_closesocket(fd);
 	if (http)
 		evhttp_free(http);
 }
diff --git a/test/regress_listener.c b/test/regress_listener.c
index b2e61468..5a097030 100644
--- a/test/regress_listener.c
+++ b/test/regress_listener.c
@@ -55,7 +55,7 @@ acceptcb(struct evconnlistener *listener, evutil_socket_t fd,
 	int *ptr = arg;
 	--*ptr;
 	TT_BLATHER(("Got one for %p", ptr));
-	EVUTIL_CLOSESOCKET(fd);
+	evutil_closesocket(fd);
 
 	if (! *ptr)
 		evconnlistener_disable(listener);
diff --git a/test/regress_main.c b/test/regress_main.c
index 48da6273..f9544b6c 100644
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -221,9 +221,9 @@ basic_test_cleanup(const struct testcase_t *testcase, void *ptr)
 
 	if (testcase->flags & TT_NEED_SOCKETPAIR) {
 		if (data->pair[0] != -1)
-			EVUTIL_CLOSESOCKET(data->pair[0]);
+			evutil_closesocket(data->pair[0]);
 		if (data->pair[1] != -1)
-			EVUTIL_CLOSESOCKET(data->pair[1]);
+			evutil_closesocket(data->pair[1]);
 	}
 
 	if (testcase->flags & TT_NEED_DNS) {
diff --git a/test/regress_testutils.c b/test/regress_testutils.c
index 1dd0fcdf..bb174833 100644
--- a/test/regress_testutils.c
+++ b/test/regress_testutils.c
@@ -129,7 +129,7 @@ regress_clean_dnsserver(void)
 	if (dns_port)
 		evdns_close_server_port(dns_port);
 	if (dns_sock >= 0)
-		EVUTIL_CLOSESOCKET(dns_sock);
+		evutil_closesocket(dns_sock);
 }
 
 void
diff --git a/test/regress_util.c b/test/regress_util.c
index 0455145b..9b30d564 100644
--- a/test/regress_util.c
+++ b/test/regress_util.c
@@ -488,7 +488,7 @@ end:
 	if (logmsg)
 		free(logmsg);
 	if (fd >= 0)
-		EVUTIL_CLOSESOCKET(fd);
+		evutil_closesocket(fd);
 }
 
 static void
diff --git a/test/regress_zlib.c b/test/regress_zlib.c
index a301eaf3..5ef78ea9 100644
--- a/test/regress_zlib.c
+++ b/test/regress_zlib.c
@@ -313,7 +313,7 @@ end:
 		bufferevent_free(bev2);
 
 	if (pair[0] >= 0)
-		EVUTIL_CLOSESOCKET(pair[0]);
+		evutil_closesocket(pair[0]);
 	if (pair[1] >= 0)
-		EVUTIL_CLOSESOCKET(pair[1]);
+		evutil_closesocket(pair[1]);
 }
diff --git a/test/test-weof.c b/test/test-weof.c
index f0da92b7..e5ff99d2 100644
--- a/test/test-weof.c
+++ b/test/test-weof.c
@@ -51,7 +51,7 @@ write_cb(evutil_socket_t fd, short event, void *arg)
 	if (len > 0) {
 		if (!called)
 			event_add(arg, NULL);
-		EVUTIL_CLOSESOCKET(pair[0]);
+		evutil_closesocket(pair[0]);
 	} else if (called == 1)
 		test_okay = 0;