* cygwait.cc (cygwait): Move setting res to WAIT_SIGNALED to clarify

when WAIT_SIGNALED is returned to the caller.
This commit is contained in:
Corinna Vinschen 2015-02-23 13:32:16 +00:00
parent f6ec73c018
commit b6e4adaaf1
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2015-02-23 Corinna Vinschen <corinna@vinschen.de>
* cygwait.cc (cygwait): Move setting res to WAIT_SIGNALED to clarify
when WAIT_SIGNALED is returned to the caller.
2015-02-23 Corinna Vinschen <corinna@vinschen.de>
* winsup.h (SIGTOMASK): Add cast to sigset_t to avoid int overflow.

View File

@ -1,6 +1,6 @@
/* cygwait.h
Copyright 2011, 2012, 2013 Red Hat, Inc.
Copyright 2011, 2012, 2013, 2015 Red Hat, Inc.
This file is part of Cygwin.
@ -87,9 +87,10 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask)
if (!sig)
continue;
if (is_cw_sig_eintr || (is_cw_sig_cont && sig == SIGCONT))
res = WAIT_SIGNALED; /* caller will deal with signals */
;
else if (_my_tls.call_signal_handler ())
continue;
res = WAIT_SIGNALED; /* caller will deal with signals */
}
break;
}