Rename HDassert() to assert() (#3191)

* Change HDassert to assert

* Fix bin/make_err

1 files changed, 113 insertions, 113 deletions

diff --git a/src/H5Fquery.c b/src/H5Fquery.c
index 9f7f3c1..1605b44 100644
--- a/src/H5Fquery.c
+++ b/src/H5Fquery.c
@@ -79,7 +79,7 @@ H5F_shared_get_intent(const H5F_shared_t *f_sh)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f_sh);
+    assert(f_sh);
 
     FUNC_LEAVE_NOAPI(f_sh->flags)
 } /* end H5F_shared_get_intent() */
@@ -100,7 +100,7 @@ H5F_get_intent(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared->flags)
 } /* end H5F_get_intent() */
@@ -124,7 +124,7 @@ H5F_get_low_bound(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared->low_bound)
 } /* end H5F_get_low_bound() */
@@ -148,7 +148,7 @@ H5F_get_high_bound(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared->high_bound)
 } /* end H5F_get_high_bound() */
@@ -168,8 +168,8 @@ H5F_get_open_name(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->open_name);
+    assert(f);
+    assert(f->open_name);
 
     FUNC_LEAVE_NOAPI(f->open_name)
 } /* end H5F_get_open_name() */
@@ -189,8 +189,8 @@ H5F_get_actual_name(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->actual_name);
+    assert(f);
+    assert(f->actual_name);
 
     FUNC_LEAVE_NOAPI(f->actual_name)
 } /* end H5F_get_actual_name() */
@@ -211,9 +211,9 @@ H5F_get_extpath(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->extpath);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->extpath);
 
     FUNC_LEAVE_NOAPI(f->shared->extpath)
 } /* end H5F_get_extpath() */
@@ -232,7 +232,7 @@ H5F_get_shared(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared)
 } /* end H5F_get_shared() */
@@ -251,10 +251,10 @@ H5F_same_shared(const H5F_t *f1, const H5F_t *f2)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f1);
-    HDassert(f1->shared);
-    HDassert(f2);
-    HDassert(f2->shared);
+    assert(f1);
+    assert(f1->shared);
+    assert(f2);
+    assert(f2->shared);
 
     FUNC_LEAVE_NOAPI(f1->shared == f2->shared)
 } /* end H5F_same_shared() */
@@ -273,7 +273,7 @@ H5F_get_nopen_objs(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->nopen_objs)
 } /* end H5F_get_nopen_objs() */
@@ -292,7 +292,7 @@ H5F_file_id_exists(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->id_exists)
 } /* end H5F_file_id_exists() */
@@ -311,7 +311,7 @@ H5F_get_parent(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->parent)
 } /* end H5F_get_parent() */
@@ -330,7 +330,7 @@ H5F_get_nmounts(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->nmounts)
 } /* end H5F_get_nmounts() */
@@ -349,7 +349,7 @@ H5F_get_read_attempts(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared->read_attempts)
 } /* end H5F_get_read_attempts() */
@@ -369,8 +369,8 @@ H5F_get_fcpl(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->fcpl_id)
 } /* end H5F_get_fcpl() */
@@ -391,8 +391,8 @@ H5F_sizeof_addr(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->sizeof_addr)
 } /* end H5F_sizeof_addr() */
@@ -413,8 +413,8 @@ H5F_sizeof_size(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->sizeof_size)
 } /* H5F_sizeof_size() */
@@ -433,8 +433,8 @@ H5F_get_sohm_addr(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->sohm_addr)
 } /* end H5F_get_sohm_addr() */
@@ -453,8 +453,8 @@ H5F_get_sohm_vers(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->sohm_vers)
 } /* end H5F_get_sohm_vers() */
@@ -473,8 +473,8 @@ H5F_get_sohm_nindexes(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->sohm_nindexes)
 } /* end H5F_get_sohm_nindexes() */
