From 50dd979345279716cd38d11aa3b175f09b8adbdd Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 1 Jul 2013 11:22:12 +0000 Subject: Constify main.c:get_init_files. A following patch will want to make the "gdbinit" global array const. As usual, that forces in a cascading series of const additions. This patch preemptively does those. I went all the way up to constifying catch_command_errors, but then that would require constifying execute_command as well (which is a much more significant effort). So as stop point, I found the cleanest would be to add a variant of catch_command_errors that takes const args, and use that in the few spots that needed it due to the the get_init_files constification. gdb/ 2013-07-01 Pedro Alves * cli/cli-cmds.c (source_script): Make 'file' parameter const. * cli/cli-cmds.h (source_script): Likewise. * exceptions.c (catch_command_errors_const): New function. * exceptions.h (catch_command_errors_const): Declare. * main.c (get_init_files): Make parameters const, and adjust. (captured_main): Make 'system_gdbinit', 'home_gdbinit' and 'local_gdbinit' locals const. Adjust to use catch_command_errors_const. (print_gdb_help): Make 'system_gdbinit', 'home_gdbinit' and 'local_gdbinit' locals const. --- gdb/exceptions.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gdb/exceptions.h') diff --git a/gdb/exceptions.h b/gdb/exceptions.h index 7e3be95..19eacd3 100644 --- a/gdb/exceptions.h +++ b/gdb/exceptions.h @@ -257,4 +257,10 @@ typedef void (catch_command_errors_ftype) (char *, int); extern int catch_command_errors (catch_command_errors_ftype *func, char *arg, int from_tty, return_mask); +/* Like catch_command_errors, but works with const command and args. */ + +typedef void (catch_command_errors_const_ftype) (const char *, int); +extern int catch_command_errors_const (catch_command_errors_const_ftype *func, + const char *arg, int from_tty, return_mask); + #endif -- cgit v1.1