Fix printing of scope number

diff --git a/ChangeLog b/ChangeLog
index 4092e509ca3df71225ca5a7e90f9cad616aa8855..2830fad8ade950b3199f7319c345062dec49eeb8 100644 (file)
--- 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 c3e5fbaea7e3d7019017491b2dd8394443be1965..7c67f746f32151803444af062960c7ec21db5d09 100644 (file)
--- 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);