aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2021-11-11 10:22:41 -0500
committerTakashi Yano <takashi.yano@nifty.ne.jp>2021-12-12 22:11:06 +0900
commitd9c1aeaddf51a25ba357685dca7b1247b577b07e (patch)
tree37aa9f1b85cb844fa46ba65402f814233f2adb7d
parent9e4d308cd592fe383dec58ea6523c1b436888ef8 (diff)
downloadnewlib-d9c1aeaddf51a25ba357685dca7b1247b577b07e.zip
newlib-d9c1aeaddf51a25ba357685dca7b1247b577b07e.tar.gz
newlib-d9c1aeaddf51a25ba357685dca7b1247b577b07e.tar.bz2
Cygwin: fhandler_pipe::raw_read: minor code cleanup
Remove references to STATUS_THREAD_SIGNALED and STATUS_THREAD_CANCELED, which can't occur any more.
-rw-r--r--winsup/cygwin/fhandler_pipe.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 40fb234..ba6b70f 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -332,10 +332,7 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
set_errno (EBADF);
nbytes = (size_t) -1;
}
- else if (NT_SUCCESS (status)
- || status == STATUS_BUFFER_OVERFLOW
- || status == STATUS_THREAD_CANCELED
- || status == STATUS_THREAD_SIGNALED)
+ else if (NT_SUCCESS (status) || status == STATUS_BUFFER_OVERFLOW)
{
nbytes_now = io.Information;
ptr = ((char *) ptr) + nbytes_now;
@@ -384,13 +381,6 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
break;
}
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;
}