diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2013-09-19 12:44:45 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2013-09-19 12:44:45 +0000 |
| commit | bf70f69596aebfe8c461c3b95e4e38adbf834860 (patch) | |
| tree | ede8fb9cbf1704c9279965febca5afda37a64e99 /gdb/symfile.c | |
| parent | f8c5cdb04084c92be52cfcb47522d6f1185d764d (diff) | |
| download | gdb-bf70f69596aebfe8c461c3b95e4e38adbf834860.tar.gz | |
Mostly code cleanup: Constification.
gdb/
2013-09-19 Jan Kratochvil <jan.kratochvil@redhat.com>
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.
Diffstat (limited to 'gdb/symfile.c')
| -rw-r--r-- | gdb/symfile.c | 24 |
1 files changed, 12 insertions, 12 deletions
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, |