diff options
Diffstat (limited to 'src/H5Dfarray.c')
-rw-r--r-- | src/H5Dfarray.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index c0d58b2..bcb4106 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -447,7 +447,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr) /* Sanity checks */ HDassert(f); - HDassert(H5F_addr_defined(obj_addr)); + HDassert(H5_addr_defined(obj_addr)); /* Allocate context for debugging callback */ if (NULL == (dbg_ctx = H5FL_MALLOC(H5D_farray_ctx_ud_t))) @@ -714,7 +714,7 @@ H5D__farray_idx_depend(const H5D_chk_idx_info_t *idx_info) HDassert(H5D_CHUNK_IDX_FARRAY == idx_info->layout->idx_type); HDassert(idx_info->storage); HDassert(H5D_CHUNK_IDX_FARRAY == idx_info->storage->idx_type); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(idx_info->storage->u.farray.fa); /* Set up object header location for dataset */ @@ -764,7 +764,7 @@ H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNU /* Check args */ HDassert(idx_info); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(dset_ohdr_addr)); + HDassert(H5_addr_defined(dset_ohdr_addr)); idx_info->storage->u.farray.dset_ohdr_addr = dset_ohdr_addr; @@ -801,7 +801,7 @@ H5D__farray_idx_open(const H5D_chk_idx_info_t *idx_info) HDassert(H5D_CHUNK_IDX_FARRAY == idx_info->layout->idx_type); HDassert(idx_info->storage); HDassert(H5D_CHUNK_IDX_FARRAY == idx_info->storage->idx_type); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(NULL == idx_info->storage->u.farray.fa); /* Set up the user data */ @@ -856,7 +856,7 @@ H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info) HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(!H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(!H5_addr_defined(idx_info->storage->idx_addr)); HDassert(NULL == idx_info->storage->u.farray.fa); HDassert(idx_info->layout->nchunks); @@ -924,7 +924,7 @@ H5D__farray_idx_is_space_alloc(const H5O_storage_chunk_t *storage) /* Check args */ HDassert(storage); - FUNC_LEAVE_NOAPI((hbool_t)H5F_addr_defined(storage->idx_addr)) + FUNC_LEAVE_NOAPI((hbool_t)H5_addr_defined(storage->idx_addr)) } /* end H5D__farray_idx_is_space_alloc() */ /*------------------------------------------------------------------------- @@ -953,7 +953,7 @@ H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(udata); /* Check if the fixed array is open yet */ @@ -968,7 +968,7 @@ H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata /* Set convenience pointer to fixed array structure */ fa = idx_info->storage->u.farray.fa; - if (!H5F_addr_defined(udata->chunk_block.offset)) + if (!H5_addr_defined(udata->chunk_block.offset)) HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "The chunk should have allocated already") if (udata->chunk_idx != (udata->chunk_idx & 0xffffffff)) /* negative value */ HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "chunk index must be less than 2^32") @@ -1024,7 +1024,7 @@ H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *uda HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(udata); /* Check if the fixed array is open yet */ @@ -1068,7 +1068,7 @@ H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *uda udata->filter_mask = 0; } /* end else */ - if (!H5F_addr_defined(udata->chunk_block.offset)) + if (!H5_addr_defined(udata->chunk_block.offset)) udata->chunk_block.length = 0; done: @@ -1109,7 +1109,7 @@ H5D__farray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void * udata->chunk_rec.chunk_addr = *(const haddr_t *)_elmt; /* Make "generic chunk" callback */ - if (H5F_addr_defined(udata->chunk_rec.chunk_addr)) + if (H5_addr_defined(udata->chunk_rec.chunk_addr)) if ((ret_value = (udata->cb)(&udata->chunk_rec, udata->udata)) < 0) HERROR(H5E_DATASET, H5E_CALLBACK, "failure in generic chunk iterator callback"); @@ -1162,7 +1162,7 @@ H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(chunk_cb); HDassert(chunk_udata); @@ -1235,7 +1235,7 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(udata); /* Check if the fixed array is open yet */ @@ -1264,7 +1264,7 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk info") /* Remove raw data chunk from file if not doing SWMR writes */ - HDassert(H5F_addr_defined(elmt.addr)); + HDassert(H5_addr_defined(elmt.addr)); if (!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) { H5_CHECK_OVERFLOW(elmt.nbytes, /*From: */ uint32_t, /*To: */ hsize_t); if (H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, elmt.addr, (hsize_t)elmt.nbytes) < 0) @@ -1286,7 +1286,7 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address") /* Remove raw data chunk from file if not doing SWMR writes */ - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); if (!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) { H5_CHECK_OVERFLOW(idx_info->layout->size, /*From: */ uint32_t, /*To: */ hsize_t); if (H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, addr, (hsize_t)idx_info->layout->size) < 0) @@ -1326,7 +1326,7 @@ H5D__farray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) /* Sanity checks */ HDassert(chunk_rec); - HDassert(H5F_addr_defined(chunk_rec->chunk_addr)); + HDassert(H5_addr_defined(chunk_rec->chunk_addr)); HDassert(chunk_rec->nbytes > 0); HDassert(f); @@ -1368,7 +1368,7 @@ H5D__farray_idx_delete(const H5D_chk_idx_info_t *idx_info) HDassert(idx_info->storage); /* Check if the index data structure has been allocated */ - if (H5F_addr_defined(idx_info->storage->idx_addr)) { + if (H5_addr_defined(idx_info->storage->idx_addr)) { H5D_farray_ctx_ud_t ctx_udata; /* User data for fixed array open call */ /* Iterate over the chunk addresses in the fixed array, deleting each chunk */ @@ -1426,7 +1426,7 @@ H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk HDassert(idx_info_dst->pline); HDassert(idx_info_dst->layout); HDassert(idx_info_dst->storage); - HDassert(!H5F_addr_defined(idx_info_dst->storage->idx_addr)); + HDassert(!H5_addr_defined(idx_info_dst->storage->idx_addr)); /* Check if the source fixed array is open yet */ if (NULL == idx_info_src->storage->u.farray.fa) @@ -1440,7 +1440,7 @@ H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk /* Create the fixed array that describes chunked storage in the dest. file */ if (H5D__farray_idx_create(idx_info_dst) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize chunked storage") - HDassert(H5F_addr_defined(idx_info_dst->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info_dst->storage->idx_addr)); /* Reset metadata tag */ H5_END_TAG @@ -1514,7 +1514,7 @@ H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) HDassert(idx_info->pline); HDassert(idx_info->layout); HDassert(idx_info->storage); - HDassert(H5F_addr_defined(idx_info->storage->idx_addr)); + HDassert(H5_addr_defined(idx_info->storage->idx_addr)); HDassert(index_size); /* Open the fixed array in file */ |