[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

@@ -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";