commit f449146ae3154d14150159f7f21cf9dbaf2ba6df
author Jacek Caban <jacek@codeweavers.com> Mon Oct 09 14:28:56 2017 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 09 19:53:59 2017 +0200
tree 8a189fde40ec90b9d27b6905e3a50acf49fc3633
parent c295dd6bda731553f835447c4049d79d11c43b5f

ntdll: Remove no longer needed handling of FD_TYPE_PIPE.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/ntdll/file.c

diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 35fd2c1..ca2afa0 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -711,7 +711,6 @@
         }
         break;
     case FD_TYPE_SOCKET:
-    case FD_TYPE_PIPE:
     case FD_TYPE_CHAR:
         if (is_read) timeouts->interval = 0;  /* return as soon as we got something */
         break;
@@ -764,7 +763,6 @@
         break;
     case FD_TYPE_MAILSLOT:
     case FD_TYPE_SOCKET:
-    case FD_TYPE_PIPE:
     case FD_TYPE_CHAR:
         *avail_mode = TRUE;
         break;
@@ -1128,7 +1126,7 @@
                                           &needs_close, &type, NULL )))
             break;
 
-        if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET))
+        if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET))
             result = send( fd, fileio->buffer, 0, 0 );
         else
             result = write( fd, &fileio->buffer[fileio->already], fileio->count - fileio->already );
@@ -1308,7 +1306,7 @@
     for (;;)
     {
         /* zero-length writes on sockets may not work with plain write(2) */
-        if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET))
+        if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET))
             result = send( unix_handle, buffer, 0, 0 );
         else
             result = write( unix_handle, (const char *)buffer + total, length - total );