From aee9ba6f903510a47ea5e0bd524806f366dfd82a Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 28 Feb 2011 18:36:14 +0000 Subject: [PATCH] 2011-02-28 Kai Tietz * basic_blocks.c (cmp_bb): Use filename_(n)cmp. * cg_print.c (order_and_dump_functions_by_arcs): Likewise. (cg_print_file_ordering): Likewise. * corefile.c (read_function_mappings): Likewise. (core_create_line_syms): Likewise. --- gprof/ChangeLog | 8 ++++++++ gprof/basic_blocks.c | 3 ++- gprof/cg_print.c | 10 ++++++---- gprof/corefile.c | 8 +++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index d59794fbcf3..635625c775c 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,11 @@ +2011-02-28 Kai Tietz + + * basic_blocks.c (cmp_bb): Use filename_(n)cmp. + * cg_print.c (order_and_dump_functions_by_arcs): Likewise. + (cg_print_file_ordering): Likewise. + * corefile.c (read_function_mappings): Likewise. + (core_create_line_syms): Likewise. + 2011-02-13 Ralf Wildenhues * configure: Regenerate. diff --git a/gprof/basic_blocks.c b/gprof/basic_blocks.c index 20dd7c3b19d..3946cf29493 100644 --- a/gprof/basic_blocks.c +++ b/gprof/basic_blocks.c @@ -24,6 +24,7 @@ #include "gprof.h" #include "libiberty.h" +#include "filenames.h" #include "basic_blocks.h" #include "corefile.h" #include "gmon_io.h" @@ -61,7 +62,7 @@ cmp_bb (const PTR lp, const PTR rp) if (left->file && right->file) { - r = strcmp (left->file->name, right->file->name); + r = filename_cmp (left->file->name, right->file->name); if (r) return r; diff --git a/gprof/cg_print.c b/gprof/cg_print.c index c1cb400681b..c1a2a31df00 100644 --- a/gprof/cg_print.c +++ b/gprof/cg_print.c @@ -22,6 +22,7 @@ #include "gprof.h" #include "libiberty.h" +#include "filenames.h" #include "search_list.h" #include "source.h" #include "symtab.h" @@ -1221,8 +1222,8 @@ order_and_dump_functions_by_arcs (the_arcs, arc_count, all, static int cmp_symbol_map (const void * l, const void * r) { - return strcmp (((struct function_map *) l)->file_name, - ((struct function_map *) r)->file_name); + return filename_cmp (((struct function_map *) l)->file_name, + ((struct function_map *) r)->file_name); } /* Print a suggested .o ordering for files on a link line based @@ -1269,7 +1270,7 @@ cg_print_file_ordering (void) /* Don't bother searching if this symbol is the same as the previous one. */ - if (last && !strcmp (last, symbol_map[sym_index].file_name)) + if (last && !filename_cmp (last, symbol_map[sym_index].file_name)) continue; for (index2 = 0; index2 < symtab.len; index2++) @@ -1277,7 +1278,8 @@ cg_print_file_ordering (void) if (! symtab.base[index2].mapped) continue; - if (!strcmp (symtab.base[index2].name, symbol_map[sym_index].file_name)) + if (!filename_cmp (symtab.base[index2].name, + symbol_map[sym_index].file_name)) break; } diff --git a/gprof/corefile.c b/gprof/corefile.c index fd4644bfbd8..2d772f98031 100644 --- a/gprof/corefile.c +++ b/gprof/corefile.c @@ -22,6 +22,7 @@ #include "gprof.h" #include "libiberty.h" +#include "filenames.h" #include "search_list.h" #include "source.h" #include "symtab.h" @@ -157,7 +158,8 @@ read_function_mappings (const char *filename) symbol_map_count = count; for (i = 0; i < symbol_map_count; ++i) - if (i == 0 || strcmp (symbol_map[i].file_name, symbol_map[i - 1].file_name)) + if (i == 0 + || filename_cmp (symbol_map[i].file_name, symbol_map[i - 1].file_name)) symbol_map[i].is_first = 1; qsort (symbol_map, symbol_map_count, sizeof (struct function_map), cmp_symbol_map); @@ -766,7 +768,7 @@ core_create_line_syms (void) || (prev_line_num == dummy.line_num && prev_name != NULL && strcmp (prev_name, dummy.name) == 0 - && strcmp (prev_filename, filename) == 0)) + && filename_cmp (prev_filename, filename) == 0)) continue; ++ltab.len; @@ -831,7 +833,7 @@ core_create_line_syms (void) if (!get_src_info (vma, &filename, <ab.limit->name, <ab.limit->line_num) || (prev && prev->line_num == ltab.limit->line_num && strcmp (prev->name, ltab.limit->name) == 0 - && strcmp (prev->file->name, filename) == 0)) + && filename_cmp (prev->file->name, filename) == 0)) continue; /* Make name pointer a malloc'ed string. */ -- 2.30.2