X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fexit%2Fatexit.c;h=2b58b8bbf7416ad378f0068553417f9c50ff9c3f;hb=4cd8b4725907651f329e2f96d428c4e3521643f8;hp=c31f3dc35261ff6ddc73d9325463c86f117ec926;hpb=a749ba3adc2f3b4abfc68b21d4c3741b20c8f657;p=musl

diff --git a/src/exit/atexit.c b/src/exit/atexit.c
index c31f3dc3..2b58b8bb 100644
--- a/src/exit/atexit.c
+++ b/src/exit/atexit.c
@@ -1,7 +1,5 @@
-#include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <limits.h>
 #include "libc.h"
 
 /* Ensure that at least 32 atexit handlers can be registered without malloc */
@@ -14,18 +12,16 @@ static struct fl
 	void *a[COUNT];
 } builtin, *head;
 
-static int lock[2];
+static int slot;
+static volatile int lock[2];
 
 void __funcs_on_exit()
 {
-	int i;
 	void (*func)(void *), *arg;
 	LOCK(lock);
-	for (; head; head=head->next) for (i=COUNT-1; i>=0; i--) {
-		if (!head->f[i]) continue;
-		func = head->f[i];
-		arg = head->a[i];
-		head->f[i] = 0;
+	for (; head; head=head->next, slot=COUNT) while(slot-->0) {
+		func = head->f[slot];
+		arg = head->a[slot];
 		UNLOCK(lock);
 		func(arg);
 		LOCK(lock);
@@ -38,15 +34,13 @@ void __cxa_finalize(void *dso)
 
 int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
 {
-	int i;
-
 	LOCK(lock);
 
 	/* Defer initialization of head so it can be in BSS */
 	if (!head) head = &builtin;
 
 	/* If the current function list is full, add a new one */
-	if (head->f[COUNT-1]) {
+	if (slot==COUNT) {
 		struct fl *new_fl = calloc(sizeof(struct fl), 1);
 		if (!new_fl) {
 			UNLOCK(lock);
@@ -54,12 +48,13 @@ int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
 		}
 		new_fl->next = head;
 		head = new_fl;
+		slot = 0;
 	}
 
 	/* Append function to the list. */
-	for (i=0; i<COUNT && head->f[i]; i++);
-	head->f[i] = func;
-	head->a[i] = arg;
+	head->f[slot] = func;
+	head->a[slot] = arg;
+	slot++;
 
 	UNLOCK(lock);
 	return 0;