about summary refs log tree commit diff
path: root/elf/loadtest.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-07-12 18:26:36 +0000
committerJakub Jelinek <jakub@redhat.com>2007-07-12 18:26:36 +0000
commit0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (patch)
tree2ea1f8305970753e4a657acb2ccc15ca3eec8e2c /elf/loadtest.c
parent7d58530341304d403a6626d7f7a1913165fe2f32 (diff)
downloadglibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.gz
glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.xz
glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.zip
2.5-18.1
Diffstat (limited to 'elf/loadtest.c')
-rw-r--r--elf/loadtest.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/elf/loadtest.c b/elf/loadtest.c
index 6b8f4bb7d0..727469b496 100644
--- a/elf/loadtest.c
+++ b/elf/loadtest.c
@@ -70,11 +70,13 @@ static const struct
 
 #include <include/link.h>
 
+#define MAPS ((struct link_map *) _r_debug.r_map)
+
 #define OUT \
-  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\", opencount = %d\n",			      \
-	      map->l_name, (int) map->l_opencount);			      \
+      printf ("name = \"%s\", direct_opencount = %d\n",			      \
+	      map->l_name, (int) map->l_direct_opencount);		      \
   fflush (stdout)
 
 
@@ -147,7 +149,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,11 +182,11 @@ 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\", opencount = %d\n",
-		map->l_name, (int) map->l_opencount);
+	printf ("name = \"%s\", direct_opencount = %d\n",
+		map->l_name, (int) map->l_direct_opencount);
 	result = 1;
       }