From 5f08566b92f63e60559577dedfabf9ed517a3ddf Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Jul 2014 10:09:27 -0600 Subject: [PATCH] constify exec_file_attach This constifies exec_file_attach and updates the rest of gdb. Insight will need some minor tweaks after this, though it's worth noting that I think all that hook stuff can actually just go away. I sent a patch to this effect once, but since the Insight source repository situation isn't currently resolved there wasn't a convenient way to test it. 2014-07-30 Tom Tromey * corefile.c (hook_type, call_extra_exec_file_hooks) (specify_exec_file_hook): Constify. * exec.c (exec_file_attach): Make "filename" const. * gdbcore.h (deprecated_exec_file_display_hook) (specify_exec_file_hook, exec_file_attach): Constify. * main.c (captured_main): Use catch_command_errors_const. --- gdb/ChangeLog | 9 +++++++++ gdb/corefile.c | 7 +++---- gdb/exec.c | 2 +- gdb/gdbcore.h | 6 +++--- gdb/main.c | 8 ++++---- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index deccd3199b3..14aaa2cb229 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2014-07-30 Tom Tromey + + * corefile.c (hook_type, call_extra_exec_file_hooks) + (specify_exec_file_hook): Constify. + * exec.c (exec_file_attach): Make "filename" const. + * gdbcore.h (deprecated_exec_file_display_hook) + (specify_exec_file_hook, exec_file_attach): Constify. + * main.c (captured_main): Use catch_command_errors_const. + 2014-07-30 Tom Tromey * target.c (open_target): New function. diff --git a/gdb/corefile.c b/gdb/corefile.c index 8a96d75db23..89d9e193056 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -39,7 +39,6 @@ /* Local function declarations. */ extern void _initialize_core (void); -static void call_extra_exec_file_hooks (char *filename); /* You can have any number of hooks for `exec_file_command' command to call. If there's only one hook, it is set in exec_file_display @@ -50,7 +49,7 @@ static void call_extra_exec_file_hooks (char *filename); only one hook could be set, and which called deprecated_exec_file_display_hook directly. */ -typedef void (*hook_type) (char *); +typedef void (*hook_type) (const char *); hook_type deprecated_exec_file_display_hook; /* The original hook. */ static hook_type *exec_file_extra_hooks; /* Array of additional @@ -87,7 +86,7 @@ core_file_command (char *filename, int from_tty) functions. */ static void -call_extra_exec_file_hooks (char *filename) +call_extra_exec_file_hooks (const char *filename) { int i; @@ -99,7 +98,7 @@ call_extra_exec_file_hooks (char *filename) This is called from the x-window display code. */ void -specify_exec_file_hook (void (*hook) (char *)) +specify_exec_file_hook (void (*hook) (const char *)) { hook_type *new_array; diff --git a/gdb/exec.c b/gdb/exec.c index 8b6f588dd8e..371fccbd231 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -154,7 +154,7 @@ exec_file_clear (int from_tty) we're supplying the exec pathname late for good reason.) */ void -exec_file_attach (char *filename, int from_tty) +exec_file_attach (const char *filename, int from_tty) { struct cleanup *cleanups; diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h index 3f8179144b6..0950859a157 100644 --- a/gdb/gdbcore.h +++ b/gdb/gdbcore.h @@ -127,14 +127,14 @@ extern void write_memory_signed_integer (CORE_ADDR addr, int len, /* Hook for `exec_file_command' command to call. */ -extern void (*deprecated_exec_file_display_hook) (char *filename); +extern void (*deprecated_exec_file_display_hook) (const char *filename); /* Hook for "file_command", which is more useful than above (because it is invoked AFTER symbols are read, not before). */ extern void (*deprecated_file_changed_hook) (char *filename); -extern void specify_exec_file_hook (void (*hook) (char *filename)); +extern void specify_exec_file_hook (void (*hook) (const char *filename)); /* Binary File Diddler for the core file. */ @@ -148,7 +148,7 @@ extern int write_files; extern void core_file_command (char *filename, int from_tty); -extern void exec_file_attach (char *filename, int from_tty); +extern void exec_file_attach (const char *filename, int from_tty); extern void exec_file_clear (int from_tty); diff --git a/gdb/main.c b/gdb/main.c index b51ff89ed64..06b3c90ac98 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1068,16 +1068,16 @@ captured_main (void *data) /* The exec file and the symbol-file are the same. If we can't open it, better only print one error message. catch_command_errors returns non-zero on success! */ - if (catch_command_errors (exec_file_attach, execarg, - !batch_flag, RETURN_MASK_ALL)) + if (catch_command_errors_const (exec_file_attach, execarg, + !batch_flag, RETURN_MASK_ALL)) catch_command_errors_const (symbol_file_add_main, symarg, !batch_flag, RETURN_MASK_ALL); } else { if (execarg != NULL) - catch_command_errors (exec_file_attach, execarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (exec_file_attach, execarg, + !batch_flag, RETURN_MASK_ALL); if (symarg != NULL) catch_command_errors_const (symbol_file_add_main, symarg, !batch_flag, RETURN_MASK_ALL); -- 2.30.2