From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 11 May 2007 21:34:32 +0000 (+0000)
Subject: (add_to_global): One more small cleanup patch.
X-Git-Tag: cvs/glibc-2_6~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b0d1c0236d5dc61f2e1574078e48ec0188e384a;p=thirdparty%2Fglibc.git

(add_to_global): One more small cleanup patch.
---

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 0df62ff51e4..583878781e2 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -137,7 +137,7 @@ add_to_global (struct link_map *new)
     }
 
   /* Now add the new entries.  */
-  unsigned int added = 0;
+  unsigned int new_nlist = ns->_ns_main_searchlist->r_nlist;
   for (cnt = 0; cnt < new->l_searchlist.r_nlist; ++cnt)
     {
       struct link_map *map = new->l_searchlist.r_list[cnt];
@@ -145,14 +145,11 @@ add_to_global (struct link_map *new)
       if (map->l_global == 0)
 	{
 	  map->l_global = 1;
-	  ns->_ns_main_searchlist->r_list[ns->_ns_main_searchlist->r_nlist
-					  + added]
-	    = map;
-	  ++added;
+	  ns->_ns_main_searchlist->r_list[new_nlist++] = map;
 	}
     }
   atomic_write_barrier ();
-  ns->_ns_main_searchlist->r_nlist += added;
+  ns->_ns_main_searchlist->r_nlist = new_nlist;
 
   return 0;
 }