diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 04:39:43 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 04:39:43 (GMT) |
| commit | 2b551d282f88e7e33baf11702016535f28a2ceab (patch) | |
| tree | e5496cfb773cffe6e4017c8ad9e13b50a84c6d33 /src/H5HGdbg.c | |
| parent | 61817758ddefdfc6f6de628f4ef0f5d509774c4b (diff) | |
| download | hdf5-2b551d282f88e7e33baf11702016535f28a2ceab.zip hdf5-2b551d282f88e7e33baf11702016535f28a2ceab.tar.gz hdf5-2b551d282f88e7e33baf11702016535f28a2ceab.tar.bz2 | |
[svn-r18503] Description:
Bring r18502 from trunk to 1.8 branch:
Bring r18501 from metadata journaling "merging" branch to trunk:
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
FreeBSD/32 6.3 (duty) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5HGdbg.c')
| -rw-r--r-- | src/H5HGdbg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c index bda9832..07de139 100644 --- a/src/H5HGdbg.c +++ b/src/H5HGdbg.c @@ -67,13 +67,13 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, FUNC_ENTER_NOAPI(H5HG_debug, FAIL); /* check arguments */ - assert(f); - assert(H5F_addr_defined (addr)); - assert(stream); - assert(indent >= 0); - assert(fwidth >= 0); + HDassert(f); + HDassert(H5F_addr_defined (addr)); + HDassert(stream); + HDassert(indent >= 0); + HDassert(fwidth >= 0); - if (NULL == (h = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, NULL, NULL, H5AC_READ))) + if(NULL == (h = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, NULL, NULL, H5AC_READ))) HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load global heap collection"); fprintf(stream, "%*sGlobal Heap Collection...\n", indent, ""); @@ -135,7 +135,7 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, } done: - if (h && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, addr, h, H5AC__NO_FLAGS_SET) != SUCCEED) + if (h && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, addr, h, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release object header"); FUNC_LEAVE_NOAPI(ret_value); |