From fc4baa5e1f016c27eab4b2593a1ba9db60e11bee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 21 Jul 2014 16:54:06 -0600 Subject: [PATCH] constify maint.c This does a bit of constification in maint.c, making print_bfd_section_info a bit cleaner in the process. 2014-07-24 Tom Tromey * maint.c (match_bfd_flags): Make "string" const. (print_bfd_section_info): Remove casts. (print_objfile_section_info): Make "string" const. --- gdb/ChangeLog | 6 ++++++ gdb/maint.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3f8d0557b8..aaa3307986 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-07-24 Tom Tromey + + * maint.c (match_bfd_flags): Make "string" const. + (print_bfd_section_info): Remove casts. + (print_objfile_section_info): Make "string" const. + 2014-07-24 Tom Tromey * inf-child.c (inf_child_open_target): Make "arg" const. diff --git a/gdb/maint.c b/gdb/maint.c index c7a937c837..99c7f9e921 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -236,7 +236,7 @@ match_substring (const char *string, const char *substr) } static int -match_bfd_flags (char *string, flagword flags) +match_bfd_flags (const char *string, flagword flags) { if (flags & SEC_ALLOC) if (match_substring (string, "ALLOC")) @@ -324,14 +324,15 @@ maint_print_section_info (const char *name, flagword flags, static void print_bfd_section_info (bfd *abfd, asection *asect, - void *arg) + void *datum) { flagword flags = bfd_get_section_flags (abfd, asect); const char *name = bfd_section_name (abfd, asect); + const char *arg = datum; - if (arg == NULL || *((char *) arg) == '\0' - || match_substring ((char *) arg, name) - || match_bfd_flags ((char *) arg, flags)) + if (arg == NULL || *arg == '\0' + || match_substring (arg, name) + || match_bfd_flags (arg, flags)) { struct gdbarch *gdbarch = gdbarch_from_bfd (abfd); int addr_size = gdbarch_addr_bit (gdbarch) / 8; @@ -348,7 +349,7 @@ print_bfd_section_info (bfd *abfd, static void print_objfile_section_info (bfd *abfd, struct obj_section *asect, - char *string) + const char *string) { flagword flags = bfd_get_section_flags (abfd, asect->the_bfd_section); const char *name = bfd_section_name (abfd, asect->the_bfd_section);