diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-20 00:30:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-20 00:30:55 (GMT) |
| commit | 859f28dab377a9326a781b13f4ef1c0c68659e7e (patch) | |
| tree | 0a4364b03003a6e38507762623a43d02b8f010f3 /src/H5HLdbg.c | |
| parent | dfe42acddb1d7f09b32eb0e3cc408c5f13d9844a (diff) | |
| download | hdf5-859f28dab377a9326a781b13f4ef1c0c68659e7e.zip hdf5-859f28dab377a9326a781b13f4ef1c0c68659e7e.tar.gz hdf5-859f28dab377a9326a781b13f4ef1c0c68659e7e.tar.bz2 | |
[svn-r18043] Description:
Slush changes back & forth between trunk, the merging branch and the
metadata journaling branch to level them out to a reasonably common set of code
to work from for the next set of more significant changes.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug
(h5committest not required on this branch)
Diffstat (limited to 'src/H5HLdbg.c')
| -rw-r--r-- | src/H5HLdbg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c index 1a36095..9822607 100644 --- a/src/H5HLdbg.c +++ b/src/H5HLdbg.c @@ -22,7 +22,6 @@ #include "H5private.h" /* Generic Functions */ -#include "H5ACprivate.h" /* Metadata cache */ #include "H5Eprivate.h" /* Error handling */ #include "H5HLpkg.h" /* Local heaps */ #include "H5Iprivate.h" /* ID Functions */ @@ -70,7 +69,7 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int HDassert(indent >= 0); HDassert(fwidth >= 0); - if(NULL == (h = H5HL_protect(f, dxpl_id, addr, H5AC2_READ))) + if(NULL == (h = (H5HL_t *)H5HL_protect(f, dxpl_id, addr, H5AC2_READ))) HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap") fprintf(stream, "%*sLocal Heap...\n", indent, ""); @@ -89,7 +88,7 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int * the heap and that no two free blocks point to the same region of * the heap. */ if(NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") + HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed") fprintf(stream, "%*sFree Blocks (offset, size):\n", indent, ""); |