src/rtld/dl-open.c: Change to work with older compilers

2016-08-17 Mark Hatle <[email protected]> * src/rtld/dl-open.c: Change to work with older compilers Signed-off-by: Mark Hatle <[email protected]>
mhatle · Aug 17, 2016 · e09997c · e09997c
1 parent 33be255
commit e09997c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2016-08-17   Mark Hatle <[email protected]>
+	* src/rtld/dl-open.c: Change to work with older compilers
+
 2016-06-03   Dave Lerner <[email protected]>
 	* src/exec.c: New check_reorder_needed, section_reorder_fix functions
 

diff --git a/src/rtld/ChangeLog b/src/rtld/ChangeLog
@@ -1,3 +1,6 @@
+2016-08-17   Mark Hatle <[email protected]>
+        * dl-open.c: Change function to work with older compilers
+
 2016-03-18   Donn Seeley <[email protected]>
 	* rtld.c: rewrite build_local_scope to ensure breadth-first
 		processing

diff --git a/src/rtld/dl-open.c b/src/rtld/dl-open.c
@@ -25,12 +25,14 @@ _dl_show_scope (struct link_map *l, int from)
 {
   _dl_debug_printf ("object=%s [%lu]\n",
 		    DSO_FILENAME (l->l_name), 0UL);
-  if (l->l_local_scope != NULL)
-    for (int scope_cnt = from; l->l_local_scope[scope_cnt] != NULL; ++scope_cnt)
+  if (l->l_local_scope != NULL) {
+    int scope_cnt;
+    for (scope_cnt = from; l->l_local_scope[scope_cnt] != NULL; ++scope_cnt)
       {
 	_dl_debug_printf (" scope %u:", scope_cnt);
 
-	for (unsigned int cnt = 0; cnt < l->l_local_scope[scope_cnt]->r_nlist; ++cnt)
+	unsigned int cnt;
+	for (cnt = 0; cnt < l->l_local_scope[scope_cnt]->r_nlist; ++cnt)
 	  if (*l->l_local_scope[scope_cnt]->r_list[cnt]->l_name)
 	    _dl_debug_printf_c (" %s",
 				l->l_local_scope[scope_cnt]->r_list[cnt]->l_name);
@@ -39,6 +41,7 @@ _dl_show_scope (struct link_map *l, int from)
 
 	_dl_debug_printf_c ("\n");
       }
+    }
   else
     _dl_debug_printf (" no scope\n");
   _dl_debug_printf ("\n");