* dwarf2read.c (try_open_dwo_file): Use gdb_bfd_ref and

[deliverable/binutils-gdb.git] / gdb / symfile.c

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 01252e2964ec667ce21eea1cd77b0a8806e01339..2ad72c5b1e493994a87c677acc8fce057ee04b6e 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -55,6 +55,7 @@
 #include "solib.h"
 #include "remote.h"
 #include "stack.h"
+#include "gdb_bfd.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -1372,7 +1373,7 @@ separate_debug_file_exists (const char *name, unsigned long crc,
       if (abfd_stat.st_dev == parent_stat.st_dev
          && abfd_stat.st_ino == parent_stat.st_ino)
        {
-         bfd_close (abfd);
+         gdb_bfd_unref (abfd);
          return 0;
        }
       verified_as_different = 1;
@@ -1382,7 +1383,7 @@ separate_debug_file_exists (const char *name, unsigned long crc,
 
   file_crc_p = get_file_crc (abfd, &file_crc);
 
-  bfd_close (abfd);
+  gdb_bfd_unref (abfd);
 
   if (!file_crc_p)
     return 0;
@@ -1690,15 +1691,16 @@ set_initial_language (void)
 }
 
 /* If NAME is a remote name open the file using remote protocol, otherwise
-   open it normally.  */
+   open it normally.  Returns a new reference to the BFD.  On error,
+   returns NULL with the BFD error set.  */
 
 bfd *
 bfd_open_maybe_remote (const char *name)
 {
   if (remote_filename_p (name))
-    return remote_bfd_open (name, gnutarget);
+    return gdb_bfd_ref (remote_bfd_open (name, gnutarget));
   else
-    return bfd_openr (name, gnutarget);
+    return gdb_bfd_ref (bfd_openr (name, gnutarget));
 }
 
 
@@ -1717,7 +1719,7 @@ symfile_bfd_open (char *name)
   if (remote_filename_p (name))
     {
       name = xstrdup (name);
-      sym_bfd = remote_bfd_open (name, gnutarget);
+      sym_bfd = gdb_bfd_ref (remote_bfd_open (name, gnutarget));
       if (!sym_bfd)
        {
          make_cleanup (xfree, name);
@@ -1727,7 +1729,7 @@ symfile_bfd_open (char *name)
 
       if (!bfd_check_format (sym_bfd, bfd_object))
        {
-         bfd_close (sym_bfd);
+         gdb_bfd_unref (sym_bfd);
          make_cleanup (xfree, name);
          error (_("`%s': can't read symbols: %s."), name,
                 bfd_errmsg (bfd_get_error ()));
@@ -1762,7 +1764,7 @@ symfile_bfd_open (char *name)
   xfree (name);
   name = absolute_name;
 
-  sym_bfd = bfd_fopen (name, gnutarget, FOPEN_RB, desc);
+  sym_bfd = gdb_bfd_ref (bfd_fopen (name, gnutarget, FOPEN_RB, desc));
   if (!sym_bfd)
     {
       make_cleanup (xfree, name);
@@ -1773,18 +1775,12 @@ symfile_bfd_open (char *name)
 
   if (!bfd_check_format (sym_bfd, bfd_object))
     {
-      /* FIXME: should be checking for errors from bfd_close (for one
-         thing, on error it does not free all the storage associated
-         with the bfd).  */
-      bfd_close (sym_bfd);     /* This also closes desc.  */
+      make_cleanup_bfd_close (sym_bfd);
       make_cleanup (xfree, name);
       error (_("`%s': can't read symbols: %s."), name,
             bfd_errmsg (bfd_get_error ()));
     }
 
-  /* bfd_usrdata exists for applications and libbfd must not touch it.  */
-  gdb_assert (bfd_usrdata (sym_bfd) == NULL);
-
   return sym_bfd;
 }
 
@@ -2109,16 +2105,13 @@ generic_load (char *args, int from_tty)
     }
 
   /* Open the file for loading.  */
-  loadfile_bfd = bfd_openr (filename, gnutarget);
+  loadfile_bfd = gdb_bfd_ref (bfd_openr (filename, gnutarget));
   if (loadfile_bfd == NULL)
     {
       perror_with_name (filename);
       return;
     }
 
-  /* FIXME: should be checking for errors from bfd_close (for one thing,
-     on error it does not free all the storage associated with the
-     bfd).  */
   make_cleanup_bfd_close (loadfile_bfd);
 
   if (!bfd_check_format (loadfile_bfd, bfd_object))
@@ -2519,14 +2512,10 @@ reread_symbols (void)
             to close the descriptor but BFD lacks a way of closing the
             BFD without closing the descriptor.  */
          obfd_filename = bfd_get_filename (objfile->obfd);
-         if (!bfd_close (objfile->obfd))
-           error (_("Can't close BFD for %s: %s"), objfile->name,
-                  bfd_errmsg (bfd_get_error ()));
+         gdb_bfd_unref (objfile->obfd);
          objfile->obfd = bfd_open_maybe_remote (obfd_filename);
          if (objfile->obfd == NULL)
            error (_("Can't open %s to read symbols."), objfile->name);
-         else
-           objfile->obfd = gdb_bfd_ref (objfile->obfd);
          /* bfd_openr sets cacheable to true, which is what we want.  */
          if (!bfd_check_format (objfile->obfd, bfd_object))
            error (_("Can't read symbols from %s: %s."), objfile->name,