* dwarf2read.c (read_comp_unit, sibling_die, dump_die,

dump_die_list, store_in_ref_table, follow_die_ref): Make these
static; they're private functions.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 710c7bcc85760af7d97fe9609b711a139a69b72d..28aa211d2142cf63febb119586b9514e8d2f1f2a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-02  Jim Blandy  <jimb@redhat.com>
+
+       * dwarf2read.c (read_comp_unit, sibling_die, dump_die,
+       dump_die_list, store_in_ref_table, follow_die_ref): Make these
+       static; they're private functions.
+
 2001-07-01  Mark Elbrecht <snowball@bigfoot.com>
 
        * coffread.c (coff_symfile_read): Parse DWARF2 info if present.
@@ -94,7 +100,6 @@
        * coff-solib.c: Include symfile.h and objfiles.h to make
        OBJF_SHARED visible.
 
->>>>>>> 1.1391
 2001-06-28  Andrew Cagney  <ac131313@redhat.com>
 
        * configure.in (--enable-gdbmi): Enable by default.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 3d9902c799994738fc8c6fc387a767cec5ccf6c6..07e15005e136019e4b1000021bcca57a5dd7df35 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -727,7 +727,8 @@ static void read_tag_string_type (struct die_info *, struct objfile *);
 static void read_subroutine_type (struct die_info *, struct objfile *,
                                  const struct comp_unit_head *);
 
-struct die_info *read_comp_unit (char *, bfd *, const struct comp_unit_head *);
+static struct die_info *read_comp_unit (char *, bfd *,
+                                        const struct comp_unit_head *);
 
 static void free_die_list (struct die_info *);
 
@@ -756,19 +757,19 @@ static char *dwarf_cfi_name (unsigned int);
 struct die_info *copy_die (struct die_info *);
 #endif
 
-struct die_info *sibling_die (struct die_info *);
+static struct die_info *sibling_die (struct die_info *);
 
-void dump_die (struct die_info *);
+static void dump_die (struct die_info *);
 
-void dump_die_list (struct die_info *);
+static void dump_die_list (struct die_info *);
 
-void store_in_ref_table (unsigned int, struct die_info *);
+static void store_in_ref_table (unsigned int, struct die_info *);
 
 static void dwarf2_empty_hash_tables (void);
 
 static unsigned int dwarf2_get_ref_die_offset (struct attribute *);
 
-struct die_info *follow_die_ref (unsigned int);
+static struct die_info *follow_die_ref (unsigned int);
 
 static struct type *dwarf2_fundamental_type (struct objfile *, int);
 
@@ -2899,7 +2900,7 @@ read_base_type (struct die_info *die, struct objfile *objfile)
 
 /* Read a whole compilation unit into a linked list of dies.  */
 
-struct die_info *
+static struct die_info *
 read_comp_unit (char *info_ptr, bfd *abfd,
                const struct comp_unit_head *cu_header)
 {
@@ -4716,7 +4717,7 @@ copy_die (struct die_info *old_die)
 
 /* Return sibling of die, NULL if no sibling.  */
 
-struct die_info *
+static struct die_info *
 sibling_die (struct die_info *die)
 {
   int nesting_level = 0;
@@ -5502,7 +5503,7 @@ dwarf_cfi_name (register unsigned cfi_opc)
 }
 #endif
 
-void
+static void
 dump_die (struct die_info *die)
 {
   unsigned int i;
@@ -5564,7 +5565,7 @@ dump_die (struct die_info *die)
     }
 }
 
-void
+static void
 dump_die_list (struct die_info *die)
 {
   while (die)
@@ -5574,7 +5575,7 @@ dump_die_list (struct die_info *die)
     }
 }
 
-void
+static void
 store_in_ref_table (unsigned int offset, struct die_info *die)
 {
   int h;
@@ -5616,7 +5617,7 @@ dwarf2_get_ref_die_offset (struct attribute *attr)
   return result;
 }
 
-struct die_info *
+static struct die_info *
 follow_die_ref (unsigned int offset)
 {
   struct die_info *die;