diff options
| -rw-r--r-- | src/thread/pthread_create.c | 15 | ||||
| -rw-r--r-- | src/thread/pthread_setcancelstate.c | 6 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index acbd5a41..a7826504 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -63,19 +63,8 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx) static void cancelpt(int x) { struct pthread *self = __pthread_self(); - switch (x) { - case 1: - self->cancelpoint++; - case 0: - if (self->cancel && self->cancelpoint==1 && !self->canceldisable) - docancel(self); - break; - case -1: - self->cancelpoint--; - break; - default: - self->canceldisable += x; - } + if ((self->cancelpoint+=x)==1 && self->cancel + && x<2U && !self->canceldisable) docancel(self); } static void init_threads() diff --git a/src/thread/pthread_setcancelstate.c b/src/thread/pthread_setcancelstate.c index a85cc800..aa0ddcdd 100644 --- a/src/thread/pthread_setcancelstate.c +++ b/src/thread/pthread_setcancelstate.c @@ -3,8 +3,8 @@ int pthread_setcancelstate(int new, int *old) { struct pthread *self = pthread_self(); - if (old) *old = self->canceldisable & 1; - if ((unsigned)new > 1) return EINVAL; - self->canceldisable = (self->canceldisable & ~1) | new; + if (old) *old = self->canceldisable; + if (new > 1U) return EINVAL; + self->canceldisable = new; return 0; } |