summaryrefslogtreecommitdiffstats
path: root/src/H5Dfarray.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/H5Dfarray.c')
-rw-r--r--src/H5Dfarray.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c
index 201cca8..24d9154 100644
--- a/src/H5Dfarray.c
+++ b/src/H5Dfarray.c
@@ -319,7 +319,7 @@ H5D__farray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx)
while (nelmts) {
/* Encode element */
/* (advances 'raw' pointer) */
- H5F_addr_encode_len(ctx->file_addr_len, (uint8_t **)&raw, *elmt);
+ H5_addr_encode_len(ctx->file_addr_len, (uint8_t **)&raw, *elmt);
/* Advance native element pointer */
elmt++;
@@ -359,7 +359,7 @@ H5D__farray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx)
while (nelmts) {
/* Decode element */
/* (advances 'raw' pointer) */
- H5F_addr_decode_len(ctx->file_addr_len, &raw, elmt);
+ H5_addr_decode_len(ctx->file_addr_len, &raw, elmt);
/* Advance native element pointer */
elmt++;
@@ -423,7 +423,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr)
/* Sanity checks */
assert(f);
- assert(H5F_addr_defined(obj_addr));
+ assert(H5_addr_defined(obj_addr));
/* Allocate context for debugging callback */
if (NULL == (dbg_ctx = H5FL_MALLOC(H5D_farray_ctx_ud_t)))
@@ -554,7 +554,7 @@ H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx
while (nelmts) {
/* Encode element */
/* (advances 'raw' pointer) */
- H5F_addr_encode_len(ctx->file_addr_len, &raw, elmt->addr);
+ H5_addr_encode_len(ctx->file_addr_len, &raw, elmt->addr);
UINT64ENCODE_VAR(raw, elmt->nbytes, ctx->chunk_size_len);
UINT32ENCODE(raw, elmt->filter_mask);
@@ -597,7 +597,7 @@ H5D__farray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx
while (nelmts) {
/* Decode element */
/* (advances 'raw' pointer) */
- H5F_addr_decode_len(ctx->file_addr_len, &raw, &elmt->addr);
+ H5_addr_decode_len(ctx->file_addr_len, &raw, &elmt->addr);
UINT64DECODE_VAR(raw, elmt->nbytes, ctx->chunk_size_len);
UINT32DECODE(raw, elmt->filter_mask);
@@ -672,7 +672,7 @@ H5D__farray_idx_depend(const H5D_chk_idx_info_t *idx_info)
assert(H5D_CHUNK_IDX_FARRAY == idx_info->layout->idx_type);
assert(idx_info->storage);
assert(H5D_CHUNK_IDX_FARRAY == idx_info->storage->idx_type);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(idx_info->storage->u.farray.fa);
/* Set up object header location for dataset */
@@ -719,7 +719,7 @@ H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNU
/* Check args */
assert(idx_info);
assert(idx_info->storage);
- assert(H5F_addr_defined(dset_ohdr_addr));
+ assert(H5_addr_defined(dset_ohdr_addr));
idx_info->storage->u.farray.dset_ohdr_addr = dset_ohdr_addr;
@@ -753,7 +753,7 @@ H5D__farray_idx_open(const H5D_chk_idx_info_t *idx_info)
assert(H5D_CHUNK_IDX_FARRAY == idx_info->layout->idx_type);
assert(idx_info->storage);
assert(H5D_CHUNK_IDX_FARRAY == idx_info->storage->idx_type);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(NULL == idx_info->storage->u.farray.fa);
/* Set up the user data */
@@ -805,7 +805,7 @@ H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info)
assert(idx_info->pline);
assert(idx_info->layout);
assert(idx_info->storage);
- assert(!H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(!H5_addr_defined(idx_info->storage->idx_addr));
assert(NULL == idx_info->storage->u.farray.fa);
assert(idx_info->layout->nchunks);
@@ -870,7 +870,7 @@ H5D__farray_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
/* Check args */
assert(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() */
/*-------------------------------------------------------------------------
@@ -897,7 +897,7 @@ H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata
assert(idx_info->pline);
assert(idx_info->layout);
assert(idx_info->storage);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(udata);
/* Check if the fixed array is open yet */
@@ -912,7 +912,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")
@@ -965,7 +965,7 @@ H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *uda
assert(idx_info->pline);
assert(idx_info->layout);
assert(idx_info->storage);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(udata);
/* Check if the fixed array is open yet */
@@ -1009,7 +1009,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:
@@ -1047,7 +1047,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");
@@ -1097,7 +1097,7 @@ H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t
assert(idx_info->pline);
assert(idx_info->layout);
assert(idx_info->storage);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(chunk_cb);
assert(chunk_udata);
@@ -1167,7 +1167,7 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t
assert(idx_info->pline);
assert(idx_info->layout);
assert(idx_info->storage);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(udata);
/* Check if the fixed array is open yet */
@@ -1196,7 +1196,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 */
- assert(H5F_addr_defined(elmt.addr));
+ assert(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)
@@ -1218,7 +1218,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 */
- assert(H5F_addr_defined(addr));
+ assert(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)
@@ -1255,7 +1255,7 @@ H5D__farray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
/* Sanity checks */
assert(chunk_rec);
- assert(H5F_addr_defined(chunk_rec->chunk_addr));
+ assert(H5_addr_defined(chunk_rec->chunk_addr));
assert(chunk_rec->nbytes > 0);
assert(f);
@@ -1294,7 +1294,7 @@ H5D__farray_idx_delete(const H5D_chk_idx_info_t *idx_info)
assert(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 */
@@ -1349,7 +1349,7 @@ H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk
assert(idx_info_dst->pline);
assert(idx_info_dst->layout);
assert(idx_info_dst->storage);
- assert(!H5F_addr_defined(idx_info_dst->storage->idx_addr));
+ assert(!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)
@@ -1363,7 +1363,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")
- assert(H5F_addr_defined(idx_info_dst->storage->idx_addr));
+ assert(H5_addr_defined(idx_info_dst->storage->idx_addr));
/* Reset metadata tag */
H5_END_TAG
@@ -1431,7 +1431,7 @@ H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
assert(idx_info->pline);
assert(idx_info->layout);
assert(idx_info->storage);
- assert(H5F_addr_defined(idx_info->storage->idx_addr));
+ assert(H5_addr_defined(idx_info->storage->idx_addr));
assert(index_size);
/* Open the fixed array in file */
generated by cgit v0.12 at 2025-02-10 06:30:50 (GMT)