diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-05-06 20:57:41 +0200 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-05-06 20:57:41 +0200 |
| commit | 851c90917fff745b94e29c1fec4f3d00ca36f598 (patch) | |
| tree | 4608502e73d31219764fce2b2e2c46f2961adc15 | |
| parent | 80ad801e90b5bd389ec156d37e28228fcbca128c (diff) | |
| download | binutils-gdb-851c90917fff745b94e29c1fec4f3d00ca36f598.tar.gz | |
Code cleanup: compile: Constify some parameters
gdb/ChangeLog
2015-05-06 Jan Kratochvil <jan.kratochvil@redhat.com>
* compile/compile.c (compile_to_object): Make the cmd_string parameter
const. Use new variables for the const compatibility.
(eval_compile_command): Make the cmd_string parameter const.
* compile/compile.h (eval_compile_command): Make the cmd_string
parameter const.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/compile/compile.c | 15 | ||||
| -rw-r--r-- | gdb/compile/compile.h | 3 |
3 files changed, 19 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8184af94f63..4bfb6194622 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2015-05-06 Jan Kratochvil <jan.kratochvil@redhat.com> + + * compile/compile.c (compile_to_object): Make the cmd_string parameter + const. Use new variables for the const compatibility. + (eval_compile_command): Make the cmd_string parameter const. + * compile/compile.h (eval_compile_command): Make the cmd_string + parameter const. + 2015-05-06 Joel Brobecker <brobecker@adacore.com> * defs.h (deprecated_init_ui_hook): Delete. Remove associated diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 90cfc36ae1c..5ede27b8c3e 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -415,11 +415,12 @@ print_callback (void *ignore, const char *message) freeing both strings. */ static char * -compile_to_object (struct command_line *cmd, char *cmd_string, +compile_to_object (struct command_line *cmd, const char *cmd_string, enum compile_i_scope_types scope, char **source_filep) { char *code; + const char *input; char *source_file, *object_file; struct compile_instance *compiler; struct cleanup *cleanup, *inner_cleanup; @@ -459,6 +460,7 @@ compile_to_object (struct command_line *cmd, char *cmd_string, { struct ui_file *stream = mem_fileopen (); struct command_line *iter; + char *stream_buf; make_cleanup_ui_file_delete (stream); for (iter = cmd->body_list[0]; iter; iter = iter->next) @@ -467,15 +469,16 @@ compile_to_object (struct command_line *cmd, char *cmd_string, fputs_unfiltered ("\n", stream); } - code = ui_file_xstrdup (stream, NULL); - make_cleanup (xfree, code); + stream_buf = ui_file_xstrdup (stream, NULL); + make_cleanup (xfree, stream_buf); + input = stream_buf; } else if (cmd_string != NULL) - code = cmd_string; + input = cmd_string; else error (_("Neither a simple expression, or a multi-line specified.")); - code = current_language->la_compute_program (compiler, code, gdbarch, + code = current_language->la_compute_program (compiler, input, gdbarch, expr_block, expr_pc); make_cleanup (xfree, code); if (compile_debug) @@ -556,7 +559,7 @@ compile_command (char *args, int from_tty) /* See compile.h. */ void -eval_compile_command (struct command_line *cmd, char *cmd_string, +eval_compile_command (struct command_line *cmd, const char *cmd_string, enum compile_i_scope_types scope) { char *object_file, *source_file; diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h index 1e3f93472a7..ccb136154db 100644 --- a/gdb/compile/compile.h +++ b/gdb/compile/compile.h @@ -28,7 +28,8 @@ struct dynamic_prop; expression command. GDB returns either a CMD, or a CMD_STRING, but never both. */ -extern void eval_compile_command (struct command_line *cmd, char *cmd_string, +extern void eval_compile_command (struct command_line *cmd, + const char *cmd_string, enum compile_i_scope_types scope); /* Compile a DWARF location expression to C, suitable for use by the |