diff options
| author | Tom Tromey <tom@tromey.com> | 2018-04-18 15:59:04 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-05-04 15:58:07 -0600 |
| commit | 295dc222a712b700d9afa7e2462a68b866b120e1 (patch) | |
| tree | 3e9e7bc69a97c6b5553175f9ff3ff6f184abdfbd /gdb/cli | |
| parent | 1263a9d5f1c6198cdb4e73bafe86ca451d35684d (diff) | |
| download | gdb-295dc222a712b700d9afa7e2462a68b866b120e1.zip gdb-295dc222a712b700d9afa7e2462a68b866b120e1.tar.gz gdb-295dc222a712b700d9afa7e2462a68b866b120e1.tar.bz2 | |
Constify prompt argument to read_command_lines
The prompt argument to read_command_lines can be const. This patch
makes this change, and also removes some fixed-sized buffers in favor
of using string_printf.
ChangeLog
2018-05-04 Tom Tromey <tom@tromey.com>
* tracepoint.c (actions_command): Update.
* cli/cli-script.h (read_command_lines): Update.
* cli/cli-script.c (read_command_lines): Constify prompt_arg.
(MAX_TMPBUF): Remove define.
(define_command): Use string_printf.
(document_command): Likewise.
* breakpoint.c (commands_command_1): Update.
Diffstat (limited to 'gdb/cli')
| -rw-r--r-- | gdb/cli/cli-script.c | 20 | ||||
| -rw-r--r-- | gdb/cli/cli-script.h | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index c7d405c..36740b9 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -1121,7 +1121,7 @@ recurse_read_control_structure (char * (*read_next_line_func) (void), #define END_MESSAGE "End with a line saying just \"end\"." counted_command_line -read_command_lines (char *prompt_arg, int from_tty, int parse_commands, +read_command_lines (const char *prompt_arg, int from_tty, int parse_commands, void (*validator)(char *, void *), void *closure) { if (from_tty && input_interactive_p (current_ui)) @@ -1306,7 +1306,6 @@ user_defined_command (const char *ignore, int from_tty) static void define_command (const char *comname, int from_tty) { -#define MAX_TMPBUF 128 enum cmd_hook_type { CMD_NO_HOOK = 0, @@ -1315,7 +1314,6 @@ define_command (const char *comname, int from_tty) }; struct cmd_list_element *c, *newc, *hookc = 0, **list; const char *tem, *comfull; - char tmpbuf[MAX_TMPBUF]; int hook_type = CMD_NO_HOOK; int hook_name_size = 0; @@ -1379,9 +1377,10 @@ define_command (const char *comname, int from_tty) comname = xstrdup (comname); - xsnprintf (tmpbuf, sizeof (tmpbuf), - "Type commands for definition of \"%s\".", comfull); - counted_command_line cmds = read_command_lines (tmpbuf, from_tty, 1, 0, 0); + std::string prompt + = string_printf ("Type commands for definition of \"%s\".", comfull); + counted_command_line cmds = read_command_lines (prompt.c_str (), from_tty, + 1, 0, 0); newc = add_cmd (comname, class_user, user_defined_command, (c && c->theclass == class_user) @@ -1416,7 +1415,6 @@ document_command (const char *comname, int from_tty) struct cmd_list_element *c, **list; const char *tem; const char *comfull; - char tmpbuf[128]; comfull = comname; list = validate_comname (&comname); @@ -1427,10 +1425,10 @@ document_command (const char *comname, int from_tty) if (c->theclass != class_user) error (_("Command \"%s\" is built-in."), comfull); - xsnprintf (tmpbuf, sizeof (tmpbuf), "Type documentation for \"%s\".", - comfull); - counted_command_line doclines = read_command_lines (tmpbuf, from_tty, - 0, 0, 0); + std::string prompt = string_printf ("Type documentation for \"%s\".", + comfull); + counted_command_line doclines = read_command_lines (prompt.c_str (), + from_tty, 0, 0, 0); if (c->doc) xfree ((char *) c->doc); diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h index 10b6c17..7e5f94c 100644 --- a/gdb/cli/cli-script.h +++ b/gdb/cli/cli-script.h @@ -105,7 +105,7 @@ private: } }; -extern counted_command_line read_command_lines (char *, int, int, +extern counted_command_line read_command_lines (const char *, int, int, void (*)(char *, void *), void *); extern counted_command_line read_command_lines_1 (char * (*) (void), int, |