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 036a3830919145c7ef1865de3e623b8c6ba8000f..54e47da074709646e08ae44119fd26ef82dbb089 100644 (file)
--- 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 (file)
index 8d8b1d3..0000000
--- 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 2606fe9f56ecea2e9d4f3b1fc35c068be084cbff..d0a12555110ca89587d426cd42a2494b5513f5b7 100644 (file)
--- 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