summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2018-08-20 09:15:27 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commit4fd2b00e22f1de3e2b187da090d9e33109269031 (patch)
tree0e789737e40014d93573c7625fb3033ecac51b25
parentae891c00cf40d39097656646966749265da6c5c9 (diff)
Prep v239: fd-util.[hc] - Masked fd_duplicate_data_fd() - Nowhere needed.
-rw-r--r--src/basic/fd-util.c4
-rw-r--r--src/basic/fd-util.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 1efd83b7f..122b59a68 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -13,7 +13,7 @@
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
-//#include "io-util.h"
+#include "io-util.h"
#include "macro.h"
#include "memfd-util.h"
#include "missing.h"
@@ -570,6 +570,7 @@ try_dev_shm_without_o_tmpfile:
/* If memfd/pipe didn't work out, then let's use a file in /tmp up to a size of 1M. If it's large than that use /var/tmp instead. */
#define DATA_FD_TMP_LIMIT (1024U*1024U)
+#if 0 /// UNNEEDED by elogind
int fd_duplicate_data_fd(int fd) {
_cleanup_close_ int copy_fd = -1, tmp_fd = -1;
@@ -758,6 +759,7 @@ finish:
return fd_reopen(tmp_fd, O_RDONLY|O_CLOEXEC);
}
+#endif // 0
int fd_move_above_stdio(int fd) {
int flags, copy;
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 834766c90..2e5616cb7 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -79,7 +79,9 @@ enum {
int acquire_data_fd(const void *data, size_t size, unsigned flags);
+#if 0 /// UNNEEDED by elogind
int fd_duplicate_data_fd(int fd);
+#endif // 0
/* Hint: ENETUNREACH happens if we try to connect to "non-existing" special IP addresses, such as ::5 */
#define ERRNO_IS_DISCONNECT(r) \