[vlc-commits] network/io.c: minor fix

[Frédéric Yhuel]

vlc/vlc-2.0 | branch: master | Frédéric Yhuel <fyhuel at viotech.net> | Wed Apr  4 14:11:58 2012 +0200| [d6b589b131c993b96bdb17bd5d41cb36637a76e9] | committer: Jean-Baptiste Kempf

network/io.c: minor fix

Unlike POLLERR, POLLHUP, and POLLNVAL, POLLRDHUP is not set by default.
See http://man7.org/linux/man-pages/man2/poll.2.html

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit c0e768b8fd8e6405a3864db3b2358c1ccd89a476)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d6b589b131c993b96bdb17bd5d41cb36637a76e9
---

 src/network/io.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/network/io.c b/src/network/io.c
index b4b4196..90ceffe 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -259,9 +259,12 @@ ssize_t
 net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
           void *restrict p_buf, size_t i_buflen, bool waitall)
 {
+#ifndef POLLRDHUP /* This is nice but non-portable */
+# define POLLRDHUP 0
+#endif
     size_t i_total = 0;
     struct pollfd ufd[2] = {
-        { .fd = fd,                           .events = POLLIN },
+        { .fd = fd,                           .events = POLLIN|POLLRDHUP },
         { .fd = vlc_object_waitpipe (p_this), .events = POLLIN },
     };
 
@@ -279,9 +282,6 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
             continue;
         }
 
-#ifndef POLLRDHUP /* This is nice but non-portable */
-# define POLLRDHUP 0
-#endif
         if (i_total > 0)
         {
             /* Errors (-1) and EOF (0) will be returned on next call,