From: Tom Tromey <tom@tromey.com>
Date: Mon, 26 Jan 2026 17:54:08 +0000 (-0700)
Subject: Minor cleanups in expanded-symbol.[ch]
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f28ea4fa32e4faa019584e97a8d988551bd1958a;p=thirdparty%2Fbinutils-gdb.git

Minor cleanups in expanded-symbol.[ch]

I found a typo in expanded-symbol.h, then noticed some formatting
mistakes and some other incorrect comments.  This patch fixes all
these and removes some 'struct' keywords as well.

I'm checking this in as obvious.
---

diff --git a/gdb/expanded-symbol.c b/gdb/expanded-symbol.c
index 2fa601ca85a..050608795f9 100644
--- a/gdb/expanded-symbol.c
+++ b/gdb/expanded-symbol.c
@@ -23,10 +23,10 @@
 #include "source.h"
 #include "expanded-symbol.h"
 
-/* See readnow-symbols.h.  */
+/* See expanded-symbol.h.  */
 
-struct symtab *
-expanded_symbols_functions::find_last_source_symtab (struct objfile *objfile)
+symtab *
+expanded_symbols_functions::find_last_source_symtab (objfile *objfile)
 {
   if (objfile->compunit_symtabs.empty ())
     return nullptr;
@@ -34,28 +34,29 @@ expanded_symbols_functions::find_last_source_symtab (struct objfile *objfile)
     return objfile->compunit_symtabs.back ().primary_filetab ();
 }
 
-/* See readnow-symbols.h.  */
+/* See expanded-symbol.h.  */
 
 enum language
-expanded_symbols_functions::lookup_global_symbol_language (
-  struct objfile *objfile, const char *name, domain_search_flags domain,
-  bool *symbol_found_p)
+expanded_symbols_functions::lookup_global_symbol_language
+     (objfile *objfile, const char *name, domain_search_flags domain,
+      bool *symbol_found_p)
 {
   *symbol_found_p = false;
   return language_unknown;
 }
 
-/* See readnow-symbols.h.  */
+/* See expanded-symbol.h.  */
 
 bool
-expanded_symbols_functions::search (struct objfile *objfile,
-			   search_symtabs_file_matcher file_matcher,
-			   const lookup_name_info *lookup_name,
-			   search_symtabs_symbol_matcher symbol_matcher,
-			   search_symtabs_expansion_listener listener,
-			   block_search_flags search_flags,
-			   domain_search_flags domain,
-			   search_symtabs_lang_matcher lang_matcher)
+expanded_symbols_functions::search
+     (objfile *objfile,
+      search_symtabs_file_matcher file_matcher,
+      const lookup_name_info *lookup_name,
+      search_symtabs_symbol_matcher symbol_matcher,
+      search_symtabs_expansion_listener listener,
+      block_search_flags search_flags,
+      domain_search_flags domain,
+      search_symtabs_lang_matcher lang_matcher)
 {
   /* This invariant is documented in quick-functions.h.  */
   gdb_assert (lookup_name != nullptr || symbol_matcher == nullptr);
@@ -97,15 +98,15 @@ expanded_symbols_functions::search (struct objfile *objfile,
   return true;
 }
 
-/* See readnow-symbols.h.  */
+/* See expanded-symbol.h.  */
 
-struct symbol *
-expanded_symbols_functions::find_symbol_by_address (struct objfile *objfile,
-					   CORE_ADDR address)
+symbol *
+expanded_symbols_functions::find_symbol_by_address (objfile *objfile,
+						    CORE_ADDR address)
 {
   for (compunit_symtab &symtab : objfile->compunits ())
     {
-      struct symbol *sym = symtab.symbol_at_address (address);
+      symbol *sym = symtab.symbol_at_address (address);
       if (sym != nullptr)
 	return sym;
     }
diff --git a/gdb/expanded-symbol.h b/gdb/expanded-symbol.h
index 89fa532d1dd..c088d74f7e5 100644
--- a/gdb/expanded-symbol.h
+++ b/gdb/expanded-symbol.h
@@ -29,39 +29,39 @@
 
 struct expanded_symbols_functions : public quick_symbol_functions
 {
-  bool has_symbols (struct objfile *objfile) override
+  bool has_symbols (objfile *objfile) override
   {
     return true;
   }
 
-  bool has_unexpanded_symtabs (struct objfile *objfile) override
+  bool has_unexpanded_symtabs (objfile *objfile) override
   {
     return false;
   }
 
-  struct symtab *find_last_source_symtab (struct objfile *objfile) override;
+  symtab *find_last_source_symtab (objfile *objfile) override;
 
-  void forget_cached_source_info (struct objfile *objfile) override
+  void forget_cached_source_info (objfile *objfile) override
   {
   }
 
-  enum language lookup_global_symbol_language (struct objfile *objfile,
+  enum language lookup_global_symbol_language (objfile *objfile,
 					       const char *name,
 					       domain_search_flags domain,
 					       bool *symbol_found_p) override;
-  void print_stats (struct objfile *objfile, bool print_bcache) override
+  void print_stats (objfile *objfile, bool print_bcache) override
   {
   }
 
-  void dump (struct objfile *objfile) override
+  void dump (objfile *objfile) override
   {
   }
 
-  void expand_all_symtabs (struct objfile *objfile) override
+  void expand_all_symtabs (objfile *objfile) override
   {
   }
 
-  bool search (struct objfile *objfile,
+  bool search (objfile *objfile,
 	       search_symtabs_file_matcher file_matcher,
 	       const lookup_name_info *lookup_name,
 	       search_symtabs_symbol_matcher symbol_matcher,
@@ -69,18 +69,18 @@ struct expanded_symbols_functions : public quick_symbol_functions
 	       block_search_flags search_flags, domain_search_flags domain,
 	       search_symtabs_lang_matcher lang_matcher) override;
 
-  struct compunit_symtab *find_pc_sect_compunit_symtab
-    (struct objfile *objfile, bound_minimal_symbol msymbol, CORE_ADDR pc,
-     struct obj_section *section, int warn_if_readin) override
+  compunit_symtab *find_pc_sect_compunit_symtab
+    (objfile *objfile, bound_minimal_symbol msymbol, CORE_ADDR pc,
+     obj_section *section, int warn_if_readin) override
   {
     /* Simply returning NULL here is okay since the (only) caller
-       find_compunit_symtab_for_pc_sect interates over existing CUs
+       find_compunit_symtab_for_pc_sect iterates over existing CUs
        anyway.  */
     return nullptr;
   }
 
-  struct symbol *find_symbol_by_address (struct objfile *objfile,
-					 CORE_ADDR address) override;
+  symbol *find_symbol_by_address (objfile *objfile, CORE_ADDR address)
+    override;
 
   void map_symbol_filenames (objfile *objfile, symbol_filename_listener fun,
 			     bool need_fullname) override