diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-01-12 01:49:41 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-01-12 01:49:41 (GMT) |
| commit | ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8 (patch) | |
| tree | ecfd893a79f9d9b6981abbf6c295bfc8f750ce91 /src/H5Eint.c | |
| parent | 994401b905680598db47e154e5123b8838f1f1c8 (diff) | |
| download | hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.zip hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.tar.gz hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.tar.bz2 | |
[svn-r28859] Merge of r28762, 28770-82, 28791-28806, 28816-28836, 28857
from revise_chunks.
This is basically all the revise_chunks changes since alpha0
aside from the v2 B-tree changes that cause SWMR to fail.
This merge should also bring the alpha branch in sync with
the trunk.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial w/ C++ and Fortran
autotools parallel w/ Fortran (MPICH 3.1.4)
cmake serial (cmakehdf5) w/ C++ and Fortran
Diffstat (limited to 'src/H5Eint.c')
| -rw-r--r-- | src/H5Eint.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/H5Eint.c b/src/H5Eint.c index 6e84a09..6ed405f 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -743,8 +743,13 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin done: if(va_started) va_end(ap); +#ifdef H5_HAVE_VASPRINTF + if(tmp) + HDfree(tmp); +#else /* H5_HAVE_VASPRINTF */ if(tmp) H5MM_xfree(tmp); +#endif /* H5_HAVE_VASPRINTF */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5E_printf_stack() */ |