diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-05-29 10:57:47 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-05-29 10:57:47 (GMT) |
| commit | bf566b775bbef681e9135c38dbf414df2162cdcc (patch) | |
| tree | 8d353ae50560cdf28fcbb313b92c7462e4cc7f6a /src/H5Dchunk.c | |
| parent | 29a5f1061994a9d40a96726df6141f6e127c4b7b (diff) | |
| download | hdf5-bf566b775bbef681e9135c38dbf414df2162cdcc.zip hdf5-bf566b775bbef681e9135c38dbf414df2162cdcc.tar.gz hdf5-bf566b775bbef681e9135c38dbf414df2162cdcc.tar.bz2 | |
[svn-r29969] Description:
Bring r29934 from revise_chunks branch to trunk:
(1) Fix for HDFFV-9434: throw an error instead of assertion when v1 btree level hits the 1 byte limit.
(2) Modifications to better handle error recovery when conversion by h5format_convert fails.
Tested on:
MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index f4f9104..8cf86ac 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -6471,7 +6471,7 @@ H5D__chunk_format_convert(H5D_t *dset, H5D_chk_idx_info_t *idx_info, H5D_chk_idx udata.dset_dims = dset->shared->curr_dims; /* terate over the chunks in the current index and insert the chunk addresses into version 1 B-tree index */ - if((dset->shared->layout.storage.u.chunk.ops->iterate)(idx_info, H5D__chunk_format_convert_cb, &udata) < 0) + if((idx_info->storage->ops->iterate)(idx_info, H5D__chunk_format_convert_cb, &udata) < 0) HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to iterate over chunk index to chunk info") done: |