gdb/ChangeLog:

	Rename commands 'maint list symtabs' and 'maint list psymtabs' to
	'maint info symtabs' and 'maint info psymtabs'.
	* symmisc.c (maintenance_info_symtabs, maintenance_info_psymtabs):
	Renamed from maintenance_list_symtabs and maintenance_list_psymtabs.
	* symtab.h (maintenance_info_symtabs, maintenance_info_psymtabs):
	Declarations updated.
	* maint.c (maintenance_list_command): Delete.
	(_initialize_maint_cmds): Update calls to add_cmd.
	* gdbcmd.h (maintenancelistlist): Delete declaration.
	* cli/cli-cmds.c (maintenancelistlist): Delete.
	(init_cmd_lists): Don't initialize it.
	* cli/cli-cmds.h (maintenancelistlist): Delete declaration.

gdb/doc/ChangeLog:

	* gdb.texinfo (Symbols): Update documentation: 'maint list
	symtabs' and 'maint list psymtabs' have been renamed 'maint info
	symtabs' and 'maint info psymtabs'.

9 files changed, 38 insertions, 47 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 12eae514a11..6747f6a1659 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2003-05-07  Jim Blandy  <jimb@redhat.com>
+
+	Rename commands 'maint list symtabs' and 'maint list psymtabs' to
+	'maint info symtabs' and 'maint info psymtabs'.
+	* symmisc.c (maintenance_info_symtabs, maintenance_info_psymtabs):
+	Renamed from maintenance_list_symtabs and maintenance_list_psymtabs.
+	* symtab.h (maintenance_info_symtabs, maintenance_info_psymtabs):
+	Declarations updated.
+	* maint.c (maintenance_list_command): Delete.
+	(_initialize_maint_cmds): Update calls to add_cmd.
+	* gdbcmd.h (maintenancelistlist): Delete declaration.
+	* cli/cli-cmds.c (maintenancelistlist): Delete.
+	(init_cmd_lists): Don't initialize it.
+	* cli/cli-cmds.h (maintenancelistlist): Delete declaration.
+
 2003-05-07  Andrew Cagney  <cagney@redhat.com>
 
 	* d10v-tdep.c (remote_d10v_translate_xfer_address): Add
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index c33c242bad5..108329a50c7 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -171,10 +171,6 @@ struct cmd_list_element *maintenanceinfolist;
 
 struct cmd_list_element *maintenanceprintlist;
 
-/* Chain containing all defined "maintenance list" subcommands. */
-
-struct cmd_list_element *maintenancelistlist;
-
 struct cmd_list_element *setprintlist;
 
 struct cmd_list_element *showprintlist;
@@ -1036,7 +1032,6 @@ init_cmd_lists (void)
   maintenancelist = NULL;
   maintenanceinfolist = NULL;
   maintenanceprintlist = NULL;
-  maintenancelistlist = NULL;
   setprintlist = NULL;
   showprintlist = NULL;
   setchecklist = NULL;
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index 1f340efa101..a6e574edd71 100644
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -87,10 +87,6 @@ extern struct cmd_list_element *maintenanceinfolist;
 
 extern struct cmd_list_element *maintenanceprintlist;
 
-/* Chain containing all defined "maintenance list" subcommands. */
-
-extern struct cmd_list_element *maintenancelistlist;
-
 extern struct cmd_list_element *setprintlist;
 
 extern struct cmd_list_element *showprintlist;
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 9ad87b56312..b5dae65db86 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-07  Jim Blandy  <jimb@redhat.com>
+
+	* gdb.texinfo (Symbols): Update documentation: 'maint list
+	symtabs' and 'maint list psymtabs' have been renamed 'maint info
+	symtabs' and 'maint info psymtabs'.
+
 2003-05-05  Andrew Cagney  <cagney@redhat.com>
 
 	* gdbint.texinfo (Target Architecture Definition): Make
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 7bb99c630fa..dc5aca03a5c 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -9031,14 +9031,14 @@ required for each object file from which @value{GDBN} has read some symbols.
 @xref{Files, ,Commands to specify files}, for a discussion of how
 @value{GDBN} reads symbols (in the description of @code{symbol-file}).
 
-@kindex maint list symtabs
-@kindex maint list psymtabs
+@kindex maint info symtabs
+@kindex maint info psymtabs
 @cindex listing @value{GDBN}'s internal symbol tables
 @cindex symbol tables, listing @value{GDBN}'s internal
 @cindex full symbol tables, listing @value{GDBN}'s internal
 @cindex partial symbol tables, listing @value{GDBN}'s internal
-@item maint list symtabs @r{[} @var{regexp} @r{]}
-@itemx maint list psymtabs @r{[} @var{regexp} @r{]}
+@item maint info symtabs @r{[} @var{regexp} @r{]}
+@itemx maint info psymtabs @r{[} @var{regexp} @r{]}
 
 List the @code{struct symtab} or @code{struct partial_symtab}
 structures whose names match @var{regexp}.  If @var{regexp} is not
@@ -9047,7 +9047,7 @@ copy into a @value{GDBN} debugging this one to examine a particular
 structure in more detail.  For example:
 
 @smallexample
-(@value{GDBP}) maint list psymtabs dwarf2read
+(@value{GDBP}) maint info psymtabs dwarf2read
 @{ objfile /home/gnu/build/gdb/gdb
   ((struct objfile *) 0x82e69d0)
   @{ psymtab /home/gnu/src/gdb/dwarf2read.c 
@@ -9060,7 +9060,7 @@ structure in more detail.  For example:
     dependencies (none)
   @}
 @}
-(@value{GDBP}) maint list symtabs
+(@value{GDBP}) maint info symtabs
 (@value{GDBP})
 @end smallexample
 @noindent
@@ -9074,7 +9074,7 @@ read the symtab for the compilation unit containing that function:
 (@value{GDBP}) break dwarf2_psymtab_to_symtab
 Breakpoint 1 at 0x814e5da: file /home/gnu/src/gdb/dwarf2read.c,
 line 1574.
-(@value{GDBP}) maint list symtabs
+(@value{GDBP}) maint info symtabs
 @{ objfile /home/gnu/build/gdb/gdb 
   ((struct objfile *) 0x82e69d0)
   @{ symtab /home/gnu/src/gdb/dwarf2read.c 
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index e626eb5f9e4..8c4490ec940 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -98,10 +98,6 @@ extern struct cmd_list_element *maintenanceinfolist;
 
 extern struct cmd_list_element *maintenanceprintlist;
 
-/* Chain containing all defined "maintenance list" subcommands. */
-
-extern struct cmd_list_element *maintenancelistlist;
-
 extern struct cmd_list_element *setprintlist;
 
 extern struct cmd_list_element *showprintlist;
diff --git a/gdb/maint.c b/gdb/maint.c
index 2eb59ee5e3a..aa342390765 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -434,18 +434,6 @@ maintenance_print_command (char *arg, int from_tty)
   help_list (maintenanceprintlist, "maintenance print ", -1, gdb_stdout);
 }
 
-/* The "maintenance list" command is defined as a prefix, with
-   allow_unknown 0.  Therefore, its own definition is called only for
-   "maintenance list" with no args.  */
-
-/* ARGSUSED */
-static void
-maintenance_list_command (char *arg, int from_tty)
-{
-  printf_unfiltered ("\"maintenance list\" must be followed by the name of a list command.\n");
-  help_list (maintenancelistlist, "maintenance list ", -1, gdb_stdout);
-}
-
 /* The "maintenance translate-address" command converts a section and address
    to a symbol.  This can be called in two ways:
    maintenance translate-address <secname> <addr>
@@ -744,11 +732,6 @@ lists all sections from all object files, including shared libraries.",
 		  &maintenanceprintlist, "maintenance print ", 0,
 		  &maintenancelist);
 
-  add_prefix_cmd ("list", class_maintenance, maintenance_list_command,
-		  "Maintenance command for listing GDB internal state.",
-		  &maintenancelistlist, "maintenance list ", 0,
-		  &maintenancelist);
-
   add_prefix_cmd ("set", class_maintenance, maintenance_set_cmd, "\
 Set GDB internal variables used by the GDB maintainer.\n\
 Configure variables internal to GDB that aid in GDB's maintenance",
@@ -827,18 +810,18 @@ If a SOURCE file is specified, dump only that file's partial symbols.",
 	   "Print dump of current object file definitions.",
 	   &maintenanceprintlist);
 
-  add_cmd ("symtabs", class_maintenance, maintenance_list_symtabs,
+  add_cmd ("symtabs", class_maintenance, maintenance_info_symtabs,
 	   "List the full symbol tables for all object files.\n\
 This does not include information about individual symbols, blocks, or\n\
 linetables --- just the symbol table structures themselves.\n\
 With an argument REGEXP, list the symbol tables whose names that match that.",
-	   &maintenancelistlist);
+	   &maintenanceinfolist);
 
-  add_cmd ("psymtabs", class_maintenance, maintenance_list_psymtabs,
+  add_cmd ("psymtabs", class_maintenance, maintenance_info_psymtabs,
 	   "List the partial symbol tables for all object files.\n\
 This does not include information about individual partial symbols,\n\
 just the symbol table structures themselves.",
-	   &maintenancelistlist);
+	   &maintenanceinfolist);
 
   add_cmd ("statistics", class_maintenance, maintenance_print_statistics,
 	   "Print statistics about internal gdb state.",
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 70eb125c1ba..636b1d9c1ba 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -987,9 +987,9 @@ maintenance_print_objfiles (char *ignore, int from_tty)
 }
 
 
-/* List all the symbol tables.  */
+/* List all the symbol tables whose names match REGEXP (optional).  */
 void
-maintenance_list_symtabs (char *regexp, int from_tty)
+maintenance_info_symtabs (char *regexp, int from_tty)
 {
   struct objfile *objfile;
 
@@ -1036,9 +1036,9 @@ maintenance_list_symtabs (char *regexp, int from_tty)
 }
 
 
-/* List all the partial symbol tables.  */
+/* List all the partial symbol tables whose names match REGEXP (optional).  */
 void
-maintenance_list_psymtabs (char *regexp, int from_tty)
+maintenance_info_psymtabs (char *regexp, int from_tty)
 {
   struct objfile *objfile;
 
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 05275363936..4330b962257 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1233,9 +1233,9 @@ void maintenance_print_msymbols (char *, int);
 
 void maintenance_print_objfiles (char *, int);
 
-void maintenance_list_symtabs (char *, int);
+void maintenance_info_symtabs (char *, int);
 
-void maintenance_list_psymtabs (char *, int);
+void maintenance_info_psymtabs (char *, int);
 
 void maintenance_check_symtabs (char *, int);