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/H5Fio.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/H5Fio.c')
| -rw-r--r-- | src/H5Fio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Fio.c b/src/H5Fio.c index 06812fb..f6a8500 100644 --- a/src/H5Fio.c +++ b/src/H5Fio.c @@ -90,10 +90,10 @@ H5F_shared_block_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t /* Sanity checks */ HDassert(f_sh); HDassert(buf); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Check for attempting I/O on 'temporary' file address */ - if (H5F_addr_le(f_sh->tmp_addr, (addr + size))) + if (H5_addr_le(f_sh->tmp_addr, (addr + size))) HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") /* Treat global heap as raw data */ @@ -133,10 +133,10 @@ H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, void *buf / HDassert(f); HDassert(f->shared); HDassert(buf); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Check for attempting I/O on 'temporary' file address */ - if (H5F_addr_le(f->shared->tmp_addr, (addr + size))) + if (H5_addr_le(f->shared->tmp_addr, (addr + size))) HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") /* Treat global heap as raw data */ @@ -176,10 +176,10 @@ H5F_shared_block_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t HDassert(f_sh); HDassert(H5F_SHARED_INTENT(f_sh) & H5F_ACC_RDWR); HDassert(buf); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Check for attempting I/O on 'temporary' file address */ - if (H5F_addr_le(f_sh->tmp_addr, (addr + size))) + if (H5_addr_le(f_sh->tmp_addr, (addr + size))) HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") /* Treat global heap as raw data */ @@ -220,10 +220,10 @@ H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, const void HDassert(f->shared); HDassert(H5F_INTENT(f) & H5F_ACC_RDWR); HDassert(buf); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Check for attempting I/O on 'temporary' file address */ - if (H5F_addr_le(f->shared->tmp_addr, (addr + size))) + if (H5_addr_le(f->shared->tmp_addr, (addr + size))) HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") /* Treat global heap as raw data */ |