diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-13 19:17:29 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-13 19:17:29 (GMT) |
commit | 92b37616d2a1ec34a2d7bd34d05c5f6466f7da53 (patch) | |
tree | 782bdfeee57df4a5fc673c47c1917e92f6262468 /test | |
parent | 5e435bd8ac0b1d59a2c8461b960434b49b50a25f (diff) | |
download | hdf5-92b37616d2a1ec34a2d7bd34d05c5f6466f7da53.zip hdf5-92b37616d2a1ec34a2d7bd34d05c5f6466f7da53.tar.gz hdf5-92b37616d2a1ec34a2d7bd34d05c5f6466f7da53.tar.bz2 |
[svn-r17354] Description:
Bring r17351 from trunk to 1.8 branch:
Clean up code (to align w/future sblock_mdc branch changes), tweak
tests for [slightly] easier debugging, fix memory leak when copying chunked
datasets with I/O filters, fix memory leak of free space section when it was
exactly the right size to use for extending an existing block in the file.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committest performed on trunk)
Diffstat (limited to 'test')
-rw-r--r-- | test/tattr.c | 8 | ||||
-rw-r--r-- | test/testhdf5.c | 1 | ||||
-rw-r--r-- | test/tvltypes.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/test/tattr.c b/test/tattr.c index 95651b0..432db67 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -5293,13 +5293,13 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) ret = H5Dclose(dset3); CHECK(ret, FAIL, "H5Dclose"); - /* Close dataspace */ - ret = H5Sclose(sid); - CHECK(ret, FAIL, "H5Sclose"); - /* Close file */ ret = H5Fclose(fid); CHECK(ret, FAIL, "H5Fclose"); + + /* Close dataspace */ + ret = H5Sclose(sid); + CHECK(ret, FAIL, "H5Sclose"); } /* test_attr_corder_transition() */ diff --git a/test/testhdf5.c b/test/testhdf5.c index 95ec90c..f14c2c3 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -88,3 +88,4 @@ main(int argc, char *argv[]) return (GetTestNumErrs()); } /* end main() */ + diff --git a/test/tvltypes.c b/test/tvltypes.c index 867d8d5..ab4d880 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -2831,7 +2831,7 @@ test_vltypes_fill_value(void) } /* end for */ /* Release the space */ - ret = H5Dvlen_reclaim(dtype1_id, dset_dspace_id, xfer_pid, rbuf); + ret = H5Dvlen_reclaim(dtype1_id, dset_select_dspace_id, xfer_pid, rbuf); CHECK(ret, FAIL, "H5Dvlen_reclaim"); ret = H5Dclose(dset_id); @@ -3001,7 +3001,7 @@ test_vltypes_fill_value(void) } /* end for */ /* Release the space */ - ret = H5Dvlen_reclaim(dtype1_id, dset_dspace_id, xfer_pid, rbuf); + ret = H5Dvlen_reclaim(dtype1_id, dset_select_dspace_id, xfer_pid, rbuf); CHECK(ret, FAIL, "H5Dvlen_reclaim"); ret = H5Dclose(dset_id); @@ -3097,7 +3097,7 @@ test_vltypes_fill_value(void) } /* end for */ /* Release the space */ - ret = H5Dvlen_reclaim(dtype1_id, dset_dspace_id, xfer_pid, rbuf); + ret = H5Dvlen_reclaim(dtype1_id, dset_select_dspace_id, xfer_pid, rbuf); CHECK(ret, FAIL, "H5Dvlen_reclaim"); ret = H5Dclose(dset_id); |