--- pth_cancel.c 2002/01/27 11:03:40 1.25
+++ pth_cancel.c 2002/10/24 15:21:13 1.26
@@ -56,15 +56,15 @@
pth_pqueue_t *q;
if (thread == NULL)
- return_errno(FALSE, EINVAL);
+ return pth_error(FALSE, EINVAL);
/* the current thread cannot be cancelled */
if (thread == pth_current)
- return_errno(FALSE, EINVAL);
+ return pth_error(FALSE, EINVAL);
/* the thread has to be at least still alive */
if (thread->state == PTH_STATE_DEAD)
- return_errno(FALSE, EPERM);
+ return pth_error(FALSE, EPERM);
/* now mark the thread as cancelled */
thread->cancelreq = TRUE;
@@ -81,9 +81,9 @@
default: q = NULL;
}
if (q == NULL)
- return_errno(FALSE, ESRCH);
+ return pth_error(FALSE, ESRCH);
if (!pth_pqueue_contains(q, thread))
- return_errno(FALSE, ESRCH);
+ return pth_error(FALSE, ESRCH);
pth_pqueue_delete(q, thread);
/* execute cleanups */
@@ -108,11 +108,11 @@
int pth_abort(pth_t thread)
{
if (thread == NULL)
- return_errno(FALSE, EINVAL);
+ return pth_error(FALSE, EINVAL);
/* the current thread cannot be aborted */
if (thread == pth_current)
- return_errno(FALSE, EINVAL);
+ return pth_error(FALSE, EINVAL);
if (thread->state == PTH_STATE_DEAD && thread->joinable) {
/* if thread is already terminated, just join it */
|
