diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2013-02-03 16:00:36 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2013-02-03 16:00:36 +0000 |
| commit | af529f8f61348016fc75bcb2e09c8f5d8bd1cc3a (patch) | |
| tree | 35fad556c4526038451b6e46eb1c7264e94dfc54 /gdb/psymtab.c | |
| parent | 2f202fde0a4586f88b98439b436e7b0bb1336b26 (diff) | |
| download | gdb-af529f8f61348016fc75bcb2e09c8f5d8bd1cc3a.zip gdb-af529f8f61348016fc75bcb2e09c8f5d8bd1cc3a.tar.gz gdb-af529f8f61348016fc75bcb2e09c8f5d8bd1cc3a.tar.bz2 | |
gdb/
Code cleanup.
* breakpoint.c (clear_command): Remove variable is_abs, unify the
call of filename_cmp with compare_filenames_for_search.
* dwarf2read.c (dw2_map_symtabs_matching_filename): Remove variable
is_abs, unify the call of FILENAME_CMP with
compare_filenames_for_search. New gdb_asserts for real_path and name.
Unify the call of compare_filenames_for_search with FILENAME_CMP.
* psymtab.c (partial_map_symtabs_matching_filename): Likewise.
* symfile.h (struct quick_symbol_functions): Extend the comment for
map_symtabs_matching_filename.
* symtab.c (compare_filenames_for_search): Remove the function comment
relative path requirement. Handle absolute filenames, with a comment.
(iterate_over_some_symtabs): Remove variable is_abs, unify the call of
FILENAME_CMP with compare_filenames_for_search. New gdb_asserts for
real_path and name. Unify the call of compare_filenames_for_search
with FILENAME_CMP.
(iterate_over_symtabs): New gdb_assert on REAL_PATH.
gdb/testsuite/
* gdb.mi/mi-fullname-deleted.exp: Use double last slash for $srcfileabs.
(compare_filenames_for_search does not match)
(compare_filenames_for_search does match): New tests.
Diffstat (limited to 'gdb/psymtab.c')
| -rw-r--r-- | gdb/psymtab.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdb/psymtab.c b/gdb/psymtab.c index efe8b13..4e5ffb8 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -166,7 +166,6 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, { struct partial_symtab *pst; const char *name_basename = lbasename (name); - int is_abs = IS_ABSOLUTE_PATH (name); ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, pst) { @@ -179,8 +178,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, if (pst->anonymous) continue; - if (FILENAME_CMP (name, pst->filename) == 0 - || (!is_abs && compare_filenames_for_search (pst->filename, name))) + if (compare_filenames_for_search (pst->filename, name)) { if (partial_map_expand_apply (objfile, name, real_path, pst, callback, data)) @@ -197,10 +195,11 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, this symtab and use its absolute path. */ if (real_path != NULL) { + gdb_assert (IS_ABSOLUTE_PATH (real_path)); + gdb_assert (IS_ABSOLUTE_PATH (name)); psymtab_to_fullname (pst); if (pst->fullname != NULL - && (FILENAME_CMP (real_path, pst->fullname) == 0 - || (!is_abs && compare_filenames_for_search (real_path, name)))) + && FILENAME_CMP (real_path, pst->fullname) == 0) { if (partial_map_expand_apply (objfile, name, real_path, pst, callback, data)) |