diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-10-20 20:40:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-10-20 20:40:04 (GMT) |
| commit | 6c22369f86f02bdabf8d1b5809ff66d6d4ea1d64 (patch) | |
| tree | 2b18dd8a3a27fccb64b93f07b325c34a93ac87e7 | |
| parent | b40e1e82162f04c1c00304d0b3690ba11f041c05 (diff) | |
| download | hdf5-6c22369f86f02bdabf8d1b5809ff66d6d4ea1d64.zip hdf5-6c22369f86f02bdabf8d1b5809ff66d6d4ea1d64.tar.gz hdf5-6c22369f86f02bdabf8d1b5809ff66d6d4ea1d64.tar.bz2 | |
Fix compile issues with vfd drivers.
| -rw-r--r-- | src/H5FDhdfs.c | 1 | ||||
| -rw-r--r-- | src/H5FDros3.c | 5 | ||||
| -rw-r--r-- | test/ros3.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 2198a31..14347f7 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -720,6 +720,7 @@ done: if (ret_value == NULL && fa != NULL) H5MM_xfree(fa); /* clean up on error */ + FUNC_LEAVE_NOAPI(ret_value) } /* H5FD_hdfs_fapl_get() */ /*------------------------------------------------------------------------- diff --git a/src/H5FDros3.c b/src/H5FDros3.c index 4c6b4d3..183fd58 100644 --- a/src/H5FDros3.c +++ b/src/H5FDros3.c @@ -222,7 +222,7 @@ static int H5FD_ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2); static herr_t H5FD_ros3_query(const H5FD_t *_f1, unsigned long *flags); static haddr_t H5FD_ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t type); static herr_t H5FD_ros3_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); -static haddr_t H5FD_ros3_get_eof(const H5FD_t *_file, H5FD_mem_t type); +static haddr_t H5FD_ros3_get_eof(const H5FD_t *_file); static herr_t H5FD_ros3_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle); static herr_t H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size, void *buf); @@ -540,6 +540,7 @@ done: if (fa != NULL) H5MM_xfree(fa); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5FD_ros3_fapl_get() */ /*------------------------------------------------------------------------- @@ -1369,7 +1370,7 @@ H5FD_ros3_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr) *------------------------------------------------------------------------- */ static haddr_t -H5FD_ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type) +H5FD_ros3_get_eof(const H5FD_t *_file) { const H5FD_ros3_t *file = (const H5FD_ros3_t *)_file; diff --git a/test/ros3.c b/test/ros3.c index edc774a..91f256f 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -989,21 +989,19 @@ test_eof_eoa(void) /* verify as found */ - JSVERIFY(5458199, H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT), NULL) - JSVERIFY(H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT), H5FDget_eof(fd_shakespeare, H5FD_MEM_DRAW), - "mismatch between DEFAULT and RAW memory types") + JSVERIFY(5458199, H5FDget_eof(fd_shakespeare), NULL) JSVERIFY(0, H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT), "EoA should be unset by H5FDopen") /* set EoA below EoF */ JSVERIFY(SUCCEED, H5FDset_eoa(fd_shakespeare, H5FD_MEM_DEFAULT, 44442202), "unable to set EoA (lower)") - JSVERIFY(5458199, H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT), "EoF changed") + JSVERIFY(5458199, H5FDget_eof(fd_shakespeare), "EoF changed") JSVERIFY(44442202, H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT), "EoA unchanged") /* set EoA above EoF */ JSVERIFY(SUCCEED, H5FDset_eoa(fd_shakespeare, H5FD_MEM_DEFAULT, 6789012), "unable to set EoA (higher)") - JSVERIFY(5458199, H5FDget_eof(fd_shakespeare, H5FD_MEM_DEFAULT), "EoF changed") + JSVERIFY(5458199, H5FDget_eof(fd_shakespeare), "EoF changed") JSVERIFY(6789012, H5FDget_eoa(fd_shakespeare, H5FD_MEM_DEFAULT), "EoA unchanged") /************ @@ -1267,7 +1265,7 @@ test_read(void) H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); /* Demonstrate success with "automatic" value */ FAIL_IF(NULL == file_raven) - JSVERIFY(6464, H5FDget_eof(file_raven, H5FD_MEM_DEFAULT), NULL) + JSVERIFY(6464, H5FDget_eof(file_raven), NULL) /********* * TESTS * |