From bbc13ae3db19a3276ba029c838682f81d10f859a Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Tue, 12 Mar 2013 17:39:45 +0000 Subject: * ada-lang.c (ada_read_renaming_var_value): Pass const pointer to expression string to parse_exp_1. (create_excep_cond_exprs): Likewise. * ax-gdb.c (agent_eval_command_one): Likewise. (maint_agent_printf_command): Likewise. Constify much of the string handling/parsing. * breakpoint.c (set_breakpoint_condition): Pass const pointer to expression string to parse_exp_1. (update_watchpoint): Likewise. (parse_cmd_to_aexpr): Constify string handling. Pass const pointer to parse_exp_1. (init_breakpoint_sal): Pass const pointer to parse_exp_1. (find_condition_and_thread): Likewise. Make TOK const. (watch_command_1): Make "arg" const. Constify string handling. Copy the expression string instead of changing the input string. (update_breakpoint_location): Pass const pointer to parse_exp_1. * eval.c (parse_and_eval_address): Make "exp" const. (parse_to_comma_and_eval): Make "expp" const. (parse_and_eval): Make "exp" const. * expression.h (parse_expression): Make argument const. (parse_exp_1): Make first argument const. * findcmd.c (parse_find_args): Treat "args" as const. * linespec.c (parse_linespec): Pass const pointer to linespec_expression_to_pc. (linespec_expression_to_pc): Make "exp_ptr" const. * parse.c (parse_exp_1): Make "stringptr" const. Make a copy of the expression to pass to parse_exp_in_context until this whole interface can be constified. (parse_expression): Make "string" const. * printcmd.c (ui_printf): Treat "arg" as const. Handle const strings. * tracepoint.c (validate_actionline): Pass const pointer to all calls to parse_exp_1. (encode_actions_1): Likewise. * value.h (parse_to_comma_and_eval): Make argument const. (parse_and_eval_address): Likewise. (parse_and_eval): Likewise. * varobj.c (varobj_create): Pass const pointer to parse_exp_1. (varobj_set_value): Likewise. * cli/cli-cmds.c (disassemble_command): Treat "arg" as const and constify string handling. Pass const pointers to parse_and_eval_address and parse_to_comman_and_eval. * cli/cli-utils.c (skip_to_space): Rename to ... (skip_to_space_const): ... this. Handle const strings. * cli/cli-utils.h (skip_to_space): Turn into macro which invokes skip_to_space_const. (skip_to_space_const): Declare. * common/format.c (parse_format_string): Make "arg" const. Handle const strings. * common/format.h (parse_format_string): Make "arg" const. * gdbserver/ax.c (ax_printf): Make "format" const. * python/python.c (gdbpy_parse_and_eval): Do not make a copy of the expression string. --- gdb/ada-lang.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 75f1c3d..63a85ee 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -4056,15 +4056,14 @@ static struct value * ada_read_renaming_var_value (struct symbol *renaming_sym, struct block *block) { - char *sym_name; + const char *sym_name; struct expression *expr; struct value *value; struct cleanup *old_chain = NULL; - sym_name = xstrdup (SYMBOL_LINKAGE_NAME (renaming_sym)); - old_chain = make_cleanup (xfree, sym_name); + sym_name = SYMBOL_LINKAGE_NAME (renaming_sym); expr = parse_exp_1 (&sym_name, 0, block, 0); - make_cleanup (free_current_contents, &expr); + old_chain = make_cleanup (free_current_contents, &expr); value = evaluate_expression (expr); do_cleanups (old_chain); @@ -11385,7 +11384,7 @@ create_excep_cond_exprs (struct ada_catchpoint *c) if (!bl->shlib_disabled) { volatile struct gdb_exception e; - char *s; + const char *s; s = cond_string; TRY_CATCH (e, RETURN_MASK_ERROR) -- cgit v1.1