diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-05 19:16:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-05 19:16:15 (GMT) |
| commit | 401f0c995f4c28d3bf4c15c859f0195bba70bdd3 (patch) | |
| tree | 11b7d937ca665e7d78a6a38096b2f6b9129ee497 /src/H5B2stat.c | |
| parent | 30a52dd1a26f507f240cf48a9342e5a1d6023983 (diff) | |
| download | hdf5-401f0c995f4c28d3bf4c15c859f0195bba70bdd3.zip hdf5-401f0c995f4c28d3bf4c15c859f0195bba70bdd3.tar.gz hdf5-401f0c995f4c28d3bf4c15c859f0195bba70bdd3.tar.bz2 | |
[svn-r17842] Description:
Further refactor v2 B-tree code toward being able to pass context info
down to encode/decode client callbacks:
- Separate H5B2_create call to return H5B2_t structure
- Make loading the v2 B-tree header pick up the client class from the
ID stored in the file. Simplify some internal API calls as a
result.
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/default API=1.8.x,
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
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.1 (amazon) in debug mode
Mac OS X/32 10.6.1 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5B2stat.c')
| -rw-r--r-- | src/H5B2stat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5B2stat.c b/src/H5B2stat.c index 5fc7659..a5301de 100644 --- a/src/H5B2stat.c +++ b/src/H5B2stat.c @@ -85,8 +85,7 @@ *------------------------------------------------------------------------- */ herr_t -H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *cls, haddr_t addr, - H5B2_stat_t *info) +H5B2_stat_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5B2_stat_t *info) { H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ herr_t ret_value = SUCCEED; /* Return value */ @@ -95,12 +94,11 @@ H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *cls, haddr_t addr, /* Check arguments. */ HDassert(f); - HDassert(cls); HDassert(H5F_addr_defined(addr)); HDassert(info); /* Look up the B-tree header */ - if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, cls, NULL, H5AC_READ))) + if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, NULL, NULL, H5AC_READ))) HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header") /* Get information about the B-tree */ |