Rename some functions, index -> gdb_index

Since we now have two index formats, DWARF5/debug_names and gdb_index, I
wanted to rename some functions to make it clear that they deal with the
gdb_index format specifically.

gdb/ChangeLog:

	* dwarf2read.c (read_index_from_section): Rename to...
	(read_gdb_index_from_section): ... this, update all callers.
	(dwarf2_read_index): Rename to...
	(dwarf2_read_gdb_index): ... this, update all callers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd2007175224cb6dac0bac9cc08d6e0302d161fe..4179665c2ed2d28e358a4e7cdb6f505f1ce19d6d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-11  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * dwarf2read.c (read_index_from_section): Rename to...
+       (read_gdb_index_from_section): ... this, update all callers.
+       (dwarf2_read_index): Rename to...
+       (dwarf2_read_gdb_index): ... this, update all callers.
+
 2018-06-11  John David Anglin  <danglin@gcc.gnu.org>
 
        * gdb/hppa-linux-nat.c

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 81e1cfb909fcbf17c2b3e7a5becf3153dc64401d..4ad05274064d8f33d8bfe9fec4ed315b98decbcd 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3415,15 +3415,15 @@ find_slot_in_mapped_hash (struct mapped_index *index, const char *name,
    Returns 1 if all went well, 0 otherwise.  */
 
 static bool
-read_index_from_section (struct objfile *objfile,
-                        const char *filename,
-                        bool deprecated_ok,
-                        struct dwarf2_section_info *section,
-                        struct mapped_index *map,
-                        const gdb_byte **cu_list,
-                        offset_type *cu_list_elements,
-                        const gdb_byte **types_list,
-                        offset_type *types_list_elements)
+read_gdb_index_from_section (struct objfile *objfile,
+                            const char *filename,
+                            bool deprecated_ok,
+                            struct dwarf2_section_info *section,
+                            struct mapped_index *map,
+                            const gdb_byte **cu_list,
+                            offset_type *cu_list_elements,
+                            const gdb_byte **types_list,
+                            offset_type *types_list_elements)
 {
   const gdb_byte *addr;
   offset_type version;
@@ -3532,7 +3532,7 @@ to use the section anyway."),
    elements of all the CUs and return 1.  Otherwise, return 0.  */
 
 static int
-dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile)
+dwarf2_read_gdb_index (struct dwarf2_per_objfile *dwarf2_per_objfile)
 {
   const gdb_byte *cu_list, *types_list, *dwz_list = NULL;
   offset_type cu_list_elements, types_list_elements, dwz_list_elements = 0;
@@ -3540,11 +3540,11 @@ dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile)
   struct objfile *objfile = dwarf2_per_objfile->objfile;
 
   std::unique_ptr<struct mapped_index> map (new struct mapped_index);
-  if (!read_index_from_section (objfile, objfile_name (objfile),
-                               use_deprecated_index_sections,
-                               &dwarf2_per_objfile->gdb_index, map.get (),
-                               &cu_list, &cu_list_elements,
-                               &types_list, &types_list_elements))
+  if (!read_gdb_index_from_section (objfile, objfile_name (objfile),
+                                   use_deprecated_index_sections,
+                                   &dwarf2_per_objfile->gdb_index, map.get (),
+                                   &cu_list, &cu_list_elements,
+                                   &types_list, &types_list_elements))
     return 0;
 
   /* Don't use the index if it's empty.  */
@@ -3560,12 +3560,12 @@ dwarf2_read_index (struct dwarf2_per_objfile *dwarf2_per_objfile)
       const gdb_byte *dwz_types_ignore;
       offset_type dwz_types_elements_ignore;
 
-      if (!read_index_from_section (objfile, bfd_get_filename (dwz->dwz_bfd),
-                                   1,
-                                   &dwz->gdb_index, &dwz_map,
-                                   &dwz_list, &dwz_list_elements,
-                                   &dwz_types_ignore,
-                                   &dwz_types_elements_ignore))
+      if (!read_gdb_index_from_section (objfile,
+                                       bfd_get_filename (dwz->dwz_bfd), 1,
+                                       &dwz->gdb_index, &dwz_map,
+                                       &dwz_list, &dwz_list_elements,
+                                       &dwz_types_ignore,
+                                       &dwz_types_elements_ignore))
        {
          warning (_("could not read '.gdb_index' section from %s; skipping"),
                   bfd_get_filename (dwz->dwz_bfd));
@@ -6198,7 +6198,7 @@ dwarf2_initialize_objfile (struct objfile *objfile, dw_index_kind *index_kind)
       return true;
     }
 
-  if (dwarf2_read_index (dwarf2_per_objfile))
+  if (dwarf2_read_gdb_index (dwarf2_per_objfile))
     {
       *index_kind = dw_index_kind::GDB_INDEX;
       return true;