diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-23 20:14:48 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-23 20:14:48 (GMT) |
| commit | 7a68924d3b81cf8b3e6e421294270abc933b44a9 (patch) | |
| tree | 2ed6ad6294e9c707a66baccdcef6b725a3f139e5 /src/H5Dbtree.c | |
| parent | 663919aa50f3c1d270239e06794c3fc6fff1ad9f (diff) | |
| download | hdf5-7a68924d3b81cf8b3e6e421294270abc933b44a9.zip hdf5-7a68924d3b81cf8b3e6e421294270abc933b44a9.tar.gz hdf5-7a68924d3b81cf8b3e6e421294270abc933b44a9.tar.bz2 | |
[svn-r17739] Description:
Bring r17737 from trunk to 1.8 branch:
Fix error in dataset's chunk index v1 B-tree debugging code to correctly
pass userdata down to B-tree cache load routine.
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/H5Dbtree.c')
| -rw-r--r-- | src/H5Dbtree.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c index c9561f2..691b349 100644 --- a/src/H5Dbtree.c +++ b/src/H5Dbtree.c @@ -1456,6 +1456,7 @@ herr_t H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int fwidth, unsigned ndims) { + H5D_chunk_common_ud_t udata; /* User data for B-tree callback */ H5O_storage_chunk_t storage; /* Storage information for B-tree callback */ hbool_t shared_init = FALSE; /* Whether B-tree shared info is initialized */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1471,8 +1472,13 @@ H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info") shared_init = TRUE; + /* Set up user data for callback */ + udata.layout = NULL; + udata.storage = &storage; + udata.offset = NULL; + /* Dump the records for the B-tree */ - (void)H5B_debug(f, dxpl_id, addr, stream, indent, fwidth, H5B_BTREE, &ndims); + (void)H5B_debug(f, dxpl_id, addr, stream, indent, fwidth, H5B_BTREE, &udata); done: if(shared_init) { |