vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 29 13:54:19 2020 +0300| [5225280bd155ef7c6812b5e3d91742b3b6169737] | committer: Rémi Denis-Courmont
interrupt: use vlc_sendmsg() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5225280bd155ef7c6812b5e3d91742b3b6169737 --- src/misc/interrupt.c | 4 ++-- src/network/io.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c index 6512462ff2..2bd29b86b3 100644 --- a/src/misc/interrupt.c +++ b/src/misc/interrupt.c @@ -505,8 +505,8 @@ ssize_t vlc_sendmsg_i11e(int fd, const struct msghdr *msg, int flags) if (vlc_poll_i11e(&ufd, 1, -1) < 0) return -1; - /* NOTE: MSG_EOR, MSG_OOB and MSG_NOSIGNAL should all work fine here. */ - return sendmsg(fd, msg, flags); + /* NOTE: MSG_EOR and MSG_OOB should all work fine here. */ + return vlc_sendmsg(fd, msg, flags); } ssize_t vlc_sendto_i11e(int fd, const void *buf, size_t len, int flags, diff --git a/src/network/io.c b/src/network/io.c index 5c85b99798..8499a5dd37 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -421,7 +421,7 @@ ssize_t (net_Write)(vlc_object_t *obj, int fd, const void *buf, size_t len) return -1; } - ssize_t val = vlc_send_i11e (fd, buf, len, MSG_NOSIGNAL); + ssize_t val = vlc_send_i11e(fd, buf, len, 0); if (val == -1) { if (errno == EINTR || errno == EAGAIN) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
