projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up and fix logic for making mmap fail on invalid/unsupported offsets
[musl]
/
src
/
exit
/
atexit.c
diff --git
a/src/exit/atexit.c
b/src/exit/atexit.c
index
9d9c2fb
..
c31f3dc
100644
(file)
--- a/
src/exit/atexit.c
+++ b/
src/exit/atexit.c
@@
-14,22
+14,21
@@
static struct fl
void *a[COUNT];
} builtin, *head;
void *a[COUNT];
} builtin, *head;
-static int lock;
+static int lock
[2]
;
void __funcs_on_exit()
{
int i;
void (*func)(void *), *arg;
void __funcs_on_exit()
{
int i;
void (*func)(void *), *arg;
- LOCK(&lock);
- for (; head; head=head->next) {
- for (i=COUNT-1; i>=0 && !head->f[i]; i--);
- if (i<0) continue;
+ 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;
func = head->f[i];
arg = head->a[i];
head->f[i] = 0;
- UNLOCK(
&
lock);
+ UNLOCK(lock);
func(arg);
func(arg);
- LOCK(
&
lock);
+ LOCK(lock);
}
}
}
}
@@
-41,7
+40,7
@@
int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
{
int i;
{
int i;
- LOCK(
&
lock);
+ LOCK(lock);
/* Defer initialization of head so it can be in BSS */
if (!head) head = &builtin;
/* Defer initialization of head so it can be in BSS */
if (!head) head = &builtin;
@@
-50,7
+49,7
@@
int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
if (head->f[COUNT-1]) {
struct fl *new_fl = calloc(sizeof(struct fl), 1);
if (!new_fl) {
if (head->f[COUNT-1]) {
struct fl *new_fl = calloc(sizeof(struct fl), 1);
if (!new_fl) {
- UNLOCK(
&
lock);
+ UNLOCK(lock);
return -1;
}
new_fl->next = head;
return -1;
}
new_fl->next = head;
@@
-62,7
+61,7
@@
int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
head->f[i] = func;
head->a[i] = arg;
head->f[i] = func;
head->a[i] = arg;
- UNLOCK(
&
lock);
+ UNLOCK(lock);
return 0;
}
return 0;
}