drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: fhandler_pipe::raw_read: minor code cleanup 

Remove references to STATUS_THREAD_SIGNALED and
STATUS_THREAD_CANCELED, which can't occur any more.
This commit is contained in:
Ken Brown 2021-11-11 10:22:41 -05:00 committed by Takashi Yano
parent 9e4d308cd5
commit d9c1aeaddf
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/fhandler_pipe.cc
View File

@ -332,10 +332,7 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
set_errno (EBADF); set_errno (EBADF);
nbytes = (size_t) -1; nbytes = (size_t) -1;
} }
else if (NT_SUCCESS (status) else if (NT_SUCCESS (status) || status == STATUS_BUFFER_OVERFLOW)
|| status == STATUS_BUFFER_OVERFLOW
|| status == STATUS_THREAD_CANCELED
|| status == STATUS_THREAD_SIGNALED)
{ {
nbytes_now = io.Information; nbytes_now = io.Information;
ptr = ((char *) ptr) + nbytes_now; ptr = ((char *) ptr) + nbytes_now;
@ -384,13 +381,6 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
break; break;
} }
ReleaseMutex (read_mtx); ReleaseMutex (read_mtx);
if (status == STATUS_THREAD_SIGNALED && nbytes == 0)
{
set_errno (EINTR);
nbytes = (size_t) -1;
}
else if (status == STATUS_THREAD_CANCELED)
pthread::static_cancel_self ();
len = nbytes; len = nbytes;
} }