diff options
| -rw-r--r-- | hl/test/test_dset_append.c | 10 | ||||
| -rw-r--r-- | test/dsets.c | 2 | ||||
| -rw-r--r-- | test/test_swmr.c | 16 | ||||
| -rw-r--r-- | tools/h5repack/testfiles/h5repack_szip.h5 | bin | 5588 -> 5588 bytes |
4 files changed, 14 insertions, 14 deletions
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c index bb646cb..ee923e2 100644 --- a/hl/test/test_dset_append.c +++ b/hl/test/test_dset_append.c @@ -166,7 +166,7 @@ test_dataset_append_lines_columns(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DNAME_UNLIM, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DNAME_UNLIM, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ @@ -300,7 +300,7 @@ test_dataset_append_lines(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DNAME_LINE, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DNAME_LINE, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ @@ -435,7 +435,7 @@ test_dataset_append_columns(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DNAME_COLUMN, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DNAME_COLUMN, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ @@ -920,7 +920,7 @@ test_dataset_append_less(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DNAME_LESS, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DNAME_LESS, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ @@ -1077,7 +1077,7 @@ test_dataset_append_vary(hid_t fid) FAIL_STACK_ERROR; /* Open the dataset again */ - if((did = H5Dopen(fid, DNAME_VARY, H5P_DEFAULT)) < 0) + if((did = H5Dopen2(fid, DNAME_VARY, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* Read the dataset */ diff --git a/test/dsets.c b/test/dsets.c index 092a914..8b266fb 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -9839,7 +9839,7 @@ test_swmr_v1_btree_ci_fail(const char *env_h5_drvr, hid_t fapl) did = -1; err = -1; H5E_BEGIN_TRY { - did = H5Dopen(fid, DSET_DEFAULT_NAME, H5P_DEFAULT); + did = H5Dopen2(fid, DSET_DEFAULT_NAME, H5P_DEFAULT); if(did >= 0) { err = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data); } diff --git a/test/test_swmr.c b/test/test_swmr.c index bd46bc2..45dd794 100644 --- a/test/test_swmr.c +++ b/test/test_swmr.c @@ -1527,7 +1527,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) /* Should fail to open the dataset */ H5E_BEGIN_TRY { - did2 = H5Dopen(fid, "dataset2", dapl); + did2 = H5Dopen2(fid, "dataset2", dapl); } H5E_END_TRY; if(did2 >= 0) TEST_ERROR @@ -1545,7 +1545,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) boundary[1] = 1; if(H5Pset_append_flush(dapl, 2, boundary, append_cb, &count) < 0) FAIL_STACK_ERROR - if((did2 = H5Dopen(fid, "dataset2", dapl)) < 0) + if((did2 = H5Dopen2(fid, "dataset2", dapl)) < 0) FAIL_STACK_ERROR /* Get the dataset's access property list */ @@ -1734,7 +1734,7 @@ test_append_flush_dataset_fixed(hid_t in_fapl) FAIL_STACK_ERROR; /* Should succeed in opening the dataset: append flush property has no effect */ - if((did2 = H5Dopen(fid, "dataset2", dapl)) < 0) + if((did2 = H5Dopen2(fid, "dataset2", dapl)) < 0) TEST_ERROR /* Get the dataset's access property list */ @@ -1764,7 +1764,7 @@ test_append_flush_dataset_fixed(hid_t in_fapl) HDmemset(boundary, 0, sizeof(boundary)); if(H5Pset_append_flush(dapl, 1, boundary, append_cb, &count) < 0) FAIL_STACK_ERROR - if((did2 = H5Dopen(fid, "dataset2", dapl)) < 0) + if((did2 = H5Dopen2(fid, "dataset2", dapl)) < 0) FAIL_STACK_ERROR /* Get the dataset's access property list */ @@ -1826,8 +1826,8 @@ error: * -- should return append flush property values set in dapl1 * (2) H5Dcreate(...H5P_DEFAULT...) * H5Dclose() - * did1 = H5Dopen(...dapl1) - * did2 = H5Dopen(..dapl2) + * did1 = H5Dopen2(...dapl1) + * did2 = H5Dopen2(..dapl2) * H5Pget_append_flush(did1, ...) * H5Pget_append_flush(did2, ...) * -- should return append flush property values set in dapl1 @@ -1963,8 +1963,8 @@ test_append_flush_dataset_multiple(hid_t in_fapl) * For a chunked dataset's access property list: * H5Dcreate(...H5P_DEFAULT...) * H5Dclose() - * did1 = H5Dopen(...dapl1) - * did2 = H5Dopen(..dapl2) + * did1 = H5Dopen2(...dapl1) + * did2 = H5Dopen2(..dapl2) * H5Pget_append_flush(did1, ...) * H5Pget_append_flush(did2, ...) * -- should return append flush property values set in dapl1 diff --git a/tools/h5repack/testfiles/h5repack_szip.h5 b/tools/h5repack/testfiles/h5repack_szip.h5 Binary files differindex b16d169..5eab9f8 100644 --- a/tools/h5repack/testfiles/h5repack_szip.h5 +++ b/tools/h5repack/testfiles/h5repack_szip.h5 |