aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2013-02-07 13:53:46 -0500
committerCarlos O'Donell <carlos@redhat.com>2013-02-08 12:55:34 -0500
commitb2d3c3befb45ae4e5284274d9ce75ca462119239 (patch)
tree61da25699dbed7fac25830d74bb6de6fb7685e1c
parentddacd1db6a83551dd56792f2f9867452f5ac2c13 (diff)
downloadglibc-b2d3c3befb45ae4e5284274d9ce75ca462119239.zip
glibc-b2d3c3befb45ae4e5284274d9ce75ca462119239.tar.gz
glibc-b2d3c3befb45ae4e5284274d9ce75ca462119239.tar.bz2
Add more comments to _dl_load_cache_lookup().
Calling _dl_load_cache_lookup will load the cache if not already. If loading the cache fails no more attempts will be made to load the cache.
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-cache.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fd23d3..ab411fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-02-08 Carlos O'Donell <carlos@redhat.com>
+ * elf/dl-cache.c (_dl_load_cache_lookup): Comment that cache is
+ loaded if not already and that a failure is permanent.
+
+2013-02-08 Carlos O'Donell <carlos@redhat.com>
+
[BZ #15006]
* sysdeps/generic/ldconfig.h: Define FLAG_ARM_LIBSF.
* elf/cache.c (print_entry): Add FLAG_ARM_LIBSF support.
diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index 2c4bcc6..030fdca 100644
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -172,8 +172,9 @@ _dl_cache_libcmp (const char *p1, const char *p2)
}
-/* Look up NAME in ld.so.cache and return the file name stored there,
- or null if none is found. */
+/* Look up NAME in ld.so.cache and return the file name stored there, or null
+ if none is found. The cache is loaded if it was not already. If loading
+ the cache previously failed there will be no more attempts to load it. */
const char *
internal_function