diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-05 15:04:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 15:04:56 (GMT) |
| commit | 7ecf1d09afa9379186c2ace158fb60d4afd96f0e (patch) | |
| tree | 529564764b9cc063dcf0f8741ce45d5c2fd11095 /src/H5HFdblock.c | |
| parent | e3559c7b64e7963e3515c2ebfd7f1abad810ed19 (diff) | |
| download | hdf5-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/H5HFdblock.c')
| -rw-r--r-- | src/H5HFdblock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index cf1fcdd..0e7b868 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -354,7 +354,7 @@ H5HF__man_dblock_new(H5HF_hdr_t *hdr, size_t request, H5HF_free_section_t **ret_ min_dblock_size *= 2; /* Check if this is the first block in the heap */ - if (!H5F_addr_defined(hdr->man_dtable.table_addr) && + if (!H5_addr_defined(hdr->man_dtable.table_addr) && min_dblock_size == hdr->man_dtable.cparam.start_block_size) { /* Create new direct block at starting offset */ if (H5HF__man_dblock_create(hdr, NULL, 0, &dblock_addr, ret_sec_node) < 0) @@ -440,7 +440,7 @@ H5HF__man_dblock_protect(H5HF_hdr_t *hdr, haddr_t dblock_addr, size_t dblock_siz * Check arguments. */ HDassert(hdr); - HDassert(H5F_addr_defined(dblock_addr)); + HDassert(H5_addr_defined(dblock_addr)); HDassert(dblock_size > 0); /* only H5AC__READ_ONLY_FLAG may appear in flags */ @@ -467,7 +467,7 @@ H5HF__man_dblock_protect(H5HF_hdr_t *hdr, haddr_t dblock_addr, size_t dblock_siz } /* end if */ else { /* Sanity check */ - HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, dblock_addr)); + HDassert(H5_addr_eq(par_iblock->ents[par_entry].addr, dblock_addr)); /* Set up parameters to read filtered direct block */ udata.odi_size = par_iblock->filt_ents[par_entry].size; @@ -561,7 +561,7 @@ H5HF__man_dblock_locate(H5HF_hdr_t *hdr, hsize_t obj_off, H5HF_indirect_t **ret_ iblock_addr = iblock->ents[entry].addr; /* Check if we need to (re-)create the child indirect block */ - if (!H5F_addr_defined(iblock_addr)) { + if (!H5_addr_defined(iblock_addr)) { if (H5HF__man_iblock_create(hdr, iblock, entry, nrows, nrows, &iblock_addr) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block") @@ -627,7 +627,7 @@ H5HF__man_dblock_delete(H5F_t *f, haddr_t dblock_addr, hsize_t dblock_size) * Check arguments. */ HDassert(f); - HDassert(H5F_addr_defined(dblock_addr)); + HDassert(H5_addr_defined(dblock_addr)); HDassert(dblock_size > 0); /* Check the direct block's status in the metadata cache */ |