diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2012-03-29 16:50:49 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2012-03-29 16:50:49 (GMT) |
| commit | bd26865f7d69fed1e926e6a3ec5f8653ae0eb6da (patch) | |
| tree | a789868314e2af8477afe93fbd8a9849cffa6d0a /src/H5Dbtree.c | |
| parent | 5a722a152a68b27151bb96553b0b9cfbbc5cda4c (diff) | |
| download | hdf5-bd26865f7d69fed1e926e6a3ec5f8653ae0eb6da.zip hdf5-bd26865f7d69fed1e926e6a3ec5f8653ae0eb6da.tar.gz hdf5-bd26865f7d69fed1e926e6a3ec5f8653ae0eb6da.tar.bz2 | |
[svn-r22187] Purpose: Fix dsets failure on ostrich
Description:
The "support" and "unsupport" chunk index callbacks took H5D_chunk_common_ud_t
udata pointers, which seems reasonable because the udata is only needed to
locate the chunk, and does not need to return anything to the callers. However,
for v1 b-trees, H5D_btree_found must be called in order to locate the chunk, and
this function assumes that the udata is an H5D_chunk_ud_t and writes to fields
that are not in H5D_chunk_common_ud_t. Modified the support and unsupport
callbacks to take H5D_chunk_ud_t.
Note: h5watch still fails
Tested: durandal, ostrich
Diffstat (limited to 'src/H5Dbtree.c')
| -rw-r--r-- | src/H5Dbtree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c index 8202408..eb6b2ac 100644 --- a/src/H5Dbtree.c +++ b/src/H5Dbtree.c @@ -151,9 +151,9 @@ static herr_t H5D_btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *size); static herr_t H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr); static herr_t H5D_btree_idx_support(const H5D_chk_idx_info_t *idx_info, - H5D_chunk_common_ud_t *udata, H5AC_info_t *child_entry); + H5D_chunk_ud_t *udata, H5AC_info_t *child_entry); static herr_t H5D_btree_idx_unsupport(const H5D_chk_idx_info_t *idx_info, - H5D_chunk_common_ud_t *udata, H5AC_info_t *child_entry); + H5D_chunk_ud_t *udata, H5AC_info_t *child_entry); static herr_t H5D_btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream); static herr_t H5D_btree_idx_dest(const H5D_chk_idx_info_t *idx_info); @@ -1614,8 +1614,8 @@ H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr) *------------------------------------------------------------------------- */ static htri_t -H5D_btree_idx_support(const H5D_chk_idx_info_t *idx_info, - H5D_chunk_common_ud_t *udata, H5AC_info_t *child_entry) +H5D_btree_idx_support(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata, + H5AC_info_t *child_entry) { H5O_loc_t oloc; /* Temporary object header location for dataset */ H5O_t *oh = NULL; /* Dataset's object header */ @@ -1671,7 +1671,7 @@ done: */ static herr_t H5D_btree_idx_unsupport(const H5D_chk_idx_info_t *idx_info, - H5D_chunk_common_ud_t *udata, H5AC_info_t *child_entry) + H5D_chunk_ud_t *udata, H5AC_info_t *child_entry) { H5O_loc_t oloc; /* Temporary object header location for dataset */ H5O_t *oh = NULL; /* Dataset's object header */ |