From 69150c3d5af696f56fac619ceb0756319ca5074b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 19 Sep 2013 12:44:46 +0000 Subject: [PATCH] Mostly code cleanup: Constification. gdb/ 2013-09-19 Jan Kratochvil Constification. * main.c (captured_main): Replace catch_command_errors by catch_command_errors_const. Twice. * symfile.c (symbol_file_add_main_1): Make args parameter const. (symbol_file_add): Make name parameter const. (symbol_file_add_main, symbol_file_add_main_1): Make args parameter const. (symfile_bfd_open): Make name parameter const, rename it to cname. Add variable name. Change their usage accordingly. * symfile.h (symbol_file_add, symfile_bfd_open): Make first parameter const. (symbol_file_add_main): Make args parameter const. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/main.c | 8 ++++---- gdb/symfile.c | 24 ++++++++++++------------ gdb/symfile.h | 6 +++--- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8be06b1f119..0fadddf2e95 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2013-09-19 Jan Kratochvil + + Constification. + * main.c (captured_main): Replace catch_command_errors by + catch_command_errors_const. Twice. + * symfile.c (symbol_file_add_main_1): Make args parameter const. + (symbol_file_add): Make name parameter const. + (symbol_file_add_main, symbol_file_add_main_1): Make args parameter const. + (symfile_bfd_open): Make name parameter const, rename it to cname. Add + variable name. Change their usage accordingly. + * symfile.h (symbol_file_add, symfile_bfd_open): Make first parameter + const. + (symbol_file_add_main): Make args parameter const. + 2013-09-18 Raunaq Bathija Ulrich Weigand diff --git a/gdb/main.c b/gdb/main.c index 3e0e1fe8c9c..7ff9183c9c5 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -957,8 +957,8 @@ captured_main (void *data) catch_command_errors returns non-zero on success! */ if (catch_command_errors (exec_file_attach, execarg, !batch_flag, RETURN_MASK_ALL)) - catch_command_errors (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (symbol_file_add_main, symarg, + !batch_flag, RETURN_MASK_ALL); } else { @@ -966,8 +966,8 @@ captured_main (void *data) catch_command_errors (exec_file_attach, execarg, !batch_flag, RETURN_MASK_ALL); if (symarg != NULL) - catch_command_errors (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (symbol_file_add_main, symarg, + !batch_flag, RETURN_MASK_ALL); } if (corearg && pidarg) diff --git a/gdb/symfile.c b/gdb/symfile.c index ac307728b72..284f0648345 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -87,7 +87,7 @@ int readnow_symbol_files; /* Read full symbols immediately. */ static void load_command (char *, int); -static void symbol_file_add_main_1 (char *args, int from_tty, int flags); +static void symbol_file_add_main_1 (const char *args, int from_tty, int flags); static void add_symbol_file_command (char *, int); @@ -1200,8 +1200,8 @@ symbol_file_add_from_bfd (bfd *abfd, int add_flags, loaded file. See symbol_file_add_with_addrs's comments for details. */ struct objfile * -symbol_file_add (char *name, int add_flags, struct section_addr_info *addrs, - int flags) +symbol_file_add (const char *name, int add_flags, + struct section_addr_info *addrs, int flags) { bfd *bfd = symfile_bfd_open (name); struct cleanup *cleanup = make_cleanup_bfd_unref (bfd); @@ -1221,13 +1221,13 @@ symbol_file_add (char *name, int add_flags, struct section_addr_info *addrs, command itself. */ void -symbol_file_add_main (char *args, int from_tty) +symbol_file_add_main (const char *args, int from_tty) { symbol_file_add_main_1 (args, from_tty, 0); } static void -symbol_file_add_main_1 (char *args, int from_tty, int flags) +symbol_file_add_main_1 (const char *args, int from_tty, int flags) { const int add_flags = (current_inferior ()->symfile_flags | SYMFILE_MAINLINE | (from_tty ? SYMFILE_VERBOSE : 0)); @@ -1652,31 +1652,31 @@ gdb_bfd_open_maybe_remote (const char *name) absolute). In case of trouble, error() is called. */ bfd * -symfile_bfd_open (char *name) +symfile_bfd_open (const char *cname) { bfd *sym_bfd; int desc; - char *absolute_name; + char *name, *absolute_name; struct cleanup *back_to; - if (remote_filename_p (name)) + if (remote_filename_p (cname)) { - sym_bfd = remote_bfd_open (name, gnutarget); + sym_bfd = remote_bfd_open (cname, gnutarget); if (!sym_bfd) - error (_("`%s': can't open to read symbols: %s."), name, + error (_("`%s': can't open to read symbols: %s."), cname, bfd_errmsg (bfd_get_error ())); if (!bfd_check_format (sym_bfd, bfd_object)) { make_cleanup_bfd_unref (sym_bfd); - error (_("`%s': can't read symbols: %s."), name, + error (_("`%s': can't read symbols: %s."), cname, bfd_errmsg (bfd_get_error ())); } return sym_bfd; } - name = tilde_expand (name); /* Returns 1st new malloc'd copy. */ + name = tilde_expand (cname); /* Returns 1st new malloc'd copy. */ /* Look down path for it, allocate 2nd new malloc'd copy. */ desc = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, name, diff --git a/gdb/symfile.h b/gdb/symfile.h index 4371cf4732c..9d2418409b1 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -477,7 +477,7 @@ enum symfile_add_flags extern void new_symfile_objfile (struct objfile *, int); -extern struct objfile *symbol_file_add (char *, int, +extern struct objfile *symbol_file_add (const char *, int, struct section_addr_info *, int); extern struct objfile *symbol_file_add_from_bfd (bfd *, int, @@ -528,7 +528,7 @@ extern void set_initial_language (void); extern void find_lowest_section (bfd *, asection *, void *); -extern bfd *symfile_bfd_open (char *); +extern bfd *symfile_bfd_open (const char *); extern bfd *gdb_bfd_open_maybe_remote (const char *); @@ -572,7 +572,7 @@ extern CORE_ADDR overlay_unmapped_address (CORE_ADDR, struct obj_section *); extern CORE_ADDR symbol_overlayed_address (CORE_ADDR, struct obj_section *); /* Load symbols from a file. */ -extern void symbol_file_add_main (char *args, int from_tty); +extern void symbol_file_add_main (const char *args, int from_tty); /* Clear GDB symbol tables. */ extern void symbol_file_clear (int from_tty); -- 2.30.2