diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-07 22:33:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-07 22:33:43 (GMT) |
| commit | 6b6afd7a94802d88e662a1e264b304904e975965 (patch) | |
| tree | 4a45a7c0c6d5c677f2128abc93a2eee2351abce9 /test/dsets.c | |
| parent | a11b49fca2c068918ff1a6ebf560591435f9275f (diff) | |
| parent | 7116d82f6b685261b5b4e64fada1a0a031cd7341 (diff) | |
| download | hdf5-6b6afd7a94802d88e662a1e264b304904e975965.zip hdf5-6b6afd7a94802d88e662a1e264b304904e975965.tar.gz hdf5-6b6afd7a94802d88e662a1e264b304904e975965.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_12)
* commit '7116d82f6b685261b5b4e64fada1a0a031cd7341':
Remove mismerged code
Cherry pick of 0225e6d5969
Cleanups from PR reviews
Remove unnecessary H5CX call
Refactor H5Dvlen_get_buf_size to use optional dataset operation, with generic fallback for VOL connectors that don't implement operation
Refactor all the 'H5VL_*_optional' callbacks to move the type of operation out of the va_list, so it's at least possible for another connector to know what the operation is and decide whether to implement it or not.
Update h5debug to retrieve file pointer through VOL framework
Diffstat (limited to 'test/dsets.c')
| -rw-r--r-- | test/dsets.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/dsets.c b/test/dsets.c index 26a47f0..b866dfe 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -12776,20 +12776,23 @@ error: } /* end dls_01_write_data() */ static herr_t -dls_01_read_stuff( hid_t fid ) +dls_01_read_stuff(hid_t fid) { int status = 0; hid_t did = 0; H5O_info_t info; - did = H5Dopen2( fid, DLS_01_DATASET, H5P_DEFAULT ); - if ( did <= 0 ) TEST_ERROR + did = H5Dopen2(fid, DLS_01_DATASET, H5P_DEFAULT); + if(did <= 0) + TEST_ERROR - status = H5Oget_info2( did, &info, H5O_INFO_BASIC ); - if ( status != 0 ) TEST_ERROR + status = H5Oget_info2(did, &info, H5O_INFO_BASIC ); + if(status != 0) + TEST_ERROR - status = H5Dclose( did ); - if ( status != 0 ) TEST_ERROR + status = H5Dclose(did); + if(status != 0) + TEST_ERROR return SUCCEED; |