diff options
Diffstat (limited to 'ldso/libdl')
-rw-r--r-- | ldso/libdl/libdl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 4538d91e7..edf336684 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -199,7 +199,7 @@ void *dlopen(const char *libname, int flag) _dl_debug_bindings = strstr(_dl_debug, "bind"); } } -# endif +# endif #endif _dl_map_cache(); @@ -221,7 +221,7 @@ void *dlopen(const char *libname, int flag) tfrom = tpnt; } } - for(rpnt = _dl_symbol_tables; rpnt && rpnt->next; rpnt=rpnt->next); + for (rpnt = _dl_symbol_tables; rpnt && rpnt->next; rpnt=rpnt->next); relro_ptr = rpnt; now_flag = (flag & RTLD_NOW) ? RTLD_NOW : 0; @@ -231,8 +231,8 @@ void *dlopen(const char *libname, int flag) #ifndef SHARED /* When statically linked, the _dl_library_path is not yet initialized */ _dl_library_path = getenv("LD_LIBRARY_PATH"); -#endif - +#endif + /* Try to load the specified library */ _dl_if_debug_print("Trying to dlopen '%s', RTLD_GLOBAL:%d RTLD_NOW:%d\n", (char*)libname, (flag & RTLD_GLOBAL ? 1:0), (now_flag & RTLD_NOW ? 1:0)); @@ -257,7 +257,7 @@ void *dlopen(const char *libname, int flag) if (handle->dyn == tpnt) { dyn_chain->init_fini.init_fini = handle->init_fini.init_fini; dyn_chain->init_fini.nlist = handle->init_fini.nlist; - for(i=0; i < dyn_chain->init_fini.nlist; i++) + for (i = 0; i < dyn_chain->init_fini.nlist; i++) dyn_chain->init_fini.init_fini[i]->rtld_flags |= (flag & RTLD_GLOBAL); dyn_chain->next = handle->next; break; @@ -327,7 +327,7 @@ void *dlopen(const char *libname, int flag) i = 0; for (runp2 = dep_list; runp2; runp2 = runp2->next) { init_fini_list[i++] = runp2->tpnt; - for(runp = runp2->tpnt->init_fini; runp; runp = runp->next){ + for (runp = runp2->tpnt->init_fini; runp; runp = runp->next) { if (!(runp->tpnt->rtld_flags & RTLD_GLOBAL)) { tmp = malloc(sizeof(struct init_fini_list)); tmp->tpnt = runp->tpnt; @@ -359,9 +359,9 @@ void *dlopen(const char *libname, int flag) } } #ifdef __SUPPORT_LD_DEBUG__ - if(_dl_debug) { + if (_dl_debug) { fprintf(stderr, "\nINIT/FINI order and dependencies:\n"); - for (i=0;i < nlist;i++) { + for (i = 0; i < nlist; i++) { fprintf(stderr, "lib: %s has deps:\n", init_fini_list[i]->libname); runp = init_fini_list[i]->init_fini; for (; runp; runp = runp->next) @@ -588,7 +588,7 @@ static int do_dlclose(void *vhandle, int need_fini) end = ppnt->p_vaddr + ppnt->p_memsz; } DL_LIB_UNMAP (tpnt, end); - /* Free elements in RTLD_LOCAL scope list */ + /* Free elements in RTLD_LOCAL scope list */ for (runp = tpnt->rtld_local; runp; runp = tmp) { tmp = runp->next; free(runp); |