From 9f191108c13b407b2996beedc28d61f58310e862 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 29 Mar 1994 20:00:09 +0000 Subject: [PATCH] * nm.c (display_archive): Close each archive element after it has been displayed. --- binutils/ChangeLog | 5 +++++ binutils/nm.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index e165dfd..4749557 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 29 14:59:04 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * nm.c (display_archive): Close each archive element after it has + been displayed. + Mon Mar 28 13:04:08 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) * configure.in: Change error message to refer to bfd/config.bfd diff --git a/binutils/nm.c b/binutils/nm.c index 6580e7b..8aca314 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -271,6 +271,7 @@ main (argc, argv) int retval; program_name = *argv; + xmalloc_set_program_name (program_name); bfd_init (); @@ -381,7 +382,7 @@ display_archive (file) if (arfile == NULL) { - if (bfd_error != no_more_archived_files) + if (bfd_get_error () != bfd_error_no_more_archived_files) bfd_fatal (bfd_get_filename (file)); break; } @@ -395,12 +396,14 @@ display_archive (file) else { bfd_nonfatal (bfd_get_filename (arfile)); - if (bfd_error == file_ambiguously_recognized) + if (bfd_get_error () == bfd_error_file_ambiguously_recognized) { list_matching_formats (matching); free (matching); } } + + bfd_close (arfile); } } @@ -431,7 +434,7 @@ display_file (filename) else { bfd_nonfatal (filename); - if (bfd_error == file_ambiguously_recognized) + if (bfd_get_error () == bfd_error_file_ambiguously_recognized) { list_matching_formats (matching); free (matching); -- 2.7.4