diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-07-22 17:47:44 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-22 17:47:44 (GMT) |
commit | dbd850ccc1a5b210fc94c35b88b81069e4239ae7 (patch) | |
tree | 714eb58e6716e9eaefadd1549907dfa68e31643c /test | |
parent | 3ba79265098f6154a5ce3c0124df465be1ed69e3 (diff) | |
download | hdf5-dbd850ccc1a5b210fc94c35b88b81069e4239ae7.zip hdf5-dbd850ccc1a5b210fc94c35b88b81069e4239ae7.tar.gz hdf5-dbd850ccc1a5b210fc94c35b88b81069e4239ae7.tar.bz2 |
VFD SWMR: Fixes for using base versions of versioned API calls (#850)
* Fixes for using base versions of versioned API calls
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/vfd_swmr.c | 30 | ||||
-rw-r--r-- | test/vfd_swmr_group_writer.c | 16 |
2 files changed, 23 insertions, 23 deletions
diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c index 09dee38..3ed73c1 100644 --- a/test/vfd_swmr.c +++ b/test/vfd_swmr.c @@ -884,7 +884,7 @@ test_writer_md(void) hid_t sid = -1; /* Dataspace ID */ hid_t did = -1; /* Dataset ID */ int * rwbuf = NULL; /* Data buffer for writing */ - H5O_info_t oinfo; /* Object metadata information */ + H5O_info2_t oinfo; /* Object metadata information */ char dname[100]; /* Name of dataset */ hsize_t dims[2] = {50, 20}; /* Dataset dimension sizes */ hsize_t max_dims[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */ @@ -961,7 +961,7 @@ test_writer_md(void) FAIL_STACK_ERROR /* Get dataset object header address */ - if (H5Oget_info(did, &oinfo, H5O_INFO_BASIC) < 0) + if (H5Oget_info3(did, &oinfo, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR /* Close the dataset */ @@ -998,7 +998,7 @@ test_writer_md(void) FAIL_STACK_ERROR /* Get dataset object info */ - if (H5Oget_info(did, &oinfo, H5O_INFO_BASIC) < 0) + if (H5Oget_info3(did, &oinfo, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR /* Close the dataset */ @@ -1032,7 +1032,7 @@ test_writer_md(void) FAIL_STACK_ERROR /* Get dataset object info */ - if (H5Oget_info(did, &oinfo, H5O_INFO_BASIC) < 0) + if (H5Oget_info3(did, &oinfo, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR /* Close the dataset */ @@ -1166,16 +1166,16 @@ test_file_end_tick_concur(void) static unsigned test_reader_md_concur(void) { - unsigned i = 0; /* Local index variables */ - uint8_t * buf = NULL; /* Data page from the page buffer */ - hid_t dcpl = -1; /* Dataset creation property list */ - hid_t sid = -1; /* Dataspace ID */ - hid_t did = -1; /* Dataset ID */ - int * rwbuf = NULL; /* Data buffer for writing */ - H5O_info_t oinfo; /* Object metadata information */ - char dname[100]; /* Name of dataset */ - hsize_t dims[2] = {50, 20}; /* Dataset dimension sizes */ - hsize_t max_dims[2] = /* Dataset maximum dimension sizes */ + unsigned i = 0; /* Local index variables */ + uint8_t * buf = NULL; /* Data page from the page buffer */ + hid_t dcpl = -1; /* Dataset creation property list */ + hid_t sid = -1; /* Dataspace ID */ + hid_t did = -1; /* Dataset ID */ + int * rwbuf = NULL; /* Data buffer for writing */ + H5O_info2_t oinfo; /* Object metadata information */ + char dname[100]; /* Name of dataset */ + hsize_t dims[2] = {50, 20}; /* Dataset dimension sizes */ + hsize_t max_dims[2] = /* Dataset maximum dimension sizes */ {H5S_UNLIMITED, H5S_UNLIMITED}; hsize_t chunk_dims[2] = {2, 5}; /* Dataset chunked dimension sizes */ unsigned num_entries = 0; /* Number of entries in the index */ @@ -1519,7 +1519,7 @@ test_reader_md_concur(void) FAIL_STACK_ERROR /* Get dataset object header address */ - if (H5Oget_info(did, &oinfo, H5O_INFO_BASIC) < 0) + if (H5Oget_info3(did, &oinfo, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR /* Close the dataset */ diff --git a/test/vfd_swmr_group_writer.c b/test/vfd_swmr_group_writer.c index f491353..c758781 100644 --- a/test/vfd_swmr_group_writer.c +++ b/test/vfd_swmr_group_writer.c @@ -3031,8 +3031,8 @@ verify_group(state_t *s, unsigned int which) esnprintf(name, sizeof(name), "/group-%u", which); - if ((g = H5Gopen(s->file, name, H5P_DEFAULT)) < 0) { - HDprintf("H5Gopen failed\n"); + if ((g = H5Gopen2(s->file, name, H5P_DEFAULT)) < 0) { + HDprintf("H5Gopen2 failed\n"); TEST_ERROR; } @@ -4078,8 +4078,8 @@ vrfy_create_group(state_t *s, unsigned int which) esnprintf(name, sizeof(name), "/group-%u", which); - if ((g = H5Gopen(s->file, name, H5P_DEFAULT)) < 0) { - HDprintf("H5Gopen failed\n"); + if ((g = H5Gopen2(s->file, name, H5P_DEFAULT)) < 0) { + HDprintf("H5Gopen2 failed\n"); TEST_ERROR; } @@ -4195,8 +4195,8 @@ vrfy_create_group_id(state_t *s, unsigned int which, bool dense_to_compact) esnprintf(name, sizeof(name), "/group-%u", which); - if ((g = H5Gopen(s->file, name, H5P_DEFAULT)) < 0) { - HDprintf("H5Gopen failed\n"); + if ((g = H5Gopen2(s->file, name, H5P_DEFAULT)) < 0) { + HDprintf("H5Gopen2 failed\n"); TEST_ERROR; } @@ -4569,8 +4569,8 @@ vrfy_move_one_group(state_t *s, hid_t obj_id, const char *name, const char *newn TEST_ERROR; } - if ((g = H5Gopen(obj_id, newname, H5P_DEFAULT)) < 0) { - HDprintf("H5Gopen failed\n"); + if ((g = H5Gopen2(obj_id, newname, H5P_DEFAULT)) < 0) { + HDprintf("H5Gopen2 failed\n"); TEST_ERROR; } |