From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 6 Oct 2017 05:58:16 +0000 (+0300)
Subject: global: Use i_close_fd instead of close
X-Git-Tag: 2.3.0.rc1~853
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c31803dcbdf3d4e3b836134a2a04ee2cd5251ce5;p=thirdparty%2Fdovecot%2Fcore.git

global: Use i_close_fd instead of close

Some were missed, found by coverity
---

diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
index 0a47a902fb..3c9d0f285d 100644
--- a/src/lib-program-client/test-program-client-net.c
+++ b/src/lib-program-client/test-program-client-net.c
@@ -90,7 +90,7 @@ void test_program_client_destroy(struct test_client **_client)
 	i_stream_unref(&client->in);
 	o_stream_unref(&client->os_body);
 	i_stream_unref(&client->body);
-	close(client->fd);
+	i_close_fd(&client->fd);
 	pool_unref(&client->pool);
 	test_globals.client = NULL;
 	test_program_io_loop_stop();
diff --git a/src/lib/test-iostream-proxy.c b/src/lib/test-iostream-proxy.c
index 59d70b5c16..c2666b43e3 100644
--- a/src/lib/test-iostream-proxy.c
+++ b/src/lib/test-iostream-proxy.c
@@ -96,10 +96,10 @@ void test_iostream_proxy_simple(void)
 	i_stream_unref(&right_in);
 
 	/* close fd */
-	close(sfdl[0]);
-	close(sfdl[1]);
-	close(sfdr[0]);
-	close(sfdr[1]);
+	i_close_fd(&sfdl[0]);
+	i_close_fd(&sfdl[1]);
+	i_close_fd(&sfdr[0]);
+	i_close_fd(&sfdr[1]);
 
 	test_end();
 }
diff --git a/src/master/sd-daemon.c b/src/master/sd-daemon.c
index 6d1eebff07..012a8f7f27 100644
--- a/src/master/sd-daemon.c
+++ b/src/master/sd-daemon.c
@@ -387,7 +387,7 @@ finish:
                 unsetenv("NOTIFY_SOCKET");
 
         if (fd >= 0)
-                close(fd);
+		(void)close(fd);
 
         return r;
 #endif
diff --git a/src/plugins/fts-squat/squat-test.c b/src/plugins/fts-squat/squat-test.c
index 8d9545754e..8447e19125 100644
--- a/src/plugins/fts-squat/squat-test.c
+++ b/src/plugins/fts-squat/squat-test.c
@@ -169,7 +169,7 @@ int main(int argc ATTR_UNUSED, char *argv[])
 		(float)input->v_offset * 100.0);
 
 	i_stream_unref(&input);
-	close(fd);
+	i_close_fd(&fd);
 
 	i_array_init(&definite_uids, 128);
 	i_array_init(&maybe_uids, 128);