[1/3] constify exec_file_attach
Commit Message
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-22 Tom Tromey <tromey@redhat.com>
* 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 (call_exec_file_attach): New function.
(captured_main): Use it.
---
gdb/ChangeLog | 10 ++++++++++
gdb/corefile.c | 7 +++----
gdb/exec.c | 2 +-
gdb/gdbcore.h | 6 +++---
gdb/main.c | 12 ++++++++++--
5 files changed, 27 insertions(+), 10 deletions(-)
Comments
On 07/23/2014 10:27 PM, Tom Tromey wrote:
> @@ -420,6 +420,14 @@ typedef struct cmdarg {
> /* Define type VEC (cmdarg_s). */
> DEF_VEC_O (cmdarg_s);
>
> +/* A wrapper for exec_file_attach that has the correct type. */
> +
> +static void
> +call_exec_file_attach (char *arg, int from_tty)
> +{
> + exec_file_attach (arg, from_tty);
> +}
> +
> static int
> captured_main (void *data)
> {
> @@ -1068,7 +1076,7 @@ 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,
> + if (catch_command_errors (call_exec_file_attach, execarg,
> !batch_flag, RETURN_MASK_ALL))
Why not use catch_command_errors_const instead? Seems like
you wouldn't need call_exec_file_attach then.
> catch_command_errors_const (symbol_file_add_main, symarg,
> !batch_flag, RETURN_MASK_ALL);
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
Pedro> Why not use catch_command_errors_const instead?
I had just forgotten about its existence.
I've made the obvious fix here.
Tom
On 07/24/2014 04:21 PM, Tom Tromey wrote:
>>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
>
> Pedro> Why not use catch_command_errors_const instead?
>
> I had just forgotten about its existence.
> I've made the obvious fix here.
Great, thanks.
Thanks,
Pedro Alves
@@ -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;
@@ -161,7 +161,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;
@@ -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);
@@ -420,6 +420,14 @@ typedef struct cmdarg {
/* Define type VEC (cmdarg_s). */
DEF_VEC_O (cmdarg_s);
+/* A wrapper for exec_file_attach that has the correct type. */
+
+static void
+call_exec_file_attach (char *arg, int from_tty)
+{
+ exec_file_attach (arg, from_tty);
+}
+
static int
captured_main (void *data)
{
@@ -1068,7 +1076,7 @@ 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,
+ if (catch_command_errors (call_exec_file_attach, execarg,
!batch_flag, RETURN_MASK_ALL))
catch_command_errors_const (symbol_file_add_main, symarg,
!batch_flag, RETURN_MASK_ALL);
@@ -1076,7 +1084,7 @@ captured_main (void *data)
else
{
if (execarg != NULL)
- catch_command_errors (exec_file_attach, execarg,
+ catch_command_errors (call_exec_file_attach, execarg,
!batch_flag, RETURN_MASK_ALL);
if (symarg != NULL)
catch_command_errors_const (symbol_file_add_main, symarg,