aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-08-16 11:17:15 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-16 11:17:15 -0400
commit076fe0152b23f51b6493064ba7bb5ed965aee311 (patch)
treed20280bac3d34ace2134af5911d00d8cd6df1202
parentf3ed22607e8bf724b697c16876dbb76bb2418db6 (diff)
downloadglibc-076fe0152b23f51b6493064ba7bb5ed965aee311.zip
glibc-076fe0152b23f51b6493064ba7bb5ed965aee311.tar.gz
glibc-076fe0152b23f51b6493064ba7bb5ed965aee311.tar.bz2
Fix printing of scope number
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-open.c9
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4092e50..2830fad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-16 Ulrich Drepper <drepper@gmail.com>
+
+ * elf/dl-open.c (_dl_show_scope): Use _dl_debug_printf to generate the
+ string for the scope number.
+
2011-08-14 Ulrich Drepper <drepper@gmail.com>
* nscd/servicescache.c (cache_addserv): Make sure written is always
diff --git a/elf/dl-open.c b/elf/dl-open.c
index c3e5fba..7c67f74 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -641,14 +641,9 @@ _dl_show_scope (struct link_map *l)
if (l->l_scope != NULL)
for (int scope_cnt = 0; l->l_scope[scope_cnt] != NULL; ++scope_cnt)
{
- char numbuf[2];
- unsigned int cnt;
+ _dl_debug_printf (" scope %lu:", scope_cnt);
- numbuf[0] = '0' + scope_cnt;
- numbuf[1] = '\0';
- _dl_debug_printf (" scope %s:", numbuf);
-
- for (cnt = 0; cnt < l->l_scope[scope_cnt]->r_nlist; ++cnt)
+ for (unsigned int cnt = 0; cnt < l->l_scope[scope_cnt]->r_nlist; ++cnt)
if (*l->l_scope[scope_cnt]->r_list[cnt]->l_name)
_dl_debug_printf_c (" %s",
l->l_scope[scope_cnt]->r_list[cnt]->l_name);