Use class to manage BFD reference counts

[deliverable/binutils-gdb.git] / gdb / build-id.c

diff --git a/gdb/build-id.c b/gdb/build-id.c
index c89cd55c262ab9bbc10f282b36b811a08f0fb9d3..0f632238776e747bb7a141b0c2aed942c3aefe8f 100644 (file)
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -1,6 +1,6 @@
 /* build-id-related functions.
 
-   Copyright (C) 1991-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -67,18 +67,21 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
 
 /* See build-id.h.  */
 
-bfd *
+gdb_bfd_ref_ptr
 build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
 {
   char *link, *debugdir;
   VEC (char_ptr) *debugdir_vec;
   struct cleanup *back_to;
   int ix;
-  bfd *abfd = NULL;
+  gdb_bfd_ref_ptr abfd;
+  int alloc_len;
 
   /* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
-  link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
-                + 2 * build_id_len + (sizeof ".debug" - 1) + 1);
+  alloc_len = (strlen (debug_file_directory)
+              + (sizeof "/.build-id/" - 1) + 1
+              + 2 * build_id_len + (sizeof ".debug" - 1) + 1);
+  link = (char *) alloca (alloc_len);
 
   /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
      cause "/.build-id/..." lookups.  */
@@ -124,11 +127,10 @@ build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
       if (abfd == NULL)
        continue;
 
-      if (build_id_verify (abfd, build_id_len, build_id))
+      if (build_id_verify (abfd.get(), build_id_len, build_id))
        break;
 
-      gdb_bfd_unref (abfd);
-      abfd = NULL;
+      abfd.release ();
     }
 
   do_cleanups (back_to);
@@ -145,25 +147,16 @@ find_separate_debug_file_by_buildid (struct objfile *objfile)
   build_id = build_id_bfd_get (objfile->obfd);
   if (build_id != NULL)
     {
-      bfd *abfd;
-
-      abfd = build_id_to_debug_bfd (build_id->size, build_id->data);
+      gdb_bfd_ref_ptr abfd (build_id_to_debug_bfd (build_id->size,
+                                                  build_id->data));
       /* Prevent looping on a stripped .debug file.  */
       if (abfd != NULL
-         && filename_cmp (bfd_get_filename (abfd),
+         && filename_cmp (bfd_get_filename (abfd.get ()),
                           objfile_name (objfile)) == 0)
-        {
-         warning (_("\"%s\": separate debug info file has no debug info"),
-                  bfd_get_filename (abfd));
-         gdb_bfd_unref (abfd);
-       }
+       warning (_("\"%s\": separate debug info file has no debug info"),
+                bfd_get_filename (abfd.get ()));
       else if (abfd != NULL)
-       {
-         char *result = xstrdup (bfd_get_filename (abfd));
-
-         gdb_bfd_unref (abfd);
-         return result;
-       }
+       return xstrdup (bfd_get_filename (abfd.get ()));
     }
   return NULL;
 }