diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-01 04:36:17 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-01 04:36:17 (GMT) |
commit | 59aa015d9f796d5cfc6c94073efb7741d9601970 (patch) | |
tree | c242978356043f892d5ef2021ec65726acb94387 /src/H5Dchunk.c | |
parent | 3b5a4a064871fdf9a0fcabafc27c491fc1f56a2f (diff) | |
parent | a90e09889d575b26648f642d3bc85639df165dc9 (diff) | |
download | hdf5-59aa015d9f796d5cfc6c94073efb7741d9601970.zip hdf5-59aa015d9f796d5cfc6c94073efb7741d9601970.tar.gz hdf5-59aa015d9f796d5cfc6c94073efb7741d9601970.tar.bz2 |
[svn-r27638] Merged r27500-27631 from trunk.
Diffstat (limited to 'src/H5Dchunk.c')
-rw-r--r-- | src/H5Dchunk.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index af5123c..8584d0a 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -192,6 +192,8 @@ typedef struct H5D_chunk_coll_info_t { /* Chunked layout operation callbacks */ static herr_t H5D__chunk_construct(H5F_t *f, H5D_t *dset); +static herr_t H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, + hid_t dapl_id); static herr_t H5D__chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space, H5D_chunk_map_t *fm); @@ -585,7 +587,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +static herr_t H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ @@ -593,7 +595,7 @@ H5D__chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id) H5P_genplist_t *dapl; /* Data access property list object pointer */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_PACKAGE + FUNC_ENTER_STATIC /* Sanity check */ HDassert(f); @@ -2118,10 +2120,6 @@ H5D__chunk_flush(H5D_t *dset, hid_t dxpl_id) /* Sanity check */ HDassert(dset); - /* Flush any data caught in sieve buffer */ - if(H5D__flush_sieve_buf(dset, dxpl_id) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush sieve buffer") - /* Fill the DXPL cache values for later use */ if(H5D__get_dxpl_cache(dxpl_id, &dxpl_cache) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't fill dxpl cache") |