[svn-r21302] Fixed the bin/trace Perl script so that it ignores a final ... parameter, which it can't process. This allows the correct H5TRACE8 trace function to be added to H5Epush2. Tested on jam (simple change).

3 files changed, 6 insertions, 2 deletions

diff --git a/bin/trace b/bin/trace
index 54e881f..7d69824 100755
--- a/bin/trace
+++ b/bin/trace
@@ -219,6 +219,9 @@ sub rewrite_func ($$$$$) {
     my %names;
 
     for $arg (@args) {
+      if($arg=~/\w*\.{3}\w*/){
+        next;
+      }
       unless ($arg=~/^(([a-z_A-Z]\w*\s+)+\**)
 	      ([a-z_A-Z]\w*)(\[.*?\])?
 	      (\s*\/\*\s*(in|out|in_out)\s*\*\/)?\s*$/x) {
diff --git a/configure b/configure
index 16f7628..e329014 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 21248 2011-08-18 14:32:47Z brtnfld .
+# From configure.in Id: configure.in 21275 2011-08-21 03:17:37Z brtnfld .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.9.89.
 #
diff --git a/src/H5E.c b/src/H5E.c
index af78f26..f3107be 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -1338,7 +1338,8 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
 
     /* Don't clear the error stack! :-) */
     FUNC_ENTER_API_NOCLEAR(H5Epush2, FAIL)
-    H5TRACE7("e","issIuiis",err_stack,file,func,line,maj_id,min_id,fmt);
+    H5TRACE8("e", "i*s*sIuiii*s", err_stack, file, func, line, cls_id, maj_id,
+             min_id, fmt);
 
     if(err_stack == H5E_DEFAULT)
     	estack = NULL;