From 5ea3517cba2acc87318179858bf03d8f6bfa3d8f Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 26 Feb 2015 19:53:18 -0500 Subject: [svn-r26325] Merge of r26324 from the trunk Fixes another bug in bin/trace that prevents adding TRACE macros to API calls that use a FUNC_ENTER macro that does not include parentheses. This does not affect any source code at this time. Part of: HDFFV-9141 Tested on: jam (bin/trace behavior only) --- bin/trace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/trace b/bin/trace index 40dcc18..f2eaf3b 100755 --- a/bin/trace +++ b/bin/trace @@ -282,7 +282,7 @@ sub rewrite_func ($$$$$) { # Ignored due to NO TRACE comment. } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) { # Replaced an H5TRACE macro. - } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*\(.*?\);??)\n/"$1$2$trace"/es) { + } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*(\(.*?\))?;??)\n/"$1$2$trace"/es) { # Added an H5TRACE macro after a FUNC_ENTER macro. } else { errmesg $file, $name, "unable to insert tracing information"; -- cgit v0.12