From a9039e329f1264298e4505f687c4fb98c7016072 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 25 Aug 2011 16:11:08 -0500 Subject: [svn-r21314] Merge of 21302 (bin/trace bugfix) from trunk. Tested on jam (minor change). --- bin/trace | 3 +++ configure | 2 +- release_docs/RELEASE.txt | 12 +++++++++--- src/H5E.c | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bin/trace b/bin/trace index 4ccf74c..cac53be 100755 --- a/bin/trace +++ b/bin/trace @@ -216,6 +216,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 141e98e..21fb5b7 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 21226 2011-08-15 00:38:01Z hdftest . +# From configure.in Id: configure.in 21276 2011-08-22 01:37:29Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for HDF5 1.8.8-snap11. # diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index d21dfde..c011948 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -103,9 +103,12 @@ Bug Fixes since HDF5-1.8.7 compiled into h5dump. Please refer to the h5dump reference manual for usage of the packed bits feature. (MAM - 2011/06/23) - Configure now uses the same flags and symbols in its tests that are - used to build the library. + used to build the library. (DER - 2011/05/24) - On linux we now link to the bsd_compat library, as per the gcc - manual, since we define _BSD_SOURCE. + manual, since we define _BSD_SOURCE. (DER - 2011/05/24) + - Fixed a bug in the bin/trace Perl script where API functions + that take a variable number of arguments were not processed for + trace statement fixup. (DER - 2011/08/25) Library ------- @@ -124,7 +127,10 @@ Bug Fixes since HDF5-1.8.7 created with v1.6 library. (SLU - 2011/6/22) - When a dataset had filters and reading data failed, the error message didn't say which filter isn't registered. It's fixed now. (SLU - 2011/6/3) - + - H5Epush2() now has correct trace functionality (related to the + bin/trace Perl script bug noted in the configure section). + (DER 2011/08/25) + Parallel Library ---------------- - None diff --git a/src/H5E.c b/src/H5E.c index c584e59..35a8bab 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; -- cgit v0.12