From f995bbe8e62fdb5607acb1ee127240cfe50d2b8f Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 5 Apr 2017 19:21:33 +0100 Subject: -Wwrite-strings: Constify struct disassemble_info's disassembler_options field The memory disassemble_info::disassembler_options points to is always owned by the client. I.e., that field is an non-owning, observing pointer. Thus const makes sense. Are the include/ and opcodes/ bits OK? Tested on x86_64 Fedora 23, built with --enable-targets=all. include/ChangeLog: 2017-04-05 Pedro Alves * dis-asm.h (disassemble_info) : Now a "const char *". (next_disassembler_option): Constify. opcodes/ChangeLog: 2017-04-05 Pedro Alves * arc-dis.c (parse_option, parse_disassembler_options): Constify. * arm-dis.c (parse_arm_disassembler_options): Constify. * ppc-dis.c (powerpc_init_dialect): Constify local. * vax-dis.c (parse_disassembler_options): Constify. gdb/ChangeLog: 2017-04-05 Pedro Alves * arm-tdep.c (show_disassembly_style_sfunc): Constify local. * disasm.c (set_disassembler_options): Constify local. * i386-tdep.c (i386_print_insn): Remove cast and FIXME comment. --- gdb/ChangeLog | 6 ++++++ gdb/arm-tdep.c | 2 +- gdb/disasm.c | 2 +- gdb/i386-tdep.c | 4 +--- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4141beb..1d0270c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-04-05 Pedro Alves + + * arm-tdep.c (show_disassembly_style_sfunc): Constify local. + * disasm.c (set_disassembler_options): Constify local. + * i386-tdep.c (i386_print_insn): Remove cast and FIXME comment. + 2017-04-05 Sergio Durigan Junior PR gdb/21352 diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index b3c3705..ade770e 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -8562,7 +8562,7 @@ show_disassembly_style_sfunc (struct ui_file *file, int from_tty, char *options = get_disassembler_options (gdbarch); const char *style = ""; int len = 0; - char *opt; + const char *opt; FOR_EACH_DISASSEMBLER_OPTION (opt, options) if (CONST_STRNEQ (opt, "reg-names-")) diff --git a/gdb/disasm.c b/gdb/disasm.c index ab080e2..734db2b 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -930,7 +930,7 @@ set_disassembler_options (char *prospective_options) char **disassembler_options = gdbarch_disassembler_options (gdbarch); const disasm_options_t *valid_options; char *options = remove_whitespace_and_extra_commas (prospective_options); - char *opt; + const char *opt; /* Allow all architectures, even ones that do not support 'set disassembler', to reset their disassembler options to NULL. */ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index ec8b5d3..70bd47c 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -4009,9 +4009,7 @@ i386_print_insn (bfd_vma pc, struct disassemble_info *info) gdb_assert (disassembly_flavor == att_flavor || disassembly_flavor == intel_flavor); - /* FIXME: kettenis/20020915: Until disassembler_options is properly - constified, cast to prevent a compiler warning. */ - info->disassembler_options = (char *) disassembly_flavor; + info->disassembler_options = disassembly_flavor; return print_insn_i386 (pc, info); } -- cgit v1.1