summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-06-05 16:45:03 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-06-05 16:45:03 (GMT)
commit55faa4534b2a2b9ba22d8473865646a5226ae7a9 (patch)
tree422e9724bd7092fcd5a677c2e7ef12b9b3e04f42
parent5ae2a199d6b770b33ad6c4110bb32aa22a1cfd3b (diff)
downloadhdf5-55faa4534b2a2b9ba22d8473865646a5226ae7a9.zip
hdf5-55faa4534b2a2b9ba22d8473865646a5226ae7a9.tar.gz
hdf5-55faa4534b2a2b9ba22d8473865646a5226ae7a9.tar.bz2
[svn-r15146] Description:
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: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/64 2.10 (linew) in debug mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.5.3 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
-rw-r--r--src/H5Distore.c5
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));