From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Wed, 4 Oct 2017 12:28:38 +0000 (-0400)
Subject: lib: move fd-close-on-exec.[ch] code into fd-util.[ch]
X-Git-Tag: 2.3.0.rc1~884
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa26ad32932ab2ce1b7e3b2b121bb2df886f5736;p=thirdparty%2Fdovecot%2Fcore.git

lib: move fd-close-on-exec.[ch] code into fd-util.[ch]
---

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 036a383091..54e47da074 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -29,8 +29,8 @@ liblib_la_SOURCES = \
 	env-util.c \
 	execv-const.c \
 	failures.c \
-	fd-close-on-exec.c \
 	fd-set-nonblock.c \
+	fd-util.c \
 	fdatasync-path.c \
 	fdpass.c \
 	file-cache.c \
@@ -182,7 +182,6 @@ headers = \
 	env-util.h \
 	execv-const.h \
 	failures.h \
-	fd-close-on-exec.h \
 	fd-set-nonblock.h \
 	fd-util.h \
 	fdatasync-path.h \
diff --git a/src/lib/fd-close-on-exec.h b/src/lib/fd-close-on-exec.h
deleted file mode 100644
index 8d8b1d3e38..0000000000
--- a/src/lib/fd-close-on-exec.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef FD_CLOSE_ON_EXEC_H
-#define FD_CLOSE_ON_EXEC_H
-
-/* Change close-on-exec flag of fd. */
-void fd_close_on_exec(int fd, bool set);
-
-/* Verify that fds in given range don't exist. */
-void fd_debug_verify_leaks(int first_fd, int last_fd);
-
-#endif
diff --git a/src/lib/fd-close-on-exec.c b/src/lib/fd-util.c
similarity index 100%
rename from src/lib/fd-close-on-exec.c
rename to src/lib/fd-util.c
diff --git a/src/lib/fd-util.h b/src/lib/fd-util.h
index 2606fe9f56..d0a1255511 100644
--- a/src/lib/fd-util.h
+++ b/src/lib/fd-util.h
@@ -1,7 +1,12 @@
 #ifndef FD_UTIL_H
 #define FD_UTIL_H
 
-#include "fd-close-on-exec.h"
 #include "fd-set-nonblock.h"
 
+/* Change close-on-exec flag of fd. */
+void fd_close_on_exec(int fd, bool set);
+
+/* Verify that fds in given range don't exist. */
+void fd_debug_verify_leaks(int first_fd, int last_fd);
+
 #endif