diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-18 18:25:49 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-18 18:25:49 (GMT) |
commit | ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4 (patch) | |
tree | bded46cf03fd13d3311cd959dcb9b091e7379dca /src/H5Fquery.c | |
parent | 339471fe0d38ce9527c6c6a91f9a9cfb3810bb9c (diff) | |
download | hdf5-ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4.zip hdf5-ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4.tar.gz hdf5-ebde7af78ab5cfacc8a55105f1de0e53ccffa5a4.tar.bz2 |
[svn-r17374] Description:
Bring r17365 from trunk to 1.8 branch:
Final merge of changes from sblock_mdc branch back to trunk. The
superblock is now managed by the metadata cache.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committest performed on trunk)
Diffstat (limited to 'src/H5Fquery.c')
-rw-r--r-- | src/H5Fquery.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/H5Fquery.c b/src/H5Fquery.c index 564a088..93f2d6e 100644 --- a/src/H5Fquery.c +++ b/src/H5Fquery.c @@ -261,8 +261,9 @@ H5F_sym_leaf_k(const H5F_t *f) HDassert(f); HDassert(f->shared); + HDassert(f->shared->sblock); - FUNC_LEAVE_NOAPI(f->shared->sym_leaf_k) + FUNC_LEAVE_NOAPI(f->shared->sblock->sym_leaf_k) } /* end H5F_sym_leaf_k() */ @@ -292,9 +293,10 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type) HDassert(f); HDassert(f->shared); + HDassert(f->shared->sblock); HDassert(type); - FUNC_LEAVE_NOAPI(f->shared->btree_k[type->id]) + FUNC_LEAVE_NOAPI(f->shared->sblock->btree_k[type->id]) } /* end H5F_Kvalue() */ @@ -413,8 +415,9 @@ H5F_get_base_addr(const H5F_t *f) HDassert(f); HDassert(f->shared); + HDassert(f->shared->sblock); - FUNC_LEAVE_NOAPI(f->shared->base_addr) + FUNC_LEAVE_NOAPI(f->shared->sblock->base_addr) } /* end H5F_get_base_addr() */ |