summaryrefslogtreecommitdiffstats
path: root/src/H5Dearray.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5Dearray.c')
-rw-r--r--src/H5Dearray.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/H5Dearray.c b/src/H5Dearray.c
index d334d28..5662c08 100644
--- a/src/H5Dearray.c
+++ b/src/H5Dearray.c
@@ -605,7 +605,7 @@ H5D__earray_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_earray_ctx_ud_t)))
@@ -716,7 +716,7 @@ H5D__earray_idx_depend(const H5D_chk_idx_info_t *idx_info)
HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->idx_type);
HDassert(idx_info->storage);
HDassert(H5D_CHUNK_IDX_EARRAY == 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.earray.ea);
/* Set up object header location for dataset */
@@ -779,7 +779,7 @@ H5D__earray_idx_open(const H5D_chk_idx_info_t *idx_info)
HDassert(H5D_CHUNK_IDX_EARRAY == idx_info->layout->idx_type);
HDassert(idx_info->storage);
HDassert(H5D_CHUNK_IDX_EARRAY == 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.earray.ea);
/* Set up the user data */
@@ -832,7 +832,7 @@ H5D__earray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t *space, had
HDassert(idx_info->layout);
HDassert(idx_info->storage);
HDassert(space);
- HDassert(H5F_addr_defined(dset_ohdr_addr));
+ HDassert(H5_addr_defined(dset_ohdr_addr));
/* Get the dim info for dataset */
if ((sndims = H5S_get_simple_extent_dims(space, NULL, max_dims)) < 0)
@@ -900,7 +900,7 @@ H5D__earray_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.earray.ea);
/* General parameters */
@@ -974,7 +974,7 @@ H5D__earray_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__earray_idx_is_space_alloc() */
/*-------------------------------------------------------------------------
@@ -1003,7 +1003,7 @@ H5D__earray_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 extensible array is open yet */
@@ -1018,7 +1018,7 @@ H5D__earray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata
/* Set convenience pointer to extensible array structure */
ea = idx_info->storage->u.earray.ea;
- 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")
@@ -1074,7 +1074,7 @@ H5D__earray_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 extensible array is open yet */
@@ -1136,7 +1136,7 @@ H5D__earray_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:
@@ -1226,7 +1226,7 @@ H5D__earray_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");
@@ -1283,7 +1283,7 @@ H5D__earray_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);
@@ -1355,7 +1355,7 @@ H5D__earray_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 extensible array is open yet */
@@ -1402,7 +1402,7 @@ H5D__earray_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)
@@ -1424,7 +1424,7 @@ H5D__earray_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)
@@ -1464,7 +1464,7 @@ H5D__earray_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);
@@ -1510,7 +1510,7 @@ H5D__earray_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_earray_ctx_ud_t ctx_udata; /* User data for extensible array open call */
/* Iterate over the chunk addresses in the extensible array, deleting each chunk */
@@ -1568,7 +1568,7 @@ H5D__earray_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 extensible array is open yet */
if (NULL == idx_info_src->storage->u.earray.ea)
@@ -1582,7 +1582,7 @@ H5D__earray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk
/* Create the extensible array that describes chunked storage in the dest. file */
if (H5D__earray_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
@@ -1656,7 +1656,7 @@ H5D__earray_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 extensible array in file */
generated by cgit v0.12 at 2024-10-02 17:07:43 (GMT)