@@ -497,9 +497,9 @@ H5F_sym_leaf_k(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->sblock);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->sblock);
 
     FUNC_LEAVE_NOAPI(f->shared->sblock->sym_leaf_k)
 } /* end H5F_sym_leaf_k() */
@@ -517,7 +517,7 @@ H5F_get_min_dset_ohdr(const H5F_t *f)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared->crt_dset_min_ohdr_flag)
 } /* end H5F_get_min_dset_ohdr */
@@ -540,10 +540,10 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->sblock);
-    HDassert(type);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->sblock);
+    assert(type);
 
     FUNC_LEAVE_NOAPI(f->shared->sblock->btree_k[type->id])
 } /* end H5F_Kvalue() */
@@ -562,8 +562,8 @@ H5F_get_nrefs(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->nrefs)
 } /* end H5F_get_nrefs() */
@@ -586,8 +586,8 @@ H5F_rdcc_nslots(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->rdcc_nslots)
 } /* end H5F_rdcc_nelmts() */
@@ -610,8 +610,8 @@ H5F_rdcc_nbytes(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->rdcc_nbytes)
 } /* end H5F_rdcc_nbytes() */
@@ -634,8 +634,8 @@ H5F_rdcc_w0(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->rdcc_w0)
 } /* end H5F_rdcc_w0() */
@@ -656,9 +656,9 @@ H5F_get_base_addr(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->sblock);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->sblock);
 
     FUNC_LEAVE_NOAPI(f->shared->sblock->base_addr)
 } /* end H5F_get_base_addr() */
@@ -681,8 +681,8 @@ H5F_grp_btree_shared(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->grp_btree_shared)
 } /* end H5F_grp_btree_shared() */
@@ -705,8 +705,8 @@ H5F_sieve_buf_size(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->sieve_buf_size)
 } /* end H5F_sieve_buf_size() */
@@ -732,8 +732,8 @@ H5F_gc_ref(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->gc_ref)
 } /* end H5F_gc_ref() */
@@ -753,8 +753,8 @@ H5F_get_fc_degree(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->fc_degree)
 } /* end H5F_get_fc_degree() */
@@ -776,8 +776,8 @@ H5F_get_evict_on_close(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->evict_on_close)
 } /* end H5F_get_evict_on_close() */
@@ -797,8 +797,8 @@ H5F_store_msg_crt_idx(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->store_msg_crt_idx)
 } /* end H5F_store_msg_crt_idx() */
@@ -818,7 +818,7 @@ H5F_shared_has_feature(const H5F_shared_t *f_sh, unsigned feature)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f_sh);
+    assert(f_sh);
 
     FUNC_LEAVE_NOAPI((hbool_t)(f_sh->lf->feature_flags & feature))
 } /* end H5F_shared_has_feature() */
@@ -838,8 +838,8 @@ H5F_has_feature(const H5F_t *f, unsigned feature)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI((hbool_t)(f->shared->lf->feature_flags & feature))
 } /* end H5F_has_feature() */
@@ -860,9 +860,9 @@ H5F_get_driver_id(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->lf);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->lf);
 
     FUNC_LEAVE_NOAPI(f->shared->lf->driver_id)
 } /* end H5F_get_driver_id() */
@@ -884,10 +884,10 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->lf);
-    HDassert(filenum);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->lf);
+    assert(filenum);
 
     /* Retrieve the file's serial number */
     if (H5FD_get_fileno(f->shared->lf, filenum) < 0)
@@ -912,7 +912,7 @@ H5F_shared_get_eoa(const H5F_shared_t *f_sh, H5FD_mem_t type)
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
-    HDassert(f_sh);
+    assert(f_sh);
 
     /* Dispatch to driver */
     if (HADDR_UNDEF == (ret_value = H5FD_get_eoa(f_sh->lf, type)))
@@ -937,8 +937,8 @@ H5F_get_eoa(const H5F_t *f, H5FD_mem_t type)
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     /* Dispatch to driver */
     if (HADDR_UNDEF == (ret_value = H5FD_get_eoa(f->shared->lf, type)))
@@ -963,8 +963,8 @@ H5F_shared_get_file_driver(const H5F_shared_t *f_sh, H5FD_t **file_handle)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f_sh);
-    HDassert(file_handle);
+    assert(f_sh);
+    assert(file_handle);
 
     *file_handle = f_sh->lf;
 
@@ -989,8 +989,8 @@ H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void **file_handle)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(file);
-    HDassert(file_handle);
+    assert(file);
+    assert(file_handle);
 
     /* Get the VFD handle */
     if (H5FD_get_vfd_handle(file->shared->lf, fapl, file_handle) < 0)
@@ -1017,8 +1017,8 @@ H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(H5_addr_le(f->shared->tmp_addr, addr))
 } /* end H5F_is_tmp_addr() */
@@ -1040,8 +1040,8 @@ H5F_use_tmp_space(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->use_tmp_space)
 } /* end H5F_use_tmp_space() */
@@ -1063,7 +1063,7 @@ H5F_coll_md_read(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->shared->coll_md_read)
 } /* end H5F_coll_md_read() */
@@ -1088,8 +1088,8 @@ H5F_shared_get_mpi_file_sync_required(const H5F_shared_t *f_sh, hbool_t *flag /*
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(f_sh);
-    HDassert(flag);
+    assert(f_sh);
+    assert(flag);
 
     /* Dispatch to driver */
     if ((ret_value = H5FD_mpi_get_file_sync_required(f_sh->lf, flag)) < 0)
@@ -1117,8 +1117,8 @@ H5F_use_mdc_logging(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->use_mdc_logging)
 } /* end H5F_use_mdc_logging() */
@@ -1140,8 +1140,8 @@ H5F_start_mdc_log_on_access(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->start_mdc_log_on_access)
 } /* end H5F_start_mdc_log_on_access() */
@@ -1163,8 +1163,8 @@ H5F_mdc_log_location(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->mdc_log_location)
 } /* end H5F_mdc_log_location() */
@@ -1184,8 +1184,8 @@ H5F_get_alignment(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->alignment)
 } /* end H5F_get_alignment() */
@@ -1205,8 +1205,8 @@ H5F_get_threshold(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->threshold)
 } /* end H5F_get_threshold() */
@@ -1226,8 +1226,8 @@ H5F_get_pgend_meta_thres(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->pgend_meta_thres)
 } /* end H5F_get_pgend_meta_thres() */
@@ -1247,8 +1247,8 @@ H5F_get_point_of_no_return(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->point_of_no_return)
 } /* end H5F_get_point_of_no_return() */
@@ -1268,8 +1268,8 @@ H5F_get_null_fsm_addr(const H5F_t *f)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->null_fsm_addr)
 } /* end H5F_get_null_fsm_addr() */
@@ -1291,8 +1291,8 @@ H5F_get_vol_cls(const H5F_t *f)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->vol_cls)
 } /* end H5F_get_vol_cls */
@@ -1311,7 +1311,7 @@ H5F_get_vol_obj(const H5F_t *f)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
+    assert(f);
 
     FUNC_LEAVE_NOAPI(f->vol_obj)
 } /* end H5F_get_vol_obj */
@@ -1337,8 +1337,8 @@ H5F__get_cont_info(const H5F_t *f, H5VL_file_cont_info_t *info)
     FUNC_ENTER_PACKAGE
 
     /* Sanity checks */
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     /* Verify structure version */
     if (info->version != H5VL_CONTAINER_INFO_VERSION)
@@ -1367,8 +1367,8 @@ H5F_get_file_locking(const H5F_t *f)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     FUNC_LEAVE_NOAPI(f->shared->use_file_locking)
 } /* end H5F_get_file_locking */
@@ -1389,8 +1389,8 @@ H5F_has_vector_select_io(const H5F_t *f, hbool_t is_write)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     if (is_write)
         ret_value = (f->shared->lf->cls->write_vector != NULL || f->shared->lf->cls->write_selection != NULL);