oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

system/fd_util: remove unused functions

Browse Source
This commit is contained in:
Max Kellermann 2015-03-03 17:07:52 +01:00
parent dd5daa0767
commit 818d729d8b
2 changed files with 0 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/system/fd_util.c
View File

@ -105,16 +105,6 @@ fd_set_nonblock(int fd)
#endif #endif
} }
int
dup_cloexec(int oldfd)
{
int newfd = dup(oldfd);
if (newfd >= 0)
fd_set_nonblock(newfd);
return newfd;
}
int int
open_cloexec(const char *path_fs, int flags, int mode) 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; 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 int
pipe_cloexec_nonblock(int fd[2]) pipe_cloexec_nonblock(int fd[2])
{ {
@ -186,53 +152,6 @@ pipe_cloexec_nonblock(int fd[2])
#endif #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 int
socket_cloexec_nonblock(int domain, int type, int protocol) socket_cloexec_nonblock(int domain, int type, int protocol)
{ {
@ -281,33 +200,6 @@ accept_cloexec_nonblock(int fd, struct sockaddr *address,
return ret; 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 #ifdef HAVE_INOTIFY_INIT
int int

46
src/system/fd_util.h
View File

@ -54,13 +54,6 @@ extern "C" {
int int
fd_set_cloexec(int fd, bool enable); 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 * Wrapper for open(), which sets the CLOEXEC flag (atomically if
* supported by the OS). * supported by the OS).
@ -68,13 +61,6 @@ dup_cloexec(int oldfd);
int int
open_cloexec(const char *path_fs, int flags, int mode); 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 * Wrapper for pipe(), which sets the CLOEXEC flag (atomically if
* supported by the OS). * supported by the OS).
@ -85,24 +71,6 @@ pipe_cloexec(int fd[2]);
int int
pipe_cloexec_nonblock(int fd[2]); 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 #ifdef ENABLE_LIBMPDCLIENT
/* Avoid symbol conflict with statically linked libmpdclient */ /* Avoid symbol conflict with statically linked libmpdclient */
#define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict #define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict
@ -123,20 +91,6 @@ int
accept_cloexec_nonblock(int fd, struct sockaddr *address, accept_cloexec_nonblock(int fd, struct sockaddr *address,
size_t *address_length_r); 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 #ifdef HAVE_INOTIFY_INIT
/** /**