>From 3c29dc0d9bdb2e4d5f735d7b3d272d92cb82d2c6 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sun, 29 Nov 2015 16:24:17 +0000 Subject: [PATCH 1/2] cleaner init/fini array handling Avoid casts and make sure there is a prototype when init/fini functions are called. --- src/env/__libc_start_main.c | 6 +++--- src/exit/exit.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/env/__libc_start_main.c b/src/env/__libc_start_main.c index 5c79be2..14a2825 100644 --- a/src/env/__libc_start_main.c +++ b/src/env/__libc_start_main.c @@ -55,10 +55,10 @@ void __init_libc(char **envp, char *pn) static void libc_start_init(void) { + void (*const *f)(void); _init(); - uintptr_t a = (uintptr_t)&__init_array_start; - for (; a<(uintptr_t)&__init_array_end; a+=sizeof(void(*)())) - (*(void (**)())a)(); + for (f=&__init_array_start; f<&__init_array_end; f++) + (*f)(); } weak_alias(libc_start_init, __libc_start_init); diff --git a/src/exit/exit.c b/src/exit/exit.c index bf7835a..b0603b4 100644 --- a/src/exit/exit.c +++ b/src/exit/exit.c @@ -17,9 +17,9 @@ extern void (*const __fini_array_start)(void), (*const __fini_array_end)(void); static void libc_exit_fini(void) { - uintptr_t a = (uintptr_t)&__fini_array_end; - for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)())) - (*(void (**)())(a-sizeof(void(*)())))(); + void (*const *f)(void) = &__fini_array_end; + while (f > &__fini_array_start) + (*--f)(); _fini(); } -- 2.4.1