From a7417d468b5c4fcb75e459e318dae1245e0fa465 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 25 Mar 2011 09:57:37 +0000 Subject: [PATCH] 2011-03-25 Kai Tietz * tui/tui-source.c (tui_set_source_content): Use filename_cmp instead of strcmp for comparison. (tui_source_is_displayed): Likewise. * tui/tui-winsource.c (tui_update_breakpoint_info): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-source.c | 15 ++++++++------- gdb/tui/tui-winsource.c | 3 ++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b9e72dc3d9..116b75ada38 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-03-25 Kai Tietz + + * tui/tui-source.c (tui_set_source_content): Use filename_cmp + instead of strcmp for comparison. + (tui_source_is_displayed): Likewise. + * tui/tui-winsource.c (tui_update_breakpoint_info): Likewise. + 2011-03-24 Mark Wielaard * dwarf2read.c (lookup_signatured_type): Use DW_FORM_ref_sig8 in diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index a46797c966d..240ea430141 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -28,6 +28,7 @@ #include "source.h" #include "symtab.h" #include "objfiles.h" +#include "filenames.h" #include "tui/tui.h" #include "tui/tui-data.h" @@ -149,9 +150,9 @@ tui_set_source_content (struct symtab *s, element->which_element.source.line_or_addr.u.line_no = cur_line_no; element->which_element.source.is_exec_point = - (strcmp (((struct tui_win_element *) - locator->content[0])->which_element.locator.file_name, - s->filename) == 0 + (filename_cmp (((struct tui_win_element *) + locator->content[0])->which_element.locator.file_name, + s->filename) == 0 && cur_line_no == ((struct tui_win_element *) locator->content[0])->which_element.locator.line_no); if (c != EOF) @@ -335,10 +336,10 @@ int tui_source_is_displayed (char *fname) { return (TUI_SRC_WIN->generic.content_in_use - && (strcmp (((struct tui_win_element *) - (tui_locator_win_info_ptr ())-> - content[0])->which_element.locator.file_name, - fname) == 0)); + && (filename_cmp (((struct tui_win_element *) + (tui_locator_win_info_ptr ())-> + content[0])->which_element.locator.file_name, + fname) == 0)); } diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index a7b59458141..4c8658d5156 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -28,6 +28,7 @@ #include "value.h" #include "source.h" #include "objfiles.h" +#include "filenames.h" #include "tui/tui.h" #include "tui/tui-data.h" @@ -458,7 +459,7 @@ tui_update_breakpoint_info (struct tui_win_info *win, || line->line_or_addr.loa == LOA_ADDRESS); if ((win == TUI_SRC_WIN && bp->source_file - && (strcmp (src->filename, bp->source_file) == 0) + && (filename_cmp (src->filename, bp->source_file) == 0) && line->line_or_addr.loa == LOA_LINE && bp->line_number == line->line_or_addr.u.line_no) || (win == TUI_DISASM_WIN -- 2.30.2