diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-06-09 02:19:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-06-09 02:19:12 +0000 |
| commit | 3c457089679373802fae6ef65a1804e1c9074b67 (patch) | |
| tree | 3a55b782e4e776b02e6c0b902270e0e3edb7b920 | |
| parent | e8b6b64d3c24ce1667af7b60c447d21b1968af01 (diff) | |
| download | glibc-3c457089679373802fae6ef65a1804e1c9074b67.tar.gz glibc-3c457089679373802fae6ef65a1804e1c9074b67.tar.xz glibc-3c457089679373802fae6ef65a1804e1c9074b67.zip | |
* elf/dl-lookup.c (_dl_lookup_symbol_x): Remove use of r_nlist.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 4abead59af..33b2696c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-06-08 Ulrich Drepper <drepper@redhat.com> + + * elf/dl-lookup.c (_dl_lookup_symbol_x): Remove use of r_nlist. + 2007-06-08 Jakub Jelinek <jakub@redhat.com> * elf/dl-close.c (_dl_close_worker): Remove all to be removed diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index a6a958419f..dc1b865bc7 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -244,13 +244,9 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, size_t i = 0; if (__builtin_expect (skip_map != NULL, 0)) - { - /* Search the relevant loaded objects for a definition. */ - while ((*scope)->r_list[i] != skip_map) - ++i; - - assert (i < (*scope)->r_nlist); - } + /* Search the relevant loaded objects for a definition. */ + while ((*scope)->r_list[i] != skip_map) + ++i; /* Search the relevant loaded objects for a definition. */ for (size_t start = i; *scope != NULL; start = 0, ++scope) |