From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Wed, 1 May 2002 21:52:05 +0000 (+0000)
Subject: fix for auto-annotating C++ method names (they have :'s in it)
X-Git-Tag: svn/VALGRIND_1_0_3~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303554e3ad002373b423bd196422385521e4f9bd;p=thirdparty%2Fvalgrind.git

fix for auto-annotating C++ method names (they have :'s in it)


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@191
---

diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index 1a532ca52d..088f79b267 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -625,7 +625,7 @@ sub print_summary_and_fn_totals ()
 
         # Update the threshold counting
         my $filename = $fn_name;
-        $filename =~ s/:[^:]+$//;    # remove function name
+        $filename =~ s/:.+$//;    # remove function name
         $threshold_files->{$filename} = 1;
         $curr_total += $fn_CC->[$threshold_event_index] 
             if (defined $fn_CC->[$threshold_event_index]);
diff --git a/vg_annotate.in b/vg_annotate.in
index 1a532ca52d..088f79b267 100644
--- a/vg_annotate.in
+++ b/vg_annotate.in
@@ -625,7 +625,7 @@ sub print_summary_and_fn_totals ()
 
         # Update the threshold counting
         my $filename = $fn_name;
-        $filename =~ s/:[^:]+$//;    # remove function name
+        $filename =~ s/:.+$//;    # remove function name
         $threshold_files->{$filename} = 1;
         $curr_total += $fn_CC->[$threshold_event_index] 
             if (defined $fn_CC->[$threshold_event_index]);