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/H5Cpkg.h | |
| 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/H5Cpkg.h')
| -rw-r--r-- | src/H5Cpkg.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index cb488c9..1801341 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -548,7 +548,7 @@ if ((new_size) > (dll_size) || ((dll_len) == 1 && (new_size) != (dll_size))) { \ ((cache_ptr) == NULL || \ (cache_ptr)->index_size != \ ((cache_ptr)->clean_index_size + (cache_ptr)->dirty_index_size) || \ - !H5F_addr_defined(entry_addr) || \ + !H5_addr_defined(entry_addr) || \ H5C__HASH_FCN(entry_addr) < 0 || \ H5C__HASH_FCN(entry_addr) >= H5C__HASH_TABLE_LEN \ ) @@ -570,7 +570,7 @@ if ((new_size) > (dll_size) || ((dll_len) == 1 && (new_size) != (dll_size))) { \ #define H5C__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val) \ if ((cache_ptr) == NULL || \ - (entry_ptr) == NULL || !H5F_addr_defined((entry_ptr)->addr) || \ + (entry_ptr) == NULL || !H5_addr_defined((entry_ptr)->addr) || \ (entry_ptr)->ht_next != NULL || (entry_ptr)->ht_prev != NULL || \ (entry_ptr)->size <= 0 || \ H5C__HASH_FCN((entry_ptr)->addr) < 0 || \ @@ -614,7 +614,7 @@ if ((cache_ptr) == NULL || \ if ( (cache_ptr) == NULL || (cache_ptr)->index_len < 1 || \ (entry_ptr) == NULL || \ (cache_ptr)->index_size < (entry_ptr)->size || \ - !H5F_addr_defined((entry_ptr)->addr) || \ + !H5_addr_defined((entry_ptr)->addr) || \ (entry_ptr)->size <= 0 || \ H5C__HASH_FCN((entry_ptr)->addr) < 0 || \ H5C__HASH_FCN((entry_ptr)->addr) >= H5C__HASH_TABLE_LEN || \ @@ -644,7 +644,7 @@ if ( (cache_ptr) == NULL || (cache_ptr)->index_len < 1 || \ #define H5C__POST_HT_REMOVE_SC(cache_ptr, entry_ptr, fail_val) \ if ((cache_ptr) == NULL || \ - (entry_ptr) == NULL || !H5F_addr_defined((entry_ptr)->addr) || \ + (entry_ptr) == NULL || !H5_addr_defined((entry_ptr)->addr) || \ (entry_ptr)->size <= 0 || \ (entry_ptr)->ht_next != NULL || \ (entry_ptr)->ht_prev != NULL || \ @@ -889,7 +889,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir k = H5C__HASH_FCN(entry_addr); \ (entry_ptr) = (cache_ptr)->index[k]; \ while(entry_ptr) { \ - if(H5F_addr_eq(entry_addr, (entry_ptr)->addr)) { \ + if(H5_addr_eq(entry_addr, (entry_ptr)->addr)) { \ H5C__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, k, fail_val) \ if((entry_ptr) != (cache_ptr)->index[k]) { \ if((entry_ptr)->ht_next) \ @@ -1028,7 +1028,7 @@ if ((cache_ptr)->index_size != ((cache_ptr)->clean_index_size + (cache_ptr)->dir if((cache_ptr)->slist_enabled) { \ HDassert(entry_ptr); \ HDassert((entry_ptr)->size > 0); \ - HDassert(H5F_addr_defined((entry_ptr)->addr)); \ + HDassert(H5_addr_defined((entry_ptr)->addr)); \ HDassert(!(entry_ptr)->in_slist); \ HDassert(!H5C__ENTRY_IN_SLIST((cache_ptr), (entry_ptr))); \ HDassert((entry_ptr)->ring > H5C_RING_UNDEFINED); \ |