diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-05 16:47:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-05 16:47:50 (GMT) |
| commit | c7b6018bdafe206407812ba50c024eeda35f6347 (patch) | |
| tree | c9f0d4e1567ce328751787ea146179ee31ec14dd | |
| parent | c72fb2f329624360216de6a9baec506018e22a34 (diff) | |
| download | hdf5-c7b6018bdafe206407812ba50c024eeda35f6347.zip hdf5-c7b6018bdafe206407812ba50c024eeda35f6347.tar.gz hdf5-c7b6018bdafe206407812ba50c024eeda35f6347.tar.bz2 | |
[svn-r15148] Description:
Bring back revision 15146 from the trunk:
Correct the definition of the 'nbytes' variable in the in-memory version
of the B-tree key for chunks from 'size_t' to 'uint32_t', to match the
definitions everywhere else.
Tested on:
Mac OS X/32 10.5.3 (amazon) debug & production
Linux/64 2.6 (chicago) production
| -rw-r--r-- | src/H5Distore.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c index b6005db..eca6fc0 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -97,7 +97,7 @@ * The chunk's file address is part of the B-tree and not part of the key. */ typedef struct H5D_istore_key_t { - size_t nbytes; /*size of stored data */ + uint32_t nbytes; /*size of stored data */ hsize_t offset[H5O_LAYOUT_NDIMS]; /*logical offset to start*/ unsigned filter_mask; /*excluded filters */ } H5D_istore_key_t; @@ -1037,8 +1037,11 @@ H5D_istore_idx_iterate_cb(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, /* Sanity check for memcpy() */ HDassert(offsetof(H5D_chunk_rec_t, nbytes) == offsetof(H5D_istore_key_t, nbytes)); + HDassert(sizeof(chunk_rec.nbytes) == sizeof(lt_key->nbytes)); HDassert(offsetof(H5D_chunk_rec_t, offset) == offsetof(H5D_istore_key_t, offset)); + HDassert(sizeof(chunk_rec.offset) == sizeof(lt_key->offset)); HDassert(offsetof(H5D_chunk_rec_t, filter_mask) == offsetof(H5D_istore_key_t, filter_mask)); + HDassert(sizeof(chunk_rec.filter_mask) == sizeof(lt_key->filter_mask)); /* Compose generic chunk record for callback */ HDmemcpy(&chunk_rec, lt_key, sizeof(*lt_key)); |