diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-19 08:09:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-19 08:09:49 (GMT) |
| commit | 1ff6aff53dacca3afaa96ad959c857693ea6f6d6 (patch) | |
| tree | b5592c43a2e492fe039f0f8361dc6acfc83456a2 /src/H5Dchunk.c | |
| parent | cf6e2c99a43cd794e85ac8e23fee2e45a35d9121 (diff) | |
| download | hdf5-1ff6aff53dacca3afaa96ad959c857693ea6f6d6.zip hdf5-1ff6aff53dacca3afaa96ad959c857693ea6f6d6.tar.gz hdf5-1ff6aff53dacca3afaa96ad959c857693ea6f6d6.tar.bz2 | |
[svn-r19093] Description:
Bring r19092 from trunk to 1.8 branch:
Bring "shape same" changes from LBL branch to trunk. These changes
allow shapes that are the same, but projected into dataspaces with different
ranks to be detected correctly, and also contains code to project a dataspace
into greater/lesser number of dimensions, so the I/O can proceed in a faster
way.
These changes also contain several bug fixes and _lots_ of code
cleanups to the MPI datatype creation code.
Many other misc. code cleanup are included as well...
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 9ae5f46..c34807f 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2665,7 +2665,6 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */ H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/ H5D_rdcc_ent_t *ent = NULL; /*cache entry */ - hbool_t found = FALSE; /*already in cache? */ haddr_t chunk_addr = HADDR_UNDEF; /* Address of chunk on disk */ size_t chunk_size; /*size of a chunk */ void *chunk = NULL; /*the file chunk */ @@ -2797,7 +2796,7 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, rdcc->stats.ninits++; } /* end else */ } /* end else */ - HDassert(found || chunk_size > 0); + HDassert(chunk_size > 0); if(ent) { /* |