diff options
Diffstat (limited to 'src/thread')
| -rw-r--r-- | src/thread/cancellation.c | 17 | ||||
| -rw-r--r-- | src/thread/pthread_create.c | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c index ab7eebcc..9b21764b 100644 --- a/src/thread/cancellation.c +++ b/src/thread/cancellation.c @@ -1,23 +1,20 @@ #include "pthread_impl.h" -void __do_cleanup_push(); -void __do_cleanup_pop(); +static void dummy(struct __ptcb *cb) +{ +} +weak_alias(dummy, __do_cleanup_push); +weak_alias(dummy, __do_cleanup_pop); void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x) { cb->__f = f; cb->__x = x; - __do_cleanup_push(cb, f, x); + __do_cleanup_push(cb); } void _pthread_cleanup_pop(struct __ptcb *cb, int run) { - __do_cleanup_pop(cb, run); + __do_cleanup_pop(cb); if (run) cb->__f(cb->__x); } - -static void dummy() -{ -} -weak_alias(dummy, __do_cleanup_push); -weak_alias(dummy, __do_cleanup_pop); diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 917be54f..ecf93a46 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -43,14 +43,14 @@ void pthread_exit(void *result) __syscall(SYS_exit, 0); } -void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x) +void __do_cleanup_push(struct __ptcb *cb) { struct pthread *self = pthread_self(); cb->__next = self->cancelbuf; self->cancelbuf = cb; } -void __do_cleanup_pop(struct __ptcb *cb, int run) +void __do_cleanup_pop(struct __ptcb *cb) { __pthread_self()->cancelbuf = cb->__next; } |