summaryrefslogtreecommitdiffstats
path: root/src/H5EA.c
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-06-05 15:04:56 (GMT)
committerGitHub <noreply@github.com>2023-06-05 15:04:56 (GMT)
commit7ecf1d09afa9379186c2ace158fb60d4afd96f0e (patch)
tree529564764b9cc063dcf0f8741ce45d5c2fd11095 /src/H5EA.c
parente3559c7b64e7963e3515c2ebfd7f1abad810ed19 (diff)
downloadhdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.zip
hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.tar.gz
hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.tar.bz2
Convert H5F haddr_t macros to H5 (#3039)
Several macros for handling haddr_t values exist in H5Fprivate.h and have H5F prefixes, even though they have nothing to do with a particular file (e.g., H5F_addr_lt()). These macros have been moved to H5private.h and renamed to have an H5 prefix. Affected macros: H5F_addr_overflow H5F_addr_defined H5F_addr_eq H5F_addr_ne H5F_addr_lt H5F_addr_le H5F_addr_gt H5F_addr_ge H5F_addr_cmp H5F_addr_overlap H5F_addr_pow2 was unused and removed instead of converted.
Diffstat (limited to 'src/H5EA.c')
-rw-r--r--src/H5EA.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5EA.c b/src/H5EA.c
index 94b4336..15b0407 100644
--- a/src/H5EA.c
+++ b/src/H5EA.c
@@ -123,7 +123,7 @@ H5EA__new(H5F_t *f, haddr_t ea_addr, hbool_t from_open, void *ctx_udata)
/* Check arguments */
HDassert(f);
- HDassert(H5F_addr_defined(ea_addr));
+ HDassert(H5_addr_defined(ea_addr));
/* Allocate extensible array wrapper */
if (NULL == (ea = H5FL_CALLOC(H5EA_t)))
@@ -236,7 +236,7 @@ H5EA_open(H5F_t *f, haddr_t ea_addr, void *ctx_udata)
/* Check arguments */
HDassert(f);
- HDassert(H5F_addr_defined(ea_addr));
+ HDassert(H5_addr_defined(ea_addr));
/* Allocate and initialize new extensible array wrapper */
if (NULL == (ea = H5EA__new(f, ea_addr, TRUE, ctx_udata)))
@@ -360,12 +360,12 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
*thing_unprot_func = (H5EA__unprotect_func_t)NULL;
/* Check if we should create the index block */
- if (!H5F_addr_defined(hdr->idx_blk_addr)) {
+ if (!H5_addr_defined(hdr->idx_blk_addr)) {
/* Check if we are allowed to create the thing */
if (0 == (thing_acc & H5AC__READ_ONLY_FLAG)) { /* i.e. r/w access */
/* Create the index block */
hdr->idx_blk_addr = H5EA__iblock_create(hdr, &stats_changed);
- if (!H5F_addr_defined(hdr->idx_blk_addr))
+ if (!H5_addr_defined(hdr->idx_blk_addr))
HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, FAIL, "unable to create index block")
hdr_dirty = TRUE;
} /* end if */
@@ -406,7 +406,7 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
HDassert(dblk_idx < iblock->ndblk_addrs);
/* Check if the data block has been allocated on disk yet */
- if (!H5F_addr_defined(iblock->dblk_addrs[dblk_idx])) {
+ if (!H5_addr_defined(iblock->dblk_addrs[dblk_idx])) {
/* Check if we are allowed to create the thing */
if (0 == (thing_acc & H5AC__READ_ONLY_FLAG)) { /* i.e. r/w access */
haddr_t dblk_addr; /* Address of data block created */
@@ -417,7 +417,7 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
(dblk_idx * hdr->sblk_info[sblk_idx].dblk_nelmts);
dblk_addr = H5EA__dblock_create(hdr, iblock, &stats_changed, dblk_off,
hdr->sblk_info[sblk_idx].dblk_nelmts);
- if (!H5F_addr_defined(dblk_addr))
+ if (!H5_addr_defined(dblk_addr))
HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, FAIL,
"unable to create extensible array data block")
@@ -462,14 +462,14 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
sblk_off = sblk_idx - iblock->nsblks;
/* Check if the super block has been allocated on disk yet */
- if (!H5F_addr_defined(iblock->sblk_addrs[sblk_off])) {
+ if (!H5_addr_defined(iblock->sblk_addrs[sblk_off])) {
/* Check if we are allowed to create the thing */
if (0 == (thing_acc & H5AC__READ_ONLY_FLAG)) { /* i.e. r/w access */
haddr_t sblk_addr; /* Address of data block created */
/* Create super block */
sblk_addr = H5EA__sblock_create(hdr, iblock, &stats_changed, sblk_idx);
- if (!H5F_addr_defined(sblk_addr))
+ if (!H5_addr_defined(sblk_addr))
HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, FAIL,
"unable to create extensible array super block")
@@ -493,7 +493,7 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
HDassert(dblk_idx < sblock->ndblks);
/* Check if the data block has been allocated on disk yet */
- if (!H5F_addr_defined(sblock->dblk_addrs[dblk_idx])) {
+ if (!H5_addr_defined(sblock->dblk_addrs[dblk_idx])) {
/* Check if we are allowed to create the thing */
if (0 == (thing_acc & H5AC__READ_ONLY_FLAG)) { /* i.e. r/w access */
haddr_t dblk_addr; /* Address of data block created */
@@ -504,7 +504,7 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
(dblk_idx * hdr->sblk_info[sblk_idx].dblk_nelmts);
dblk_addr =
H5EA__dblock_create(hdr, sblock, &stats_changed, dblk_off, sblock->dblk_nelmts);
- if (!H5F_addr_defined(dblk_addr))
+ if (!H5_addr_defined(dblk_addr))
HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, FAIL,
"unable to create extensible array data block")
@@ -955,7 +955,7 @@ H5EA_delete(H5F_t *f, haddr_t ea_addr, void *ctx_udata)
/* Check arguments */
HDassert(f);
- HDassert(H5F_addr_defined(ea_addr));
+ HDassert(H5_addr_defined(ea_addr));
/* Lock the array header into memory */
if (NULL == (hdr = H5EA__hdr_protect(f, ea_addr, ctx_udata, H5AC__NO_FLAGS_SET)))