gdb: remove unused parameters in print_doc_of_command, apropos_cmd

I noticed the prefix parameter was unused in print_doc_of_command.  And
when removing it, it becomes unused in apropos_cmd.

Change-Id: Id72980b03fe091b22931e6b85945f412b274ed5e

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 0c680896c917d33409bd88fcd406833e4421f90f..3b1c6a9f4bd634764ee1df0362b05618b2a853db 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1768,7 +1768,7 @@ apropos_command (const char *arg, int from_tty)
   compiled_regex pattern (arg, REG_ICASE,
                          _("Error in regular expression"));
 
-  apropos_cmd (gdb_stdout, cmdlist, verbose, pattern, "");
+  apropos_cmd (gdb_stdout, cmdlist, verbose, pattern);
 }
 
 /* The options for the "alias" command.  */

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 2a4f9b45ab1d99101ab04ed8aae99f1c01f7d233..948592a6f6211fa7508154a2da629520f32af91f 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1637,9 +1637,8 @@ fput_command_names_styled (const cmd_list_element &c,
    otherwise print only one-line help for command C.  */
 
 static void
-print_doc_of_command (const cmd_list_element &c, const char *prefix,
-                     bool verbose, compiled_regex &highlight,
-                     struct ui_file *stream)
+print_doc_of_command (const cmd_list_element &c, bool verbose,
+                     compiled_regex &highlight, struct ui_file *stream)
 {
   /* When printing the full documentation, add a line to separate
      this documentation from the previous command help, in the likely
@@ -1674,7 +1673,7 @@ print_doc_of_command (const cmd_list_element &c, const char *prefix,
 void
 apropos_cmd (struct ui_file *stream,
             struct cmd_list_element *commandlist,
-            bool verbose, compiled_regex &regex, const char *prefix)
+            bool verbose, compiled_regex &regex)
 {
   struct cmd_list_element *c;
   int returnvalue;
@@ -1698,7 +1697,7 @@ apropos_cmd (struct ui_file *stream,
          /* Try to match against the name.  */
          returnvalue = regex.search (c->name, name_len, 0, name_len, NULL);
          if (returnvalue >= 0)
-           print_doc_of_command (*c, prefix, verbose, regex, stream);
+           print_doc_of_command (*c, verbose, regex, stream);
 
          /* Try to match against the name of the aliases.  */
          for (const cmd_list_element &alias : c->aliases)
@@ -1707,7 +1706,7 @@ apropos_cmd (struct ui_file *stream,
              returnvalue = regex.search (alias.name, name_len, 0, name_len, NULL);
              if (returnvalue >= 0)
                {
-                 print_doc_of_command (*c, prefix, verbose, regex, stream);
+                 print_doc_of_command (*c, verbose, regex, stream);
                  break;
                }
            }
@@ -1718,15 +1717,14 @@ apropos_cmd (struct ui_file *stream,
 
          /* Try to match against documentation.  */
          if (regex.search (c->doc, doc_len, 0, doc_len, NULL) >= 0)
-           print_doc_of_command (*c, prefix, verbose, regex, stream);
+           print_doc_of_command (*c, verbose, regex, stream);
        }
       /* Check if this command has subcommands.  */
       if (c->is_prefix ())
        {
          /* Recursively call ourselves on the subcommand list,
             passing the right prefix in.  */
-         apropos_cmd (stream, *c->subcommands, verbose, regex,
-                      c->prefixname ().c_str ());
+         apropos_cmd (stream, *c->subcommands, verbose, regex);
        }
     }
 }

diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 013ffc8fd4cf21fc17dd7a1499ec5798c69b0b35..8fe9325c2da3b25a4b3c01bc6023df9fd589b0f8 100644 (file)
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -283,7 +283,7 @@ private:
 extern void help_cmd (const char *, struct ui_file *);
 
 extern void apropos_cmd (struct ui_file *, struct cmd_list_element *,
-                        bool verbose, compiled_regex &, const char *);
+                        bool verbose, compiled_regex &);
 
 /* Used to mark commands that don't do anything.  If we just leave the
    function field NULL, the command is interpreted as a help topic, or