elf: Do not duplicate the GLIBC_TUNABLES string

[platform/upstream/glibc.git] / elf / loadtest.c

diff --git a/elf/loadtest.c b/elf/loadtest.c
index ee106ea..b5eab5e 100644 (file)
--- a/elf/loadtest.c
+++ b/elf/loadtest.c
@@ -70,12 +70,18 @@ static const struct
 
 #include <include/link.h>
 
-#define OUT \
-  for (map = _r_debug.r_map; map != NULL; map = map->l_next)                 \
-    if (map->l_type == lt_loaded)                                            \
-      printf ("name = \"%s\", direct_opencount = %d\n",                              \
-             map->l_name, (int) map->l_direct_opencount);                    \
-  fflush (stdout)
+#define MAPS ((struct link_map *) _r_debug.r_map)
+
+#define OUT                                                    \
+  do                                                           \
+    {                                                          \
+      for (map = MAPS; map != NULL; map = map->l_next)         \
+       if (map->l_type == lt_loaded)                           \
+         printf ("name = \"%s\", direct_opencount = %d\n",     \
+                 map->l_name, (int) map->l_direct_opencount);  \
+      fflush (stdout);                                         \
+    }                                                          \
+  while (0)
 
 
 int
@@ -147,7 +153,7 @@ main (int argc, char *argv[])
            {
              /* In this case none of the objects above should be
                 present.  */
-             for (map = _r_debug.r_map; map != NULL; map = map->l_next)
+             for (map = MAPS; map != NULL; map = map->l_next)
                if (map->l_type == lt_loaded
                    && (strstr (map->l_name, testobjs[0].name) != NULL
                        || strstr (map->l_name, testobjs[1].name) != NULL
@@ -180,7 +186,7 @@ main (int argc, char *argv[])
       }
 
   /* Check whether all files are unloaded.  */
-  for (map = _r_debug.r_map; map != NULL; map = map->l_next)
+  for (map = MAPS; map != NULL; map = map->l_next)
     if (map->l_type == lt_loaded)
       {
        printf ("name = \"%s\", direct_opencount = %d\n",