diff options
Diffstat (limited to 'src/H5HG.c')
| -rw-r--r-- | src/H5HG.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -202,8 +202,8 @@ H5HG__create(H5F_t *f, size_t size) done: /* Cleanup on error */ - if (!H5F_addr_defined(ret_value)) { - if (H5F_addr_defined(addr)) { + if (!H5_addr_defined(ret_value)) { + if (H5_addr_defined(addr)) { /* Release the space on disk */ if (H5MF_xfree(f, H5FD_MEM_GHEAP, addr, (hsize_t)size) < 0) HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, HADDR_UNDEF, "unable to free global heap") @@ -242,7 +242,7 @@ H5HG__protect(H5F_t *f, haddr_t addr, unsigned flags) /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* only H5AC__READ_ONLY_FLAG may appear in flags */ HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0); @@ -415,7 +415,7 @@ H5HG_extend(H5F_t *f, haddr_t addr, size_t need) /* Check args */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Protect the heap */ if (NULL == (heap = H5HG__protect(f, addr, H5AC__NO_FLAGS_SET))) @@ -521,13 +521,13 @@ H5HG_insert(H5F_t *f, size_t size, const void *obj, H5HG_t *hobj /*out*/) * If we didn't find any collection with enough free space then allocate a * new collection large enough for the message plus the collection header. */ - if (!H5F_addr_defined(addr)) { + if (!H5_addr_defined(addr)) { addr = H5HG__create(f, need + H5HG_SIZEOF_HDR(f)); - if (!H5F_addr_defined(addr)) + if (!H5_addr_defined(addr)) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to allocate a global heap collection") } /* end if */ - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); if (NULL == (heap = H5HG__protect(f, addr, H5AC__NO_FLAGS_SET))) HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap") |