This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Rename some command functions
- From: Simon Marchi <simark at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 22 Aug 2017 20:13:21 -0000
- Subject: [binutils-gdb] Rename some command functions
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=11db943032396e1fee31440b0a331511dc0f4c00
commit 11db943032396e1fee31440b0a331511dc0f4c00
Author: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue Aug 22 22:09:55 2017 +0200
Rename some command functions
This patch renames a few functions implementing CLI commands to follow
the style <command-name>_command, so that they are easier to search for.
gdb/ChangeLog:
* breakpoint.c (breakpoints_info): Rename to ...
(info_breakpoints_command): ... this.
(watchpoints_info): Rename to ...
(info_watchpoints_command): ... this.
(tracepoints_info): Rename to ...
(info_tracepoints_command): ... this.
(_initialize_breakpoint): Adjust.
* dcache.c (dcache_info): Rename to ...
(info_display_command): ... this.
(_initialize_dcache): Adjust.
* frame.h (args_info): Rename to ...
(info_args_command): ... this.
(locals_info): Rename to ...
(info_locals_command): ... this.
* infcmd.c (nofp_registers_info): Rename to ...
(info_registers_command): ... this.
(float_info): Rename to ...
(info_float_command): ... this.
(program_info): Rename to ...
(info_program_command): ... this.
(all_registers_info): Rename to ...
(info_all_registers_command): ... this.
(vector_info): Rename to ...
(info_vector_command): ... this.
(float_info): Rename to ...
(info_float_command): ... this.
(_initialize_infcmd): Adjust.
* inferior.h (term_info): Rename to ...
(info_terminal_command): ... this.
* inflow.c (term_info): Rename to ...
(info_terminal_command): ... this.
(_initialize_inflow): Adjust.
* infrun.c (signals_info): Rename to ...
(info_signals_command): ... this.
(_initialize_infrun): Adjust.
* objc-lang.c (classes_info): Rename to ...
(info_classes_command): ... this.
(selectors_info): Rename to ...
(info_selectors_command): ... this.
(_initialize_objc_language): Adjust.
* printcmd.c (sym_info): Rename to ...
(info_symbol_command): ... this.
(address_info): Rename to ...
(info_address_command): ... this.
(display_info): Rename to ...
(info_display_command): ... this.
(_initialize_printcmd): Adjust.
* reverse.c (bookmarks_info): Rename to ...
(info_breakpoints_command): ... this.
(_initialize_reverse): Adjust.
* ser-go32.c (dos_info): Rename to ...
(info_serial_command): ... this.
(_initialize_ser_dos): Adjust.
* skip.c (skip_info): Rename to ...
(info_skip_command): ... this.
(_initialize_step_skip): Adjust.
* source.c (line_info): Rename to ...
(info_line_command): ... this.
(source_info): Rename to ...
(info_source_command)
* stack.c (frame_info): Rename to ...
(info_frame_command): ... this.
(locals_info): Rename to ...
(info_locals_command): ... this.
(args_info): Rename to ...
(info_args_command): ... this.
(_initialize_stack): Adjust.
* symtab.c (sources_info): Rename to ...
(info_sources_command): ... this.
(variables_info): Rename to ...
(info_variables_command): ... this.
(functions_info): Rename to ...
(info_functions_command): ... this.
(types_info): Rename to ...
(info_types_command): ... this.
(_initialize_symtab): Adjust.
* target.c (target_info): Rename to ...
(info_target_command): ... this.
(initialize_targets): Adjust.
* tracepoint.c (tvariables_info): Rename to ...
(info_tvariables_command): ... this.
(scope_info): Rename to ...
(info_scope_command): ... this.
(trace_dump_actions): Adjust.
(_initialize_tracepoint): Adjust.
Diff:
---
gdb/ChangeLog | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/breakpoint.c | 20 ++++++-------
gdb/dcache.c | 6 ++--
gdb/frame.h | 4 +--
gdb/infcmd.c | 26 ++++++++---------
gdb/inferior.h | 2 +-
gdb/inflow.c | 4 +--
gdb/infrun.c | 6 ++--
gdb/objc-lang.c | 8 +++---
gdb/printcmd.c | 12 ++++----
gdb/reverse.c | 4 +--
gdb/ser-go32.c | 4 +--
gdb/skip.c | 4 +--
gdb/source.c | 12 ++++----
gdb/stack.c | 12 ++++----
gdb/symtab.c | 18 ++++++------
gdb/target.c | 8 +++---
gdb/tracepoint.c | 12 ++++----
18 files changed, 169 insertions(+), 81 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1f8233b..b69339a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,91 @@
+2017-08-22 Simon Marchi <simon.marchi@ericsson.com>
+
+ * breakpoint.c (breakpoints_info): Rename to ...
+ (info_breakpoints_command): ... this.
+ (watchpoints_info): Rename to ...
+ (info_watchpoints_command): ... this.
+ (tracepoints_info): Rename to ...
+ (info_tracepoints_command): ... this.
+ (_initialize_breakpoint): Adjust.
+ * dcache.c (dcache_info): Rename to ...
+ (info_display_command): ... this.
+ (_initialize_dcache): Adjust.
+ * frame.h (args_info): Rename to ...
+ (info_args_command): ... this.
+ (locals_info): Rename to ...
+ (info_locals_command): ... this.
+ * infcmd.c (nofp_registers_info): Rename to ...
+ (info_registers_command): ... this.
+ (float_info): Rename to ...
+ (info_float_command): ... this.
+ (program_info): Rename to ...
+ (info_program_command): ... this.
+ (all_registers_info): Rename to ...
+ (info_all_registers_command): ... this.
+ (vector_info): Rename to ...
+ (info_vector_command): ... this.
+ (float_info): Rename to ...
+ (info_float_command): ... this.
+ (_initialize_infcmd): Adjust.
+ * inferior.h (term_info): Rename to ...
+ (info_terminal_command): ... this.
+ * inflow.c (term_info): Rename to ...
+ (info_terminal_command): ... this.
+ (_initialize_inflow): Adjust.
+ * infrun.c (signals_info): Rename to ...
+ (info_signals_command): ... this.
+ (_initialize_infrun): Adjust.
+ * objc-lang.c (classes_info): Rename to ...
+ (info_classes_command): ... this.
+ (selectors_info): Rename to ...
+ (info_selectors_command): ... this.
+ (_initialize_objc_language): Adjust.
+ * printcmd.c (sym_info): Rename to ...
+ (info_symbol_command): ... this.
+ (address_info): Rename to ...
+ (info_address_command): ... this.
+ (display_info): Rename to ...
+ (info_display_command): ... this.
+ (_initialize_printcmd): Adjust.
+ * reverse.c (bookmarks_info): Rename to ...
+ (info_breakpoints_command): ... this.
+ (_initialize_reverse): Adjust.
+ * ser-go32.c (dos_info): Rename to ...
+ (info_serial_command): ... this.
+ (_initialize_ser_dos): Adjust.
+ * skip.c (skip_info): Rename to ...
+ (info_skip_command): ... this.
+ (_initialize_step_skip): Adjust.
+ * source.c (line_info): Rename to ...
+ (info_line_command): ... this.
+ (source_info): Rename to ...
+ (info_source_command)
+ * stack.c (frame_info): Rename to ...
+ (info_frame_command): ... this.
+ (locals_info): Rename to ...
+ (info_locals_command): ... this.
+ (args_info): Rename to ...
+ (info_args_command): ... this.
+ (_initialize_stack): Adjust.
+ * symtab.c (sources_info): Rename to ...
+ (info_sources_command): ... this.
+ (variables_info): Rename to ...
+ (info_variables_command): ... this.
+ (functions_info): Rename to ...
+ (info_functions_command): ... this.
+ (types_info): Rename to ...
+ (info_types_command): ... this.
+ (_initialize_symtab): Adjust.
+ * target.c (target_info): Rename to ...
+ (info_target_command): ... this.
+ (initialize_targets): Adjust.
+ * tracepoint.c (tvariables_info): Rename to ...
+ (info_tvariables_command): ... this.
+ (scope_info): Rename to ...
+ (info_scope_command): ... this.
+ (trace_dump_actions): Adjust.
+ (_initialize_tracepoint): Adjust.
+
2017-08-22 Tom Tromey <tom@tromey.com>
* breakpoint.h (install_breakpoint): Update.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 334c76a..ae09da4 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -183,9 +183,9 @@ static int breakpoint_location_address_range_overlap (struct bp_location *,
struct address_space *,
CORE_ADDR, int);
-static void breakpoints_info (char *, int);
+static void info_breakpoints_command (char *, int);
-static void watchpoints_info (char *, int);
+static void info_watchpoints_command (char *, int);
static int breakpoint_1 (char *, int,
int (*) (const struct breakpoint *));
@@ -279,7 +279,7 @@ static int is_hardware_watchpoint (const struct breakpoint *bpt);
static void insert_breakpoint_locations (void);
-static void tracepoints_info (char *, int);
+static void info_tracepoints_command (char *, int);
static void delete_trace_command (char *, int);
@@ -6958,7 +6958,7 @@ default_collect_info (void)
}
static void
-breakpoints_info (char *args, int from_tty)
+info_breakpoints_command (char *args, int from_tty)
{
breakpoint_1 (args, 0, NULL);
@@ -6966,7 +6966,7 @@ breakpoints_info (char *args, int from_tty)
}
static void
-watchpoints_info (char *args, int from_tty)
+info_watchpoints_command (char *args, int from_tty)
{
int num_printed = breakpoint_1 (args, 0, is_watchpoint);
struct ui_out *uiout = current_uiout;
@@ -15222,7 +15222,7 @@ create_tracepoint_from_upload (struct uploaded_tp *utp)
omitted. */
static void
-tracepoints_info (char *args, int from_tty)
+info_tracepoints_command (char *args, int from_tty)
{
struct ui_out *uiout = current_uiout;
int num_printed;
@@ -16104,7 +16104,7 @@ Break in function/address or break at a line in the current file."),
_("Break in function or address."), &stoplist);
add_cmd ("at", class_breakpoint, stopat_command,
_("Break at a line in the current file."), &stoplist);
- add_com ("status", class_info, breakpoints_info, _("\
+ add_com ("status", class_info, info_breakpoints_command, _("\
Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
The \"Type\" column indicates one of:\n\
\tbreakpoint - normal breakpoint\n\
@@ -16121,7 +16121,7 @@ Convenience variable \"$bpnum\" contains the number of the last\n\
breakpoint set."));
}
- add_info ("breakpoints", breakpoints_info, _("\
+ add_info ("breakpoints", info_breakpoints_command, _("\
Status of specified breakpoints (all user-settable breakpoints if no argument).\n\
The \"Type\" column indicates one of:\n\
\tbreakpoint - normal breakpoint\n\
@@ -16227,7 +16227,7 @@ If -l or -location is given, this evaluates EXPRESSION and watches\n\
the memory to which it refers."));
set_cmd_completer (c, expression_completer);
- add_info ("watchpoints", watchpoints_info, _("\
+ add_info ("watchpoints", info_watchpoints_command, _("\
Status of specified watchpoints (all watchpoints if no argument)."));
/* XXX: cagney/2005-02-23: This should be a boolean, and should
@@ -16289,7 +16289,7 @@ Do \"help breakpoints\" for info on other commands dealing with breakpoints.\n\
Do \"help tracepoints\" for info on other tracepoint commands."));
set_cmd_completer (c, location_completer);
- add_info ("tracepoints", tracepoints_info, _("\
+ add_info ("tracepoints", info_tracepoints_command, _("\
Status of specified tracepoints (all tracepoints if no argument).\n\
Convenience variable \"$tpnum\" contains the number of the\n\
last tracepoint set."));
diff --git a/gdb/dcache.c b/gdb/dcache.c
index f7918ca..cec1a81 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -125,7 +125,7 @@ static int dcache_read_line (DCACHE *dcache, struct dcache_block *db);
static struct dcache_block *dcache_alloc (DCACHE *dcache, CORE_ADDR addr);
-static void dcache_info (char *exp, int tty);
+static void info_dcache_command (char *exp, int tty);
void _initialize_dcache (void);
@@ -642,7 +642,7 @@ dcache_info_1 (DCACHE *dcache, char *exp)
}
static void
-dcache_info (char *exp, int tty)
+info_dcache_command (char *exp, int tty)
{
dcache_info_1 (target_dcache_get (), exp);
}
@@ -702,7 +702,7 @@ exists only for compatibility reasons."),
show_dcache_enabled_p,
&setlist, &showlist);
- add_info ("dcache", dcache_info,
+ add_info ("dcache", info_dcache_command,
_("\
Print information on the dcache performance.\n\
With no arguments, this command prints the cache configuration and a\n\
diff --git a/gdb/frame.h b/gdb/frame.h
index 56cbd44..f3485af 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -784,9 +784,9 @@ extern void read_frame_arg (struct symbol *sym, struct frame_info *frame,
extern void read_frame_local (struct symbol *sym, struct frame_info *frame,
struct frame_arg *argp);
-extern void args_info (char *, int);
+extern void info_args_command (char *, int);
-extern void locals_info (char *, int);
+extern void info_locals_command (char *, int);
extern void return_command (char *, int);
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index c8a82db..bd9ead8 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -62,7 +62,7 @@
/* Local functions: */
-static void nofp_registers_info (char *, int);
+static void info_registers_command (char *, int);
static void until_next_command (int);
@@ -74,7 +74,7 @@ static void path_command (char *, int);
static void unset_command (char *, int);
-static void float_info (char *, int);
+static void info_float_command (char *, int);
static void disconnect_command (char *, int);
@@ -84,7 +84,7 @@ static void set_environment_command (char *, int);
static void environment_info (char *, int);
-static void program_info (char *, int);
+static void info_program_command (char *, int);
static void finish_command (char *, int);
@@ -2060,7 +2060,7 @@ finish_command (char *arg, int from_tty)
static void
-program_info (char *args, int from_tty)
+info_program_command (char *args, int from_tty)
{
bpstat bs;
int num, stat;
@@ -2502,13 +2502,13 @@ registers_info (char *addr_exp, int fpregs)
}
static void
-all_registers_info (char *addr_exp, int from_tty)
+info_all_registers_command (char *addr_exp, int from_tty)
{
registers_info (addr_exp, 1);
}
static void
-nofp_registers_info (char *addr_exp, int from_tty)
+info_registers_command (char *addr_exp, int from_tty)
{
registers_info (addr_exp, 0);
}
@@ -2543,7 +2543,7 @@ print_vector_info (struct ui_file *file,
}
static void
-vector_info (char *args, int from_tty)
+info_vector_command (char *args, int from_tty)
{
if (!target_has_registers)
error (_("The program has no registers now."));
@@ -3090,7 +3090,7 @@ default_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
}
static void
-float_info (char *args, int from_tty)
+info_float_command (char *args, int from_tty)
{
struct frame_info *frame;
@@ -3421,24 +3421,24 @@ If non-stop mode is enabled, interrupt only the current thread,\n\
otherwise all the threads in the program are stopped. To \n\
interrupt all running threads in non-stop mode, use the -a option."));
- c = add_info ("registers", nofp_registers_info, _("\
+ c = add_info ("registers", info_registers_command, _("\
List of integer registers and their contents, for selected stack frame.\n\
Register name as argument means describe only that register."));
add_info_alias ("r", "registers", 1);
set_cmd_completer (c, reg_or_group_completer);
- c = add_info ("all-registers", all_registers_info, _("\
+ c = add_info ("all-registers", info_all_registers_command, _("\
List of all registers and their contents, for selected stack frame.\n\
Register name as argument means describe only that register."));
set_cmd_completer (c, reg_or_group_completer);
- add_info ("program", program_info,
+ add_info ("program", info_program_command,
_("Execution status of the program."));
- add_info ("float", float_info,
+ add_info ("float", info_float_command,
_("Print the status of the floating point unit\n"));
- add_info ("vector", vector_info,
+ add_info ("vector", info_vector_command,
_("Print the status of the vector unit\n"));
add_prefix_cmd ("proc", class_info, info_proc_cmd,
diff --git a/gdb/inferior.h b/gdb/inferior.h
index c2b5db4..6d020f7 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -121,7 +121,7 @@ extern void default_print_float_info (struct gdbarch *gdbarch,
extern void child_terminal_info (struct target_ops *self, const char *, int);
-extern void term_info (char *, int);
+extern void info_terminal_command (char *, int);
extern void child_terminal_ours (struct target_ops *self);
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 01851f4..41a2251 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -536,7 +536,7 @@ copy_terminal_info (struct inferior *to, struct inferior *from)
}
void
-term_info (char *arg, int from_tty)
+info_terminal_command (char *arg, int from_tty)
{
target_terminal_info (arg, from_tty);
}
@@ -820,7 +820,7 @@ initialize_stdin_serial (void)
void
_initialize_inflow (void)
{
- add_info ("terminal", term_info,
+ add_info ("terminal", info_terminal_command,
_("Print inferior's saved terminal status."));
terminal_is_ours = 1;
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 541fc09..d0e4105 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -70,7 +70,7 @@
/* Prototypes for local functions */
-static void signals_info (char *, int);
+static void info_signals_command (char *, int);
static void handle_command (char *, int);
@@ -8710,7 +8710,7 @@ Use \"info signals\" for a list of symbolic signals."));
targets, all signals should be in the signal tables). */
static void
-signals_info (char *signum_exp, int from_tty)
+info_signals_command (char *signum_exp, int from_tty)
{
enum gdb_signal oursig;
@@ -9200,7 +9200,7 @@ _initialize_infrun (void)
infrun_async_inferior_event_token
= create_async_event_handler (infrun_async_inferior_event_handler, NULL);
- add_info ("signals", signals_info, _("\
+ add_info ("signals", info_signals_command, _("\
What debugger does when program gets various signals.\n\
Specify a signal as argument to print info on that signal only."));
add_info_alias ("handle", "signals", 0);
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 6ffe85e..bd08514 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -559,7 +559,7 @@ compare_selectors (const void *a, const void *b)
*/
static void
-selectors_info (char *regexp, int from_tty)
+info_selectors_command (char *regexp, int from_tty)
{
struct objfile *objfile;
struct minimal_symbol *msymbol;
@@ -721,7 +721,7 @@ compare_classes (const void *a, const void *b)
*/
static void
-classes_info (char *regexp, int from_tty)
+info_classes_command (char *regexp, int from_tty)
{
struct objfile *objfile;
struct minimal_symbol *msymbol;
@@ -1377,9 +1377,9 @@ extern initialize_file_ftype _initialize_objc_language;
void
_initialize_objc_language (void)
{
- add_info ("selectors", selectors_info, /* INFO SELECTORS command. */
+ add_info ("selectors", info_selectors_command,
_("All Objective-C selectors, or those matching REGEXP."));
- add_info ("classes", classes_info, /* INFO CLASSES command. */
+ add_info ("classes", info_classes_command,
_("All Objective-C classes, or those matching REGEXP."));
add_com ("print-object", class_vars, print_object_command,
_("Ask an Objective-C object to print itself."));
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index a1231d4..6206d8d 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1290,7 +1290,7 @@ set_command (char *exp, int from_tty)
}
static void
-sym_info (char *arg, int from_tty)
+info_symbol_command (char *arg, int from_tty)
{
struct minimal_symbol *msymbol;
struct objfile *objfile;
@@ -1383,7 +1383,7 @@ sym_info (char *arg, int from_tty)
}
static void
-address_info (char *exp, int from_tty)
+info_address_command (char *exp, int from_tty)
{
struct gdbarch *gdbarch;
int regno;
@@ -2050,7 +2050,7 @@ disable_current_display (void)
}
static void
-display_info (char *ignore, int from_tty)
+info_display_command (char *ignore, int from_tty)
{
struct display *d;
@@ -2673,10 +2673,10 @@ _initialize_printcmd (void)
observer_attach_free_objfile (clear_dangling_display_expressions);
- add_info ("address", address_info,
+ add_info ("address", info_address_command,
_("Describe where symbol SYM is stored."));
- add_info ("symbol", sym_info, _("\
+ add_info ("symbol", info_symbol_command, _("\
Describe what symbol is at location ADDR.\n\
Only for symbols with fixed locations (global or static scope)."));
@@ -2700,7 +2700,7 @@ with this command or \"print\"."));
_("Print line number and file of definition of variable."));
#endif
- add_info ("display", display_info, _("\
+ add_info ("display", info_display_command, _("\
Expressions to display when program stops, with code numbers."));
add_cmd ("undisplay", class_vars, undisplay_command, _("\
diff --git a/gdb/reverse.c b/gdb/reverse.c
index c8f3811..61f31e5 100644
--- a/gdb/reverse.c
+++ b/gdb/reverse.c
@@ -307,7 +307,7 @@ bookmark_1 (int bnum)
/* Implement "info bookmarks" command. */
static void
-bookmarks_info (char *args, int from_tty)
+info_bookmarks_command (char *args, int from_tty)
{
if (!bookmark_chain)
printf_filtered (_("No bookmarks.\n"));
@@ -371,7 +371,7 @@ Execute backward until just before selected stack frame is called."));
Set a bookmark in the program's execution history.\n\
A bookmark represents a point in the execution history \n\
that can be returned to at a later point in the debug session."));
- add_info ("bookmarks", bookmarks_info, _("\
+ add_info ("bookmarks", info_bookmarks_command, _("\
Status of user-settable bookmarks.\n\
Bookmarks are user-settable markers representing a point in the \n\
execution history that can be returned to later in the same debug \n\
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index 00fc6b6..41503ac 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -899,7 +899,7 @@ gdb_pipe (int pdes[2])
}
static void
-dos_info (char *arg, int from_tty)
+info_serial_command (char *arg, int from_tty)
{
struct dos_ttystate *port;
#ifdef DOS_STATS
@@ -999,6 +999,6 @@ Show COM4 interrupt request."), NULL,
NULL, /* FIXME: i18n: */
&setlist, &showlist);
- add_info ("serial", dos_info,
+ add_info ("serial", info_serial_command,
_("Print DOS serial port status."));
}
diff --git a/gdb/skip.c b/gdb/skip.c
index 9f77248..bd9eec9 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -353,7 +353,7 @@ skip_command (char *arg, int from_tty)
}
static void
-skip_info (char *arg, int from_tty)
+info_skip_command (char *arg, int from_tty)
{
int num_printable_entries = 0;
struct value_print_options opts;
@@ -659,7 +659,7 @@ If you don't specify any numbers or ranges, we'll delete all skip entries.\n\n\
Usage: skip delete [NUMBERS AND/OR RANGES]"),
&skiplist);
- add_info ("skip", skip_info, _("\
+ add_info ("skip", info_skip_command, _("\
Display the status of skips. You can specify numbers (e.g. \"skip info 1 3\"), \
ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-8\").\n\n\
If you don't specify any numbers or ranges, we'll show all skips.\n\n\
diff --git a/gdb/source.c b/gdb/source.c
index 5403715..55540e6 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -60,9 +60,9 @@ static void reverse_search_command (char *, int);
static void forward_search_command (char *, int);
-static void line_info (char *, int);
+static void info_line_command (char *, int);
-static void source_info (char *, int);
+static void info_source_command (char *, int);
/* Path of directories to search for source files.
Same format as the PATH environment variable's value. */
@@ -649,7 +649,7 @@ add_path (char *dirname, char **which_path, int parse_separators)
static void
-source_info (char *ignore, int from_tty)
+info_source_command (char *ignore, int from_tty)
{
struct symtab *s = current_source_symtab;
struct compunit_symtab *cust;
@@ -1490,7 +1490,7 @@ print_source_lines (struct symtab *s, int line, int stopline,
/* Print info on range of pc's in a specified line. */
static void
-line_info (char *arg, int from_tty)
+info_line_command (char *arg, int from_tty)
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
@@ -2025,10 +2025,10 @@ Setting the value to an empty string sets it to $cdir:$cwd, the default."),
show_directories_command,
&setlist, &showlist);
- add_info ("source", source_info,
+ add_info ("source", info_source_command,
_("Information about the current source file."));
- add_info ("line", line_info, _("\
+ add_info ("line", info_line_command, _("\
Core addresses of the code for a source line.\n\
Line can be specified as\n\
LINENUM, to list around that line in current file,\n\
diff --git a/gdb/stack.c b/gdb/stack.c
index 3e9dca2..051a23d 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1396,7 +1396,7 @@ parse_frame_specification (const char *frame_exp, int *selected_frame_p)
ADDR_EXP. Absolutely all information in the frame is printed. */
static void
-frame_info (char *addr_exp, int from_tty)
+info_frame_command (char *addr_exp, int from_tty)
{
struct frame_info *fi;
struct symtab_and_line sal;
@@ -2132,7 +2132,7 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs,
}
void
-locals_info (char *args, int from_tty)
+info_locals_command (char *args, int from_tty)
{
print_frame_local_vars (get_selected_frame (_("No frame selected.")),
0, gdb_stdout);
@@ -2214,7 +2214,7 @@ print_frame_arg_vars (struct frame_info *frame, struct ui_file *stream)
}
void
-args_info (char *ignore, int from_tty)
+info_args_command (char *ignore, int from_tty)
{
print_frame_arg_vars (get_selected_frame (_("No frame selected.")),
gdb_stdout);
@@ -2630,12 +2630,12 @@ on this backtrace.\n"));
add_info ("stack", backtrace_command,
_("Backtrace of the stack, or innermost COUNT frames."));
add_info_alias ("s", "stack", 1);
- add_info ("frame", frame_info,
+ add_info ("frame", info_frame_command,
_("All about selected stack frame, or frame at ADDR."));
add_info_alias ("f", "frame", 1);
- add_info ("locals", locals_info,
+ add_info ("locals", info_locals_command,
_("Local variables of current stack frame."));
- add_info ("args", args_info,
+ add_info ("args", info_args_command,
_("Argument variables of current stack frame."));
if (dbx_commands)
diff --git a/gdb/symtab.c b/gdb/symtab.c
index b0ab113..7ea03d4 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4044,7 +4044,7 @@ output_partial_symbol_filename (const char *filename, const char *fullname,
}
static void
-sources_info (char *ignore, int from_tty)
+info_sources_command (char *ignore, int from_tty)
{
struct compunit_symtab *cu;
struct symtab *s;
@@ -4610,20 +4610,20 @@ symtab_symbol_info (char *regexp, enum search_domain kind, int from_tty)
}
static void
-variables_info (char *regexp, int from_tty)
+info_variables_command (char *regexp, int from_tty)
{
symtab_symbol_info (regexp, VARIABLES_DOMAIN, from_tty);
}
static void
-functions_info (char *regexp, int from_tty)
+info_functions_command (char *regexp, int from_tty)
{
symtab_symbol_info (regexp, FUNCTIONS_DOMAIN, from_tty);
}
static void
-types_info (char *regexp, int from_tty)
+info_types_command (char *regexp, int from_tty)
{
symtab_symbol_info (regexp, TYPES_DOMAIN, from_tty);
}
@@ -5893,13 +5893,13 @@ _initialize_symtab (void)
symbol_cache_key
= register_program_space_data_with_cleanup (NULL, symbol_cache_cleanup);
- add_info ("variables", variables_info, _("\
+ add_info ("variables", info_variables_command, _("\
All global and static variable names, or those matching REGEXP."));
if (dbx_commands)
- add_com ("whereis", class_info, variables_info, _("\
+ add_com ("whereis", class_info, info_variables_command, _("\
All global and static variable names, or those matching REGEXP."));
- add_info ("functions", functions_info,
+ add_info ("functions", info_functions_command,
_("All function names, or those matching REGEXP."));
/* FIXME: This command has at least the following problems:
@@ -5910,10 +5910,10 @@ All global and static variable names, or those matching REGEXP."));
print "struct foo *".
I also think "ptype" or "whatis" is more likely to be useful (but if
there is much disagreement "info types" can be fixed). */
- add_info ("types", types_info,
+ add_info ("types", info_types_command,
_("All type names, or those matching REGEXP."));
- add_info ("sources", sources_info,
+ add_info ("sources", info_sources_command,
_("Source files in the program."));
add_com ("rbreak", class_breakpoint, rbreak_command,
diff --git a/gdb/target.c b/gdb/target.c
index 9b63ab7..0624007 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -48,7 +48,7 @@
#include <algorithm>
#include "byte-vector.h"
-static void target_info (char *, int);
+static void info_target_command (char *, int);
static void generic_tls_error (void) ATTRIBUTE_NORETURN;
@@ -2125,7 +2125,7 @@ target_remove_breakpoint (struct gdbarch *gdbarch,
}
static void
-target_info (char *args, int from_tty)
+info_target_command (char *args, int from_tty)
{
struct target_ops *t;
int has_all_mem = 0;
@@ -4131,8 +4131,8 @@ initialize_targets (void)
init_dummy_target ();
push_target (&dummy_target);
- add_info ("target", target_info, targ_desc);
- add_info ("files", target_info, targ_desc);
+ add_info ("target", info_target_command, targ_desc);
+ add_info ("files", info_target_command, targ_desc);
add_setshow_zuinteger_cmd ("target", class_maintenance, &targetdebug, _("\
Set target debugging."), _("\
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 86acdbe..d52d10c 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -527,7 +527,7 @@ tvariables_info_1 (void)
/* List all the trace state variables. */
static void
-tvariables_info (char *args, int from_tty)
+info_tvariables_command (char *args, int from_tty)
{
tvariables_info_1 ();
}
@@ -2560,7 +2560,7 @@ tfind_outside_command (char *args, int from_tty)
/* info scope command: list the locals for a scope. */
static void
-scope_info (char *args, int from_tty)
+info_scope_command (char *args, int from_tty)
{
struct symtabs_and_lines sals;
struct symbol *sym;
@@ -2795,9 +2795,9 @@ trace_dump_actions (struct command_line *action,
else if (0 == strncasecmp (action_exp, "$_ret", 5))
;
else if (0 == strncasecmp (action_exp, "$loc", 4))
- locals_info (NULL, from_tty);
+ info_locals_command (NULL, from_tty);
else if (0 == strncasecmp (action_exp, "$arg", 4))
- args_info (NULL, from_tty);
+ info_args_command (NULL, from_tty);
else
{ /* variable */
if (next_comma != NULL)
@@ -4213,7 +4213,7 @@ _initialize_tracepoint (void)
traceframe_number = -1;
tracepoint_number = -1;
- add_info ("scope", scope_info,
+ add_info ("scope", info_scope_command,
_("List the variables local to a scope"));
add_cmd ("tracepoints", class_trace, NULL,
@@ -4236,7 +4236,7 @@ Arguments are the names of the variables to delete.\n\
If no arguments are supplied, delete all variables."), &deletelist);
/* FIXME add a trace variable completer. */
- add_info ("tvariables", tvariables_info, _("\
+ add_info ("tvariables", info_tvariables_command, _("\
Status of trace state variables and their values.\n\
"));