diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-21 11:33:44 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-21 11:33:44 (GMT) |
commit | d96910fe93972d48a8cfef0a44a57a803b07f031 (patch) | |
tree | c6e26ce08bcd26bf71f4fc75edcbabc42d168e02 /src/H5Dcontig.c | |
parent | 9316a67a8901daf5e85fc2947c666b4e10c04814 (diff) | |
download | hdf5-d96910fe93972d48a8cfef0a44a57a803b07f031.zip hdf5-d96910fe93972d48a8cfef0a44a57a803b07f031.tar.gz hdf5-d96910fe93972d48a8cfef0a44a57a803b07f031.tar.bz2 |
[svn-r17404] Description:
Bring r17402 & r17403 from trunk to 1.8 branch:
r17402:
Switch from using a 'flags' parameter to the flush routine(s), to just
using a single 'closing' boolean parameter, since that's all we're doing with
the flags anyway and this makes things more obvious.
r17403:
Eliminate 'closing' flag to dataset flush routine, since all cached
dataset information has already been flushed when a file is closed and the
datasets themselves will be closed (and the dataset caches destroyed).
Skip calling more flush routines when the file is closing, in preparation
for eventual separation of the 'flush' concept from the 'shutdown the cache'
concept.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committest performed on trunk)
Diffstat (limited to 'src/H5Dcontig.c')
-rw-r--r-- | src/H5Dcontig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 712b17c..0ff3964 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -65,7 +65,7 @@ static herr_t H5D_contig_construct(H5F_t *f, H5D_t *dset); static herr_t H5D_contig_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 *cm); -static herr_t H5D_contig_flush(H5D_t *dset, hid_t dxpl_id, unsigned flags); +static herr_t H5D_contig_flush(H5D_t *dset, hid_t dxpl_id); /* Helper routines */ static herr_t H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset, @@ -1186,7 +1186,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5D_contig_flush(H5D_t *dset, hid_t dxpl_id, unsigned UNUSED flags) +H5D_contig_flush(H5D_t *dset, hid_t dxpl_id) { herr_t ret_value = SUCCEED; /* Return value */ |