diff options
Diffstat (limited to 'elf/loadtest.c')
| -rw-r--r-- | elf/loadtest.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/elf/loadtest.c b/elf/loadtest.c index 727469b496..6b8f4bb7d0 100644 --- a/elf/loadtest.c +++ b/elf/loadtest.c @@ -70,13 +70,11 @@ static const struct #include <include/link.h> -#define MAPS ((struct link_map *) _r_debug.r_map) - #define OUT \ - for (map = MAPS; map != NULL; map = map->l_next) \ + 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); \ + printf ("name = \"%s\", opencount = %d\n", \ + map->l_name, (int) map->l_opencount); \ fflush (stdout) @@ -149,7 +147,7 @@ main (int argc, char *argv[]) { /* In this case none of the objects above should be present. */ - for (map = MAPS; map != NULL; map = map->l_next) + for (map = _r_debug.r_map; 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 @@ -182,11 +180,11 @@ main (int argc, char *argv[]) } /* Check whether all files are unloaded. */ - for (map = MAPS; map != NULL; map = map->l_next) + 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); + printf ("name = \"%s\", opencount = %d\n", + map->l_name, (int) map->l_opencount); result = 1; } |