diff options
| author | mainzer <mainzer#hdfgroup.org> | 2017-03-17 09:36:05 (GMT) |
|---|---|---|
| committer | mainzer <mainzer#hdfgroup.org> | 2017-03-17 09:36:05 (GMT) |
| commit | b7c58f7dfca66d4caa26d7f8b318ad3514b8c46f (patch) | |
| tree | c9b012bcb318457a687c2c1f3cbe5be6242215aa | |
| parent | 9764970d2682352060d4a8febc42b3c06286c2b6 (diff) | |
| download | hdf5-b7c58f7dfca66d4caa26d7f8b318ad3514b8c46f.zip hdf5-b7c58f7dfca66d4caa26d7f8b318ad3514b8c46f.tar.gz hdf5-b7c58f7dfca66d4caa26d7f8b318ad3514b8c46f.tar.bz2 | |
Minor code changes to address comments in pull request
| -rw-r--r-- | src/H5Fint.c | 2 | ||||
| -rw-r--r-- | src/H5PB.c | 5 | ||||
| -rw-r--r-- | src/H5PBprivate.h | 2 | ||||
| -rw-r--r-- | testpar/t_cache_image.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 3a2b422..444d409 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -1014,7 +1014,7 @@ H5F__dest(H5F_t *f, hid_t meta_dxpl_id, hid_t raw_dxpl_id, hbool_t flush) HDONE_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list") /* Shutdown the page buffer cache */ - if(H5PB_dest(f, &fio_info) < 0) + if(H5PB_dest(&fio_info) < 0) /* Push error, but keep going*/ HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing page buffer cache") @@ -477,13 +477,16 @@ H5PB__dest_cb(void *item, void H5_ATTR_UNUSED *key, void *_op_data) *------------------------------------------------------------------------- */ herr_t -H5PB_dest(H5F_t *f, const H5F_io_info2_t *fio_info) +H5PB_dest(const H5F_io_info2_t *fio_info) { herr_t ret_value = SUCCEED; /* Return value */ + H5F_t *f; /* file pointer */ FUNC_ENTER_NOAPI(FAIL) /* Sanity checks */ + HDassert(fio_info); + f = fio_info->f; HDassert(f); /* flush and destroy the page buffer, if it exists */ diff --git a/src/H5PBprivate.h b/src/H5PBprivate.h index 3933029..7dd4071 100644 --- a/src/H5PBprivate.h +++ b/src/H5PBprivate.h @@ -89,7 +89,7 @@ typedef struct H5PB_t { /* General routines */ H5_DLL herr_t H5PB_create(H5F_t *file, size_t page_buffer_size, unsigned page_buf_min_meta_perc, unsigned page_buf_min_raw_perc); H5_DLL herr_t H5PB_flush(const H5F_io_info2_t *fio_info); -H5_DLL herr_t H5PB_dest(H5F_t *file, const H5F_io_info2_t *fio_info); +H5_DLL herr_t H5PB_dest(const H5F_io_info2_t *fio_info); H5_DLL herr_t H5PB_add_new_page(H5F_t *f, H5FD_mem_t type, haddr_t page_addr); H5_DLL herr_t H5PB_update_entry(H5PB_t *page_buf, haddr_t addr, size_t size, const void *buf); H5_DLL herr_t H5PB_remove_entry(const H5F_t *f, haddr_t addr); diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index 9e9efea..a28af8e 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -25,11 +25,7 @@ #include "cache_common.h" #include "genall5.h" -#if 1 #define TEST_FILES_TO_CONSTRUCT 2 -#else -#define TEST_FILES_TO_CONSTRUCT 1 -#endif #define CHUNK_SIZE 10 #define DSET_SIZE (40 * CHUNK_SIZE) #define MAX_NUM_DSETS 256 |