public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
From: jkratoch@sourceware.org
To: archer-commits@sourceware.org
Subject: [SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
Date: Fri, 01 Feb 2013 20:54:00 -0000 [thread overview]
Message-ID: <20130201205449.16329.qmail@sourceware.org> (raw)
The branch, archer-jankratochvil-absdir has been updated
via 37446680fb3c1bc8927e124024eac061479654c2 (commit)
via 8ed7547d2fe2e0e7729e5ee5962d148eea14ed37 (commit)
via 6f1ebd1f200627db807ab497d5b18f90d44dbd99 (commit)
via 64aae5b933cc431d652f787c593ad679c23dde45 (commit)
via 1e4f2108ee1f0adb24d93888ec2b8f953f6170b9 (commit)
via c93b5502530b50e5bd745874e6777b9abeb1a80b (commit)
via 3aaa93045cd6a9bd18be64a65f9e1f1822a0c5a5 (commit)
via eadd34d91157ac955d33c3a22463458dcd4a0d0d (commit)
via b98804af1057d27ea38429ec0b2440b2594d2c4e (commit)
from 2b9902d6567ecebbe196598b67ca65149c116a2b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 37446680fb3c1bc8927e124024eac061479654c2
Merge: 2b9902d 8ed7547
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:54:38 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit 8ed7547d2fe2e0e7729e5ee5962d148eea14ed37
Merge: 3e2bd39 6f1ebd1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix
commit 6f1ebd1f200627db807ab497d5b18f90d44dbd99
Merge: 3c7b612 64aae5b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel
commit 64aae5b933cc431d652f787c593ad679c23dde45
Merge: f33462c 1e4f210
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:28 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal
commit 1e4f2108ee1f0adb24d93888ec2b8f953f6170b9
Merge: 55a6b03 c93b550
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:28 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab
commit c93b5502530b50e5bd745874e6777b9abeb1a80b
Merge: 68f63ad 3aaa930
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:10 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui
Conflicts:
gdb/source.c
commit 3aaa93045cd6a9bd18be64a65f9e1f1822a0c5a5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:51:22 2013 +0100
.
commit eadd34d91157ac955d33c3a22463458dcd4a0d0d
Merge: 1f30d9b b98804a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:38:53 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2
commit b98804af1057d27ea38429ec0b2440b2594d2c4e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:38:41 2013 +0100
.
-----------------------------------------------------------------------
Summary of changes:
gdb/ada-lang.c | 7 ++++---
gdb/breakpoint.c | 12 +++++++-----
gdb/cli/cli-cmds.c | 12 +++++++-----
gdb/dwarf2read.c | 2 +-
gdb/linux-fork.c | 3 ++-
gdb/macroscope.c | 2 +-
gdb/mdebugread.c | 3 ++-
gdb/mi/mi-cmd-file.c | 5 +++--
gdb/printcmd.c | 2 +-
gdb/python/py-symtab.c | 6 +++---
gdb/skip.c | 3 ++-
gdb/source.c | 38 ++++++++++++++++++++++----------------
gdb/source.h | 2 +-
gdb/stack.c | 8 +++++---
gdb/symmisc.c | 10 +++++-----
gdb/symtab.c | 10 +++++-----
gdb/tracepoint.c | 10 ++++++----
gdb/tui/tui-source.c | 10 ++++++----
18 files changed, 83 insertions(+), 62 deletions(-)
First 500 lines of diff:
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index cc29635..f896aa9 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3573,7 +3573,8 @@ See set/show multiple-symbol."));
else
printf_unfiltered (_("[%d] %s at %s:%d\n"), i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab),
+ sal.line);
continue;
}
else
@@ -3588,7 +3589,7 @@ See set/show multiple-symbol."));
printf_unfiltered (_("[%d] %s at %s:%d\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
- symtab_to_filename (symtab),
+ symtab_to_filename_for_display (symtab),
SYMBOL_LINE (syms[i].sym));
else if (is_enumeral
&& TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
@@ -3605,7 +3606,7 @@ See set/show multiple-symbol."));
: _("[%d] %s at %s:?\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
- symtab_to_filename (symtab));
+ symtab_to_filename_for_display (symtab));
else
printf_unfiltered (is_enumeral
? _("[%d] %s (enumeral)\n")
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 2786f01..026ce73 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5707,7 +5707,8 @@ print_breakpoint_location (struct breakpoint *b,
ui_out_wrap_hint (uiout, wrap_indent_at_field (uiout, "what"));
ui_out_text (uiout, "at ");
}
- ui_out_field_string (uiout, "file", symtab_to_filename (loc->symtab));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (loc->symtab));
ui_out_text (uiout, ":");
if (ui_out_is_mi_like_p (uiout))
@@ -9770,7 +9771,7 @@ resolve_sal_pc (struct symtab_and_line *sal)
{
if (!find_line_pc (sal->symtab, sal->line, &pc))
error (_("No line %d in file \"%s\"."),
- sal->line, symtab_to_filename (sal->symtab));
+ sal->line, symtab_to_filename_for_display (sal->symtab));
sal->pc = pc;
/* If this SAL corresponds to a breakpoint inserted using a line
@@ -12728,7 +12729,7 @@ say_where (struct breakpoint *b)
more nicely. */
if (b->loc->next == NULL)
printf_filtered (": file %s, line %d.",
- symtab_to_filename (b->loc->symtab),
+ symtab_to_filename_for_display (b->loc->symtab),
b->loc->line_number);
else
/* This is not ideal, but each location may have a
@@ -13928,7 +13929,8 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal)
SYMBOL_PRINT_NAME (sym));
ui_out_text (uiout, " at ");
}
- ui_out_field_string (uiout, "file", symtab_to_filename (sal2.symtab));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (sal2.symtab));
ui_out_text (uiout, ":");
if (ui_out_is_mi_like_p (uiout))
@@ -13946,7 +13948,7 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal)
xfree (b->addr_string);
b->addr_string = xstrprintf ("%s:%d",
- symtab_to_filename (sal2.symtab),
+ symtab_to_filename_for_display (sal2.symtab),
b->loc->line_number);
/* Might be nice to check if function changed, and warn if
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index c49c156..d9bf80f 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -818,11 +818,13 @@ edit_command (char *arg, int from_tty)
printf_filtered ("%s is in %s (%s:%d).\n",
paddress (gdbarch, sal.pc),
SYMBOL_PRINT_NAME (sym),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab),
+ sal.line);
else
printf_filtered ("%s is at %s:%d.\n",
paddress (gdbarch, sal.pc),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab),
+ sal.line);
}
/* If what was given does not imply a symtab, it must be an
@@ -981,11 +983,11 @@ list_command (char *arg, int from_tty)
printf_filtered ("%s is in %s (%s:%d).\n",
paddress (gdbarch, sal.pc),
SYMBOL_PRINT_NAME (sym),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab), sal.line);
else
printf_filtered ("%s is at %s:%d.\n",
paddress (gdbarch, sal.pc),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab), sal.line);
}
/* If line was not specified by just a line number, and it does not
@@ -1445,7 +1447,7 @@ ambiguous_line_spec (struct symtabs_and_lines *sals)
for (i = 0; i < sals->nelts; ++i)
printf_filtered (_("file: \"%s\", line number: %d\n"),
- symtab_to_filename (sals->sals[i].symtab),
+ symtab_to_filename_for_display (sals->sals[i].symtab),
sals->sals[i].line);
}
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c94a218..d26e7c8 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6819,7 +6819,7 @@ fixup_go_packaging (struct dwarf2_cu *cu)
complaint (&symfile_complaints,
_("Symtab %s has objects from two different Go packages: %s and %s"),
(SYMBOL_SYMTAB (sym)
- ? symtab_to_filename (SYMBOL_SYMTAB (sym))
+ ? symtab_to_filename_for_display (SYMBOL_SYMTAB (sym))
: cu->objfile->name),
this_package_name, package_name);
xfree (this_package_name);
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index f840863..2151401 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -584,7 +584,8 @@ info_checkpoints_command (char *arg, int from_tty)
sal = find_pc_line (pc, 0);
if (sal.symtab)
- printf_filtered (_(", file %s"), symtab_to_filename (sal.symtab));
+ printf_filtered (_(", file %s"),
+ symtab_to_filename_for_display (sal.symtab));
if (sal.line)
printf_filtered (_(", line %d"), sal.line);
if (!sal.symtab && !sal.line)
diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index fba343d..03f9df4 100644
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -77,7 +77,7 @@ sal_macro_scope (struct symtab_and_line sal)
complaint (&symfile_complaints,
_("symtab found for `%s', but that file\n"
"is not covered in the compilation unit's macro information"),
- symtab_to_filename (sal.symtab));
+ symtab_to_filename_for_display (sal.symtab));
}
return ms;
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index c6a7943..2fed944 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -4344,7 +4344,8 @@ psymtab_to_symtab_1 (struct objfile *objfile,
if (info_verbose && n_undef_symbols)
{
printf_filtered (_("File %s contains %d unresolved references:"),
- symtab_to_filename (st), n_undef_symbols);
+ symtab_to_filename_for_display (st),
+ n_undef_symbols);
printf_filtered ("\n\t%4d variables\n\t%4d "
"procedures\n\t%4d labels\n",
n_undef_vars, n_undef_procs, n_undef_labels);
diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 721adf4..07d9722 100644
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -50,7 +50,8 @@ mi_cmd_file_list_exec_source_file (char *command, char **argv, int argc)
/* Print to the user the line, filename and fullname. */
ui_out_field_int (uiout, "line", st.line);
- ui_out_field_string (uiout, "file", symtab_to_filename (st.symtab));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (st.symtab));
ui_out_field_string (uiout, "fullname", symtab_to_fullname (st.symtab));
@@ -93,7 +94,7 @@ mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc)
{
ui_out_begin (uiout, ui_out_type_tuple, NULL);
- ui_out_field_string (uiout, "file", symtab_to_filename (s));
+ ui_out_field_string (uiout, "file", symtab_to_filename_for_display (s));
ui_out_field_string (uiout, "fullname", symtab_to_fullname (s));
ui_out_end (uiout, ui_out_type_tuple);
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index ecffe5c..d94d28d 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -725,7 +725,7 @@ build_address_symbolic (struct gdbarch *gdbarch,
if (sal.symtab)
{
- *filename = xstrdup (symtab_to_filename (sal.symtab));
+ *filename = xstrdup (symtab_to_filename_for_display (sal.symtab));
*line = sal.line;
}
}
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c
index f06d556..6fa8ecb 100644
--- a/gdb/python/py-symtab.c
+++ b/gdb/python/py-symtab.c
@@ -91,7 +91,7 @@ stpy_str (PyObject *self)
STPY_REQUIRE_VALID (self, symtab);
- result = PyString_FromString (symtab_to_filename (symtab));
+ result = PyString_FromString (symtab_to_filename_for_display (symtab));
return result;
}
@@ -104,7 +104,7 @@ stpy_get_filename (PyObject *self, void *closure)
const char *filename;
STPY_REQUIRE_VALID (self, symtab);
- filename = symtab_to_filename (symtab);
+ filename = symtab_to_filename_for_display (symtab);
str_obj = PyString_Decode (filename, strlen (filename),
host_charset (), NULL);
@@ -197,7 +197,7 @@ salpy_str (PyObject *self)
sal_obj = (sal_object *) self;
filename = (sal_obj->symtab == (symtab_object *) Py_None)
- ? "<unknown>" : symtab_to_filename (sal_obj->symtab->symtab);
+ ? "<unknown>" : symtab_to_filename_for_display (sal_obj->symtab->symtab);
s = xstrprintf ("symbol and line for %s, line %d", filename,
sal->line);
diff --git a/gdb/skip.c b/gdb/skip.c
index be9004b..0c002ff 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -82,7 +82,8 @@ skip_file_command (char *arg, int from_tty)
if (symtab == NULL)
error (_("No default file now."));
- /* It is not a typo, symtab_to_filename woule be needlessly ambiguous. */
+ /* It is not a typo, symtab_to_filename_for_display woule be needlessly
+ ambiguous. */
filename = symtab_to_fullname (symtab);
}
else
diff --git a/gdb/source.c b/gdb/source.c
index c577283..d18e003 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1143,7 +1143,7 @@ symtab_to_fullname (struct symtab *s)
/* See commentary in source.h. */
const char *
-symtab_to_filename (struct symtab *symtab)
+symtab_to_filename_for_display (struct symtab *symtab)
{
if (filename_display_string == filename_display_basename)
return lbasename (symtab->filename);
@@ -1182,7 +1182,7 @@ find_source_lines (struct symtab *s, int desc)
gdb_assert (s);
line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
if (fstat (desc, &st) < 0)
- perror_with_name (symtab_to_filename (s));
+ perror_with_name (symtab_to_filename_for_display (s));
if (s->objfile && s->objfile->obfd)
mtime = s->objfile->mtime;
@@ -1207,7 +1207,7 @@ find_source_lines (struct symtab *s, int desc)
/* Reassign `size' to result of read for systems where \r\n -> \n. */
size = myread (desc, data, size);
if (size < 0)
- perror_with_name (symtab_to_filename (s));
+ perror_with_name (symtab_to_filename_for_display (s));
end = data + size;
p = data;
line_charpos[0] = 0;
@@ -1348,7 +1348,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
if (!(flags & PRINT_SOURCE_LINES_NOERROR))
{
- const char *filename = symtab_to_filename (s);
+ const char *filename = symtab_to_filename_for_display (s);
int len = strlen (filename) + 100;
char *name = alloca (len);
@@ -1359,7 +1359,8 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
{
ui_out_field_int (uiout, "line", line);
ui_out_text (uiout, "\tin ");
- ui_out_field_string (uiout, "file", symtab_to_filename (s));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (s));
/* TUI expects the "fullname" field. While it is
!ui_out_is_mi_like_p compared to CLI it is !ui_source_list. */
@@ -1385,13 +1386,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
{
close (desc);
error (_("Line number %d out of range; %s has %d lines."),
- line, symtab_to_filename (s), s->nlines);
+ line, symtab_to_filename_for_display (s), s->nlines);
}
if (lseek (desc, s->line_charpos[line - 1], 0) < 0)
{
close (desc);
- perror_with_name (symtab_to_filename (s));
+ perror_with_name (symtab_to_filename_for_display (s));
}
stream = fdopen (desc, FDOPEN_MODE);
@@ -1408,7 +1409,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
last_line_listed = current_source_line;
if (flags & PRINT_SOURCE_LINES_FILENAME)
{
- ui_out_text (uiout, symtab_to_filename (s));
+ ui_out_text (uiout, symtab_to_filename_for_display (s));
ui_out_text (uiout, ":");
}
xsnprintf (buf, sizeof (buf), "%d\t", current_source_line++);
@@ -1522,7 +1523,8 @@ line_info (char *arg, int from_tty)
if (start_pc == end_pc)
{
printf_filtered ("Line %d of \"%s\"",
- sal.line, symtab_to_filename (sal.symtab));
+ sal.line,
+ symtab_to_filename_for_display (sal.symtab));
wrap_here (" ");
printf_filtered (" is at address ");
print_address (gdbarch, start_pc, gdb_stdout);
@@ -1532,7 +1534,8 @@ line_info (char *arg, int from_tty)
else
{
printf_filtered ("Line %d of \"%s\"",
- sal.line, symtab_to_filename (sal.symtab));
+ sal.line,
+ symtab_to_filename_for_display (sal.symtab));
wrap_here (" ");
printf_filtered (" starts at address ");
print_address (gdbarch, start_pc, gdb_stdout);
@@ -1558,7 +1561,7 @@ line_info (char *arg, int from_tty)
which the user would want to see? If we have debugging symbols
and no line numbers? */
printf_filtered (_("Line number %d is out of range for \"%s\".\n"),
- sal.line, symtab_to_filename (sal.symtab));
+ sal.line, symtab_to_filename_for_display (sal.symtab));
}
do_cleanups (cleanups);
}
@@ -1586,7 +1589,7 @@ forward_search_command (char *regex, int from_tty)
desc = open_source_file (current_source_symtab);
if (desc < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
cleanups = make_cleanup_close (desc);
if (current_source_symtab->line_charpos == 0)
@@ -1596,7 +1599,7 @@ forward_search_command (char *regex, int from_tty)
error (_("Expression not found"));
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
discard_cleanups (cleanups);
stream = fdopen (desc, FDOPEN_MODE);
@@ -1675,7 +1678,7 @@ reverse_search_command (char *regex, int from_tty)
desc = open_source_file (current_source_symtab);
if (desc < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
cleanups = make_cleanup_close (desc);
if (current_source_symtab->line_charpos == 0)
@@ -1685,7 +1688,7 @@ reverse_search_command (char *regex, int from_tty)
error (_("Expression not found"));
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
discard_cleanups (cleanups);
stream = fdopen (desc, FDOPEN_MODE);
@@ -1728,8 +1731,11 @@ reverse_search_command (char *regex, int from_tty)
line--;
if (fseek (stream, current_source_symtab->line_charpos[line - 1], 0) < 0)
{
+ const char *filename;
+
do_cleanups (cleanups);
- perror_with_name (symtab_to_filename (current_source_symtab));
+ filename = symtab_to_filename_for_display (current_source_symtab);
+ perror_with_name (filename);
}
}
diff --git a/gdb/source.h b/gdb/source.h
index 643c056..33cad09 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -54,7 +54,7 @@ extern const char *symtab_to_fullname (struct symtab *s);
/* Returns filename without the compile directory part, basename or absolute
filename. It depends on 'set filename-display' value. */
-extern const char *symtab_to_filename (struct symtab *symtab);
+extern const char *symtab_to_filename_for_display (struct symtab *symtab);
/* Create and initialize the table S->line_charpos that records the
positions of the lines in the source file, which is assumed to be
diff --git a/gdb/stack.c b/gdb/stack.c
index 6c8f2af..bfec1b8 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1178,8 +1178,9 @@ print_frame (struct frame_info *frame, int print_level,
ui_out_text (uiout, ")");
if (sal.symtab)
{
- const char *filename_display = symtab_to_filename (sal.symtab);
-
+ const char *filename_display;
+
+ filename_display = symtab_to_filename_for_display (sal.symtab);
annotate_frame_source_begin ();
ui_out_wrap_hint (uiout, " ");
ui_out_text (uiout, " at ");
@@ -1459,7 +1460,8 @@ frame_info (char *addr_exp, int from_tty)
}
wrap_here (" ");
if (sal.symtab)
- printf_filtered (" (%s:%d)", symtab_to_filename (sal.symtab), sal.line);
+ printf_filtered (" (%s:%d)", symtab_to_filename_for_display (sal.symtab),
+ sal.line);
puts_filtered ("; ");
wrap_here (" ");
printf_filtered ("saved %s ", pc_regname);
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index b8587ae..5fa4e4e 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -186,7 +186,7 @@ dump_objfile (struct objfile *objfile)
symtab != NULL;
symtab = symtab->next)
{
- printf_filtered ("%s at ", symtab_to_filename (symtab));
+ printf_filtered ("%s at ", symtab_to_filename_for_display (symtab));
gdb_print_host_address (symtab, gdb_stdout);
printf_filtered (", ");
if (symtab->objfile != objfile)
@@ -296,7 +296,7 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab,
int depth;
fprintf_filtered (outfile, "\nSymtab for file %s\n",
- symtab_to_filename (symtab));
+ symtab_to_filename_for_display (symtab));
if (symtab->dirname)
fprintf_filtered (outfile, "Compilation directory is %s\n",
symtab->dirname);
@@ -446,7 +446,7 @@ maintenance_print_symbols (char *args, int from_tty)
{
QUIT;
if (symname == NULL
- || filename_cmp (symname, symtab_to_filename (s)) == 0)
+ || filename_cmp (symname, symtab_to_filename_for_display (s)) == 0)
dump_symtab (objfile, s, outfile);
}
do_cleanups (cleanups);
@@ -727,7 +727,7 @@ maintenance_info_symtabs (char *regexp, int from_tty)
QUIT;
if (! regexp
- || re_exec (symtab_to_filename (symtab)))
+ || re_exec (symtab_to_filename_for_display (symtab)))
{
if (! printed_objfile_start)
{
@@ -739,7 +739,7 @@ maintenance_info_symtabs (char *regexp, int from_tty)
}
printf_filtered (" { symtab %s ",
- symtab_to_filename (symtab));
+ symtab_to_filename_for_display (symtab));
wrap_here (" ");
hooks/post-receive
--
Repository for Project Archer.
next reply other threads:[~2013-02-01 20:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 20:54 jkratoch [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-03 15:40 jkratoch
2013-02-01 20:35 jkratoch
2013-01-30 7:49 jkratoch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130201205449.16329.qmail@sourceware.org \
--to=jkratoch@sourceware.org \
--cc=archer-commits@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).