summaryrefslogtreecommitdiffstats
path: root/src/H5Fquery.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-08-15 07:03:44 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-08-15 07:03:44 (GMT)
commit6c5e37a5938f3dc614f908d5d955b3103db4f367 (patch)
tree26cf3732aac362d9014ae0d9e81bd62767d6fe83 /src/H5Fquery.c
parent58067df6c710c92c596ceac6b570f085e69c25d4 (diff)
downloadhdf5-6c5e37a5938f3dc614f908d5d955b3103db4f367.zip
hdf5-6c5e37a5938f3dc614f908d5d955b3103db4f367.tar.gz
hdf5-6c5e37a5938f3dc614f908d5d955b3103db4f367.tar.bz2
[svn-r17366] Description:
Bring r17346:17365 from trunk to revise_chunks branch Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Mac OS X/32 10.5.8 (amazon) in debug mode Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5Fquery.c')
-rw-r--r--src/H5Fquery.c9
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() */