Fix memory leak in watch_main_source_file_lossage.

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

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 81bbf24584dde42f8bee076e6fa38c1c80e289b3..38a365ca678c8e48bc92b2427af72096245c9ddd 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -33,12 +33,10 @@
 #include "expression.h"
 #include "parser-defs.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "gdb_obstack.h"
-#include <string.h>
 #include "hashtab.h"
 
 #include "breakpoint.h"
@@ -368,8 +366,9 @@ allocate_objfile (bfd *abfd, const char *name, int flags)
 }
 
 /* Retrieve the gdbarch associated with OBJFILE.  */
+
 struct gdbarch *
-get_objfile_arch (struct objfile *objfile)
+get_objfile_arch (const struct objfile *objfile)
 {
   return objfile->per_bfd->gdbarch;
 }
@@ -746,7 +745,7 @@ objfile_relocate1 (struct objfile *objfile,
     ALL_OBJFILE_SYMTABS (objfile, s)
     {
       struct linetable *l;
-      struct blockvector *bv;
+      const struct blockvector *bv;
       int i;
 
       /* First the line table.  */
@@ -1454,14 +1453,14 @@ is_addr_in_objfile (CORE_ADDR addr, const struct objfile *objfile)
 }
 
 int
-userloaded_objfile_contains_address_p (struct program_space *pspace,
-                                      CORE_ADDR address)
+shared_objfile_contains_address_p (struct program_space *pspace,
+                                  CORE_ADDR address)
 {
   struct objfile *objfile;
 
   ALL_PSPACE_OBJFILES (pspace, objfile)
     {
-      if ((objfile->flags & OBJF_USERLOADED) != 0
+      if ((objfile->flags & OBJF_SHARED) != 0
          && is_addr_in_objfile (address, objfile))
        return 1;
     }