Removes trailing spaces. Removes tabs.

[vlc] / src / network / io.c

diff --git a/src/network/io.c b/src/network/io.c
index 622150967c10ec794e7da0371588be78b6c0dec6..e83f985dafb53ff9f0c021d9f5c01e72d1d25bd1 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -211,6 +211,9 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
             case SOCK_STREAM:
             case SOCK_RDM:
             case SOCK_SEQPACKET:
+#ifdef SOCK_DCCP
+            case SOCK_DCCP:
+#endif
                 if (listen (fd, INT_MAX))
                 {
                     msg_Err (p_this, "socket listen error (%s)",
@@ -248,7 +251,7 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
 
     while (i_buflen > 0)
     {
-        if (p_this->b_die)
+        if( ( p_this->b_die ) || ( p_this->p_libvlc->b_die ) )
         {
 #if defined(WIN32) || defined(UNDER_CE)
             WSASetLastError (WSAEINTR);
@@ -602,8 +605,8 @@ const char *inet_ntop(int af, const void * src,
                 memset(&addr, 0, sizeof(addr));
                 addr.sin6_family = AF_INET6;
                 addr.sin6_addr = *((struct in6_addr*)src);
-                if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr, 
-                                             sizeof(struct sockaddr_in6), 
+                if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr,
+                                             sizeof(struct sockaddr_in6),
                                              NULL, dst, &cnt) )
                 {
                     dst[cnt] = '\0';