From f55727ca53308a206cf00d0442f8c57c73761899 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 31 Aug 2000 02:27:07 +0000 Subject: Update. * sysdeps/generic/ldsodefs.h: Add declaration for _dl_all_dirs and _dl_all_init_dirs. * include/link.h (struct r_search_path_struct): New. (struct link_map): Use it for l_rpath_dirs and l_runpath_dirs. * elf/Versions [ld] (GLIBC_2.2): Add _dl_all_dirs and _dl_all_init_dirs. * elf/dl-close.c (_dl_close): Free l_rpath_dirs and l_runpath_dirs. * elf/dl-libc.c (free_mem): Free _dl_all_dirs list except elements added at startup time. * elf/dl-load.c: Fix memory handling. r_search_path_struct contains element to remember fact that we can free memory. (all_dirs): Renamed to _dl_all_dirs. Made global. (_dl_init_all_dirs): New variable. (fillin_rpath): Save one malloc call. (decompose_rpath): Change interface. New first parameter points to r_search_path_struct. (_dl_init_paths): Adjust for changes. Mark all memory as not deletable. Set _dl_init_all_paths value. (open_path): Remove may_free_dirs parameter. r_search_path_elem *** parameter replaced with r_search_path_struct *. Information about freeing now contained in r_search_path_struct. (_dl_map_object): Adjust for above changes. * elf/dl-open.c (dl_open_worker): Change format of debug info a bit. --- elf/dl-open.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'elf/dl-open.c') diff --git a/elf/dl-open.c b/elf/dl-open.c index a128b343d2..a618ca0470 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -166,11 +166,11 @@ dl_open_worker (void *a) buf[sizeof buf - 1] = '\0'; - _dl_debug_message (1, "\nopening file=", new->l_name, + _dl_debug_message (1, "opening file=", new->l_name, "; opencount == ", _itoa_word (new->l_opencount, buf + sizeof buf - 1, 10, 0), - "\n", NULL); + "\n\n", NULL); } /* It was already open. */ return; @@ -325,11 +325,11 @@ dl_open_worker (void *a) buf[sizeof buf - 1] = '\0'; - _dl_debug_message (1, "\nopening file=", new->l_name, + _dl_debug_message (1, "opening file=", new->l_name, "; opencount == ", _itoa_word (new->l_opencount, buf + sizeof buf - 1, 10, 0), - "\n", NULL); + "\n\n", NULL); } } -- cgit 1.4.1