diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-10-18 20:46:36 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-10-18 20:46:36 (GMT) |
commit | ee72596c8eb47ecc13fde684b32d93d011b57593 (patch) | |
tree | 65819e98cb1fb8dababe0b39fa04d4ad6830a9ae /src | |
parent | 93b2b7cf0782943085e2e9cb87459ed60d10c97b (diff) | |
download | hdf5-ee72596c8eb47ecc13fde684b32d93d011b57593.zip hdf5-ee72596c8eb47ecc13fde684b32d93d011b57593.tar.gz hdf5-ee72596c8eb47ecc13fde684b32d93d011b57593.tar.bz2 |
[svn-r19624] Purpose:
- Fix a bug in each of the metadata accumulator source and test code
Description:
- In accum.c test file, switch dxpl_id used in H5F_accum_*
function calls to H5P_DATASET_XFER_DEFAULT (instead of
H5AC_dxpl_id), to fix compilation on windows.
- Changed boundary checking from <= to < when checking
if a read from disk with overlapping dirty metadata in the
accumulator has the read ending such that it aligns exactly
with the dirty accumulator (line 234 of H5Faccum.c).
Tested:
- h5committested
Diffstat (limited to 'src')
-rw-r--r-- | src/H5Faccum.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Faccum.c b/src/H5Faccum.c index 7dedb1b..3384be0 100644 --- a/src/H5Faccum.c +++ b/src/H5Faccum.c @@ -231,7 +231,7 @@ H5F_accum_read(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, dirty_off = 0; /* Check for read ending within dirty region */ - if(H5F_addr_le(addr + size, dirty_loc + f->shared->accum.dirty_len)) + if(H5F_addr_lt(addr + size, dirty_loc + f->shared->accum.dirty_len)) overlap_size = (size_t)((addr + size) - buf_off); else /* Access covers whole dirty region */ overlap_size = f->shared->accum.dirty_len; |