summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2018-02-17 05:03:19 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2018-02-17 05:03:19 (GMT)
commit90f9596c3afdbdd7f3ddbd7c7d01ad9e59e23482 (patch)
tree142845e9fa7ba803c9c50fad50fd74b66d61843b
parentdb60f70286910498ca40291841a55114cf0ea3f7 (diff)
parentb65ec9d05b9301ec639fac03b26c6ec06e463888 (diff)
downloadhdf5-90f9596c3afdbdd7f3ddbd7c7d01ad9e59e23482.zip
hdf5-90f9596c3afdbdd7f3ddbd7c7d01ad9e59e23482.tar.gz
hdf5-90f9596c3afdbdd7f3ddbd7c7d01ad9e59e23482.tar.bz2
Merge pull request #7 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:develop to develop
Fixed daily test failure. * commit 'b65ec9d05b9301ec639fac03b26c6ec06e463888': Fixed daily test failure Description: Added missing H5Pclose that caused daily test failure. Platforms tested: Linux/64 (jelly) Linux/64 (moohan) Darwin (osx1010test)
-rw-r--r--test/set_extent.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/test/set_extent.c b/test/set_extent.c
index 0467073..5d11819 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -427,6 +427,7 @@ error:
*/
static int do_layouts( hid_t fapl )
{
+ hid_t new_fapl = -1;
H5F_libver_t low, high; /* Low and high bounds */
herr_t ret; /* Generic return value */
@@ -435,8 +436,6 @@ static int do_layouts( hid_t fapl )
for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) {
for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
- hid_t new_fapl;
-
/* Copy plist to use locally to avoid modifying the original */
new_fapl = H5Pcopy(fapl);
@@ -446,7 +445,11 @@ static int do_layouts( hid_t fapl )
} H5E_END_TRY;
if (ret < 0) /* Invalid low/high combinations */
+ {
+ if (H5Pclose(new_fapl) < 0)
+ goto error;
continue;
+ }
if (test_layouts( H5D_COMPACT, new_fapl ) < 0)
goto error;
@@ -454,6 +457,8 @@ static int do_layouts( hid_t fapl )
if (test_layouts( H5D_CONTIGUOUS, new_fapl ) < 0)
goto error;
+ if (H5Pclose(new_fapl) < 0)
+ goto error;
} /* end for high */
} /* end for low */
@@ -462,6 +467,10 @@ static int do_layouts( hid_t fapl )
return 0;
error:
+ H5E_BEGIN_TRY
+ {
+ H5Pclose(new_fapl);
+ } H5E_END_TRY;
return -1;
}