X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fcancellation.c;h=9b21764b56b0bea71300b30dedaf950248135112;hp=967705a910a4213b48be5f3ab79e2816cb501c93;hb=7669d1e334e6b96455eece78da43bf830b93d697;hpb=afc35d5efde48b82a7786d9c89b115965da6b637

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index 967705a9..9b21764b 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,20 +1,20 @@
 #include "pthread_impl.h"
 
-void __do_cleanup_push();
-void __do_cleanup_pop();
-
-void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
+static void dummy(struct __ptcb *cb)
 {
-	__do_cleanup_push(cb, f, x);
 }
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);
 
-void _pthread_cleanup_pop(struct __ptcb *cb, int run)
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
-	__do_cleanup_pop(cb, run);
+	cb->__f = f;
+	cb->__x = x;
+	__do_cleanup_push(cb);
 }
 
-static void dummy()
+void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
+	__do_cleanup_pop(cb);
+	if (run) cb->__f(cb->__x);
 }
-weak_alias(dummy, __do_cleanup_push);
-weak_alias(dummy, __do_cleanup_pop);