From 961f250f42b81cda796360657c690d7f14f4a238 Mon Sep 17 00:00:00 2001 From: David Young Date: Wed, 9 Mar 2022 17:01:10 -0600 Subject: Re-de-HD. --- src/H5Cpkg.h | 34 +++++++++++++++++----------------- test/swmr_common.c | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index 6a015d8..7c71873 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -1790,8 +1790,8 @@ if ( ( (cache_ptr)->index_size != \ \ } else { /* slist disabled */ \ \ - HDassert( (cache_ptr)->slist_len == 0 ); \ - HDassert( (cache_ptr)->slist_size == 0 ); \ + assert( (cache_ptr)->slist_len == 0 ); \ + assert( (cache_ptr)->slist_size == 0 ); \ } \ } /* H5C__REMOVE_ENTRY_FROM_SLIST */ @@ -2670,13 +2670,13 @@ if ( ( (cache_ptr)->index_size != \ #define H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, fail_val) \ { \ - HDassert( (cache_ptr) ); \ - HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC ); \ - HDassert( (entry_ptr) ); \ - HDassert( !((entry_ptr)->is_protected) ); \ - HDassert( !((entry_ptr)->is_read_only) ); \ - HDassert( ((entry_ptr)->ro_ref_count) == 0 ); \ - HDassert( (entry_ptr)->size > 0 ); \ + assert( (cache_ptr) ); \ + assert( (cache_ptr)->magic == H5C__H5C_T_MAGIC ); \ + assert( (entry_ptr) ); \ + assert( !((entry_ptr)->is_protected) ); \ + assert( !((entry_ptr)->is_read_only) ); \ + assert( ((entry_ptr)->ro_ref_count) == 0 ); \ + assert( (entry_ptr)->size > 0 ); \ \ if ( (entry_ptr)->is_pinned ) { \ \ @@ -2732,13 +2732,13 @@ if ( ( (cache_ptr)->index_size != \ #define H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, fail_val) \ { \ - HDassert( (cache_ptr) ); \ - HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC ); \ - HDassert( (entry_ptr) ); \ - HDassert( !((entry_ptr)->is_protected) ); \ - HDassert( !((entry_ptr)->is_read_only) ); \ - HDassert( ((entry_ptr)->ro_ref_count) == 0 ); \ - HDassert( (entry_ptr)->size > 0 ); \ + assert( (cache_ptr) ); \ + assert( (cache_ptr)->magic == H5C__H5C_T_MAGIC ); \ + assert( (entry_ptr) ); \ + assert( !((entry_ptr)->is_protected) ); \ + assert( !((entry_ptr)->is_read_only) ); \ + assert( ((entry_ptr)->ro_ref_count) == 0 ); \ + assert( (entry_ptr)->size > 0 ); \ \ if ( (entry_ptr)->is_pinned ) { \ \ @@ -3349,7 +3349,7 @@ if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) && \ ) \ ) \ ) { \ - HDassert(0 && "COLL DLL sanity check failed"); \ + assert(0 && "COLL DLL sanity check failed"); \ HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "COLL DLL sanity check failed")\ } diff --git a/test/swmr_common.c b/test/swmr_common.c index 0348608..9837df9 100644 --- a/test/swmr_common.c +++ b/test/swmr_common.c @@ -202,7 +202,7 @@ generate_symbols(void) unsigned u, v; /* Local index variables */ for (u = 0; u < NLEVELS; u++) { - symbol_info[u] = HDmalloc(symbol_count[u] * sizeof(symbol_info_t)); + symbol_info[u] = malloc(symbol_count[u] * sizeof(symbol_info_t)); for (v = 0; v < symbol_count[u]; v++) { char name_buf[64]; -- cgit v0.12