diff options
Diffstat (limited to 'src/H5Dsingle.c')
| -rw-r--r-- | src/H5Dsingle.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c index 1ac4df0..40238b5 100644 --- a/src/H5Dsingle.c +++ b/src/H5Dsingle.c @@ -121,7 +121,7 @@ H5D__single_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNU if (idx_info->pline->nused) { idx_info->layout->flags |= H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER; - if (!H5F_addr_defined(idx_info->storage->idx_addr)) { + if (!H5_addr_defined(idx_info->storage->idx_addr)) { idx_info->storage->u.single.nbytes = 0; idx_info->storage->u.single.filter_mask = 0; } @@ -155,7 +155,7 @@ H5D__single_idx_create(const H5D_chk_idx_info_t *idx_info) assert(idx_info->storage); assert(idx_info->layout->max_nchunks == idx_info->layout->nchunks); assert(idx_info->layout->nchunks == 1); - assert(!H5F_addr_defined(idx_info->storage->idx_addr)); + assert(!H5_addr_defined(idx_info->storage->idx_addr)); if (idx_info->pline->nused) assert(idx_info->layout->flags & H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER); @@ -182,7 +182,7 @@ H5D__single_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__single_idx_is_space_alloc() */ /*------------------------------------------------------------------------- @@ -212,7 +212,7 @@ H5D__single_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata assert(udata); /* Set the address for the chunk */ - assert(H5F_addr_defined(udata->chunk_block.offset)); + assert(H5_addr_defined(udata->chunk_block.offset)); idx_info->storage->idx_addr = udata->chunk_block.offset; if (idx_info->pline->nused > 0) { @@ -264,7 +264,7 @@ H5D__single_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *uda udata->chunk_block.length = idx_info->layout->size; 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; FUNC_LEAVE_NOAPI(SUCCEED) @@ -295,7 +295,7 @@ H5D__single_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t assert(idx_info->storage); assert(chunk_cb); assert(chunk_udata); - assert(H5F_addr_defined(idx_info->storage->idx_addr)); + assert(H5_addr_defined(idx_info->storage->idx_addr)); /* Initialize generic chunk record */ memset(&chunk_rec, 0, sizeof(chunk_rec)); @@ -340,7 +340,7 @@ H5D__single_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)); if (idx_info->layout->flags & H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER) nbytes = idx_info->storage->u.single.nbytes; @@ -380,10 +380,10 @@ H5D__single_idx_delete(const H5D_chk_idx_info_t *idx_info) assert(idx_info->layout); assert(idx_info->storage); - if (H5F_addr_defined(idx_info->storage->idx_addr)) + if (H5_addr_defined(idx_info->storage->idx_addr)) ret_value = H5D__single_idx_remove(idx_info, NULL); else - assert(!H5F_addr_defined(idx_info->storage->idx_addr)); + assert(!H5_addr_defined(idx_info->storage->idx_addr)); FUNC_LEAVE_NOAPI(ret_value) } /* end H5D__single_idx_delete() */ @@ -411,7 +411,7 @@ H5D__single_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_i assert(idx_info_src->pline); assert(idx_info_src->layout); assert(idx_info_src->storage); - assert(H5F_addr_defined(idx_info_src->storage->idx_addr)); + assert(H5_addr_defined(idx_info_src->storage->idx_addr)); assert(idx_info_dst); assert(idx_info_dst->f); |