diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2020-07-16 19:16:05 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2020-07-16 19:16:05 (GMT) |
commit | 02762e8244741b9ff1f9203788e7237f53cf8d96 (patch) | |
tree | 9ddfe80514742123b191b1b38ec0d885ff819e63 /test/links.c | |
parent | 1ecb6ec9c5075a97572d06a1f509cd763be2bc94 (diff) | |
download | hdf5-02762e8244741b9ff1f9203788e7237f53cf8d96.zip hdf5-02762e8244741b9ff1f9203788e7237f53cf8d96.tar.gz hdf5-02762e8244741b9ff1f9203788e7237f53cf8d96.tar.bz2 |
Merge of dataspace improvements from develop.
Diffstat (limited to 'test/links.c')
-rw-r--r-- | test/links.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/test/links.c b/test/links.c index b9d23aa..0c10b44 100644 --- a/test/links.c +++ b/test/links.c @@ -3452,17 +3452,23 @@ error: static int external_set_elink_fapl2(hid_t fapl, hbool_t new_format) { - hid_t fid = (-1); /* File ID */ - hid_t gid = (-1); /* Group IDs */ - hid_t core_fapl = -1, space = -1, dset = -1, did = -1, dapl_id = -1, dcpl = -1; + hid_t fid = H5I_INVALID_HID; + hid_t gid = H5I_INVALID_HID; + hid_t core_fapl = H5I_INVALID_HID; + hid_t space = H5I_INVALID_HID; + hid_t dset = H5I_INVALID_HID; + hid_t did = H5I_INVALID_HID; + hid_t dapl_id = H5I_INVALID_HID; + hid_t dcpl = H5I_INVALID_HID; char filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE], tmpname[NAME_BUF_SIZE], cwdpath[NAME_BUF_SIZE]; - hsize_t dims[2]; + hsize_t dims[2]; int points[NUM40][NUM40]; - int i, j, n; - h5_stat_size_t filesize, new_filesize; + int i, j, n; + h5_stat_size_t filesize; + h5_stat_size_t new_filesize; if(new_format) TESTING("H5Pset/get_elink_fapl() with same physical layout (w/new group format)") @@ -3501,7 +3507,8 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) dcpl = H5Pcreate(H5P_DATASET_CREATE); else dcpl = H5Pcopy(dcpl_g); - if (0 > dcpl) TEST_ERROR; + if (0 > dcpl) + TEST_ERROR; if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0) TEST_ERROR; /* create "Dataset" in group "A" of target file */ @@ -7120,6 +7127,7 @@ done: case H5I_ERROR_CLASS: case H5I_ERROR_MSG: case H5I_ERROR_STACK: + case H5I_SPACE_SEL_ITER: case H5I_NTYPES: default: return FAIL; @@ -7208,6 +7216,7 @@ done: case H5I_ERROR_CLASS: case H5I_ERROR_MSG: case H5I_ERROR_STACK: + case H5I_SPACE_SEL_ITER: case H5I_NTYPES: default: return FAIL; |