From 818d729d8b60a682e267ac408c710f5851389d79 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 3 Mar 2015 17:07:52 +0100
Subject: system/fd_util: remove unused functions

---
 src/system/fd_util.c | 108 ---------------------------------------------------
 src/system/fd_util.h |  46 ----------------------
 2 files changed, 154 deletions(-)

(limited to 'src/system')

diff --git a/src/system/fd_util.c b/src/system/fd_util.c
index b6dd89674..440d5b142 100644
--- a/src/system/fd_util.c
+++ b/src/system/fd_util.c
@@ -105,16 +105,6 @@ fd_set_nonblock(int fd)
 #endif
 }
 
-int
-dup_cloexec(int oldfd)
-{
-	int newfd = dup(oldfd);
-	if (newfd >= 0)
-		fd_set_nonblock(newfd);
-
-	return newfd;
-}
-
 int
 open_cloexec(const char *path_fs, int flags, int mode)
 {
@@ -135,30 +125,6 @@ open_cloexec(const char *path_fs, int flags, int mode)
 	return fd;
 }
 
-int
-pipe_cloexec(int fd[2])
-{
-#ifdef WIN32
-	return _pipe(fd, 512, _O_BINARY);
-#else
-	int ret;
-
-#ifdef HAVE_PIPE2
-	ret = pipe2(fd, O_CLOEXEC);
-	if (ret >= 0 || errno != ENOSYS)
-		return ret;
-#endif
-
-	ret = pipe(fd);
-	if (ret >= 0) {
-		fd_set_cloexec(fd[0], true);
-		fd_set_cloexec(fd[1], true);
-	}
-
-	return ret;
-#endif
-}
-
 int
 pipe_cloexec_nonblock(int fd[2])
 {
@@ -186,53 +152,6 @@ pipe_cloexec_nonblock(int fd[2])
 #endif
 }
 
-#ifndef WIN32
-
-int
-socketpair_cloexec(int domain, int type, int protocol, int sv[2])
-{
-	int ret;
-
-#ifdef SOCK_CLOEXEC
-	ret = socketpair(domain, type | SOCK_CLOEXEC, protocol, sv);
-	if (ret >= 0 || errno != EINVAL)
-		return ret;
-#endif
-
-	ret = socketpair(domain, type, protocol, sv);
-	if (ret >= 0) {
-		fd_set_cloexec(sv[0], true);
-		fd_set_cloexec(sv[1], true);
-	}
-
-	return ret;
-}
-
-int
-socketpair_cloexec_nonblock(int domain, int type, int protocol, int sv[2])
-{
-	int ret;
-
-#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
-	ret = socketpair(domain, type | SOCK_CLOEXEC | SOCK_NONBLOCK, protocol,
-			 sv);
-	if (ret >= 0 || errno != EINVAL)
-		return ret;
-#endif
-
-	ret = socketpair(domain, type, protocol, sv);
-	if (ret >= 0) {
-		fd_set_cloexec(sv[0], true);
-		fd_set_nonblock(sv[0]);
-		fd_set_cloexec(sv[1], true);
-		fd_set_nonblock(sv[1]);
-	}
-
-	return ret;
-}
-
-#endif
-
 int
 socket_cloexec_nonblock(int domain, int type, int protocol)
 {
@@ -281,33 +200,6 @@ accept_cloexec_nonblock(int fd, struct sockaddr *address,
 	return ret;
 }
 
-#ifndef WIN32
-
-ssize_t
-recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags)
-{
-#ifdef MSG_CMSG_CLOEXEC
-	flags |= MSG_CMSG_CLOEXEC;
-#endif
-
-	ssize_t result = recvmsg(sockfd, msg, flags);
-	if (result >= 0) {
-		struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);
-		while (cmsg != NULL) {
-			if (cmsg->cmsg_type == SCM_RIGHTS) {
-				const int *fd_p = (const int *)CMSG_DATA(cmsg);
-				fd_set_cloexec(*fd_p, true);
-			}
-
-			cmsg = CMSG_NXTHDR(msg, cmsg);
-		}
-	}
-
-	return result;
-}
-
-#endif
-
 #ifdef HAVE_INOTIFY_INIT
 
 int
diff --git a/src/system/fd_util.h b/src/system/fd_util.h
index 5b95cbc4f..02e959a8e 100644
--- a/src/system/fd_util.h
+++ b/src/system/fd_util.h
@@ -54,13 +54,6 @@ extern "C" {
 int
 fd_set_cloexec(int fd, bool enable);
 
-/**
- * Wrapper for dup(), which sets the CLOEXEC flag on the new
- * descriptor.
- */
-int
-dup_cloexec(int oldfd);
-
 /**
  * Wrapper for open(), which sets the CLOEXEC flag (atomically if
  * supported by the OS).
@@ -68,13 +61,6 @@ dup_cloexec(int oldfd);
 int
 open_cloexec(const char *path_fs, int flags, int mode);
 
-/**
- * Wrapper for pipe(), which sets the CLOEXEC flag (atomically if
- * supported by the OS).
- */
-int
-pipe_cloexec(int fd[2]);
-
 /**
  * Wrapper for pipe(), which sets the CLOEXEC flag (atomically if
  * supported by the OS).
@@ -85,24 +71,6 @@ pipe_cloexec(int fd[2]);
 int
 pipe_cloexec_nonblock(int fd[2]);
 
-#ifndef WIN32
-
-/**
- * Wrapper for socketpair(), which sets the CLOEXEC flag (atomically
- * if supported by the OS).
- */
-int
-socketpair_cloexec(int domain, int type, int protocol, int sv[2]);
-
-/**
- * Wrapper for socketpair(), which sets the flags CLOEXEC and NONBLOCK
- * (atomically if supported by the OS).
- */
-int
-socketpair_cloexec_nonblock(int domain, int type, int protocol, int sv[2]);
-
-#endif
-
 #ifdef ENABLE_LIBMPDCLIENT
 /* Avoid symbol conflict with statically linked libmpdclient */
 #define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict
@@ -123,20 +91,6 @@ int
 accept_cloexec_nonblock(int fd, struct sockaddr *address,
 			size_t *address_length_r);
 
-
-#ifndef WIN32
-
-struct msghdr;
-
-/**
- * Wrapper for recvmsg(), which sets the CLOEXEC flag (atomically if
- * supported by the OS).
- */
-ssize_t
-recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags);
-
-#endif
-
 #ifdef HAVE_INOTIFY_INIT
 
 /**
-- 
cgit v1.2.3