1 files changed, 2 insertions, 2 deletions
diff --git a/bin/trace b/bin/trace
index 39d4889..94ed3df 100755
--- a/bin/trace
+++ b/bin/trace
@@ -215,7 +215,7 @@ sub rewrite_func ($$$$$) {
     }
   } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
     # Replaced an H5TRACE macro
-  } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER_API(_NOINIT)*\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";
@@ -242,7 +242,7 @@ for $file (@ARGV) {
   # Make modifications
   my $original = $Source;
   my $napi = $Source =~ s/\n([A-Za-z]\w*(\s+[a-z]\w*)*)\s*\n #type
-                            (H5[A-Z]{1,2}[^_A-Z]\w*)      #name
+                            (H5[A-Z]{0,2}[^_A-Z]\w*)      #name
                             \s*\((.*?)\)\s*               #args
                             (\{.*?\n\}[^\n]*)             #body
                          /rewrite_func($file,$1,$3,$4,$5)/segx;