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

* Change HDassert to assert

* Fix bin/make_err

1 files changed, 472 insertions, 472 deletions

diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index ba4f0a4..2341a04 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -1750,9 +1750,9 @@ gent_many(void)
 
     /* Create links to external and UD links */
     ret = H5Lcreate_soft("/g8/elink", fid, "/g7/slink5", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Lcreate_soft("/g8/udlink", fid, "/g7/slink6", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     H5Fclose(fid);
 }
@@ -2707,16 +2707,16 @@ gent_vldatatypes(void)
     type  = H5Tvlen_create(H5T_NATIVE_INT);
     dset  = H5Dcreate2(file, "Dataset1.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret   = H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Treclaim(type, space, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(type);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(space);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Allocate and initialize VL dataset to write */
     for (i = 0; i < SPACE1_DIM1; i++) {
@@ -2734,16 +2734,16 @@ gent_vldatatypes(void)
     type  = H5Tvlen_create(H5T_NATIVE_FLOAT);
     dset  = H5Dcreate2(file, "Dataset2.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret   = H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Treclaim(type, space, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(type);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(space);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Allocate and initialize a scalar VL dataset to write */
     adata.p   = HDmalloc(37 * sizeof(int));
@@ -2757,18 +2757,18 @@ gent_vldatatypes(void)
     type  = H5Tvlen_create(H5T_NATIVE_INT);
     dset  = H5Dcreate2(file, "Dataset3.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret   = H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &adata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Treclaim(type, space, H5P_DEFAULT, &adata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(type);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(space);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(file);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -2821,23 +2821,23 @@ gent_vldatatypes2(void)
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Reclaim the write VL data */
     ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -2881,34 +2881,34 @@ gent_vldatatypes3(void)
 
     /* Insert fields */
     ret = H5Tinsert(tid2, "i", HOFFSET(s1, i), H5T_NATIVE_INT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tinsert(tid2, "f", HOFFSET(s1, f), H5T_NATIVE_FLOAT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tinsert(tid2, "v", HOFFSET(s1, v), tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid1, "Dataset1", tid2, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Reclaim the write VL data */
     ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -2948,9 +2948,9 @@ gent_vldatatypes4(void)
 
     /* Insert fields */
     ret = H5Tinsert(tid2, "i", HOFFSET(s1, i), H5T_NATIVE_INT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tinsert(tid2, "f", HOFFSET(s1, f), H5T_NATIVE_FLOAT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a datatype to refer to */
     tid1 = H5Tvlen_create(tid2);
@@ -2960,23 +2960,23 @@ gent_vldatatypes4(void)
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Reclaim the write VL data */
     ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /* Generate a variable-length dataset with NULL values in it */
@@ -3008,37 +3008,37 @@ gent_vldatatypes5(void)
 
     /* Create file */
     fid1 = H5Fcreate(FILE43, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid1 > 0);
+    assert(fid1 > 0);
 
     /* Create dataspace for datasets */
     sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
-    HDassert(sid1 > 0);
+    assert(sid1 > 0);
 
     /* Create a datatype to refer to */
     tid1 = H5Tvlen_create(H5T_NATIVE_UINT);
-    HDassert(tid1 > 0);
+    assert(tid1 > 0);
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid1, F43_DSETNAME, tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(dataset > 0);
+    assert(dataset > 0);
 
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /* This is big enough to make h5dump to use hyperslap to read
@@ -3104,7 +3104,7 @@ gent_array1_big(void)
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*---------------------------
      * Region Reference dataset
@@ -3128,13 +3128,13 @@ gent_array1_big(void)
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Release memory */
     HDfree(wbuf);
@@ -3173,17 +3173,17 @@ gent_array1(void)
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3220,17 +3220,17 @@ gent_array2(void)
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3272,19 +3272,19 @@ gent_array3(void)
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3323,35 +3323,35 @@ gent_array4(void)
 
     /* Insert integer field */
     ret = H5Tinsert(tid2, "i", HOFFSET(s2_t, i), H5T_NATIVE_INT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Insert float field */
     ret = H5Tinsert(tid2, "f", HOFFSET(s2_t, f), H5T_NATIVE_FLOAT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create an array datatype to refer to */
     tid1 = H5Tarray_create2(tid2, ARRAY1_RANK, tdims1);
 
     /* Close compound datatype */
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3392,42 +3392,42 @@ gent_array5(void)
 
     /* Insert integer field */
     ret = H5Tinsert(tid2, "i", HOFFSET(s2_t, i), H5T_NATIVE_INT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create an array of floats datatype */
     tid3 = H5Tarray_create2(H5T_NATIVE_FLOAT, ARRAY1_RANK, tdims1);
 
     /* Insert float array field */
     ret = H5Tinsert(tid2, "f", HOFFSET(s2_t, f), tid3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close array of floats field datatype */
     ret = H5Tclose(tid3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create an array datatype to refer to */
     tid1 = H5Tarray_create2(tid2, ARRAY1_RANK, tdims1);
 
     /* Close compound datatype */
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3467,28 +3467,28 @@ gent_array6(void)
 
     /* Close VL datatype */
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Reclaim the write VL data */
     ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3531,35 +3531,35 @@ gent_array7(void)
 
     /* Close nested array datatype */
     ret = H5Tclose(tid3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create an array datatype to refer to */
     tid1 = H5Tarray_create2(tid2, ARRAY1_RANK, tdims1);
 
     /* Close VL datatype */
     ret = H5Tclose(tid2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a dataset */
     dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Reclaim the write VL data */
     ret = H5Treclaim(tid1, sid1, H5P_DEFAULT, wdata);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /* Test the boundary of the display output buffer at the reallocation event */
@@ -3578,7 +3578,7 @@ gent_array8(void)
 
     /* Allocate data buffer */
     wdata = (int *)HDmalloc(F64_DIM1 * sizeof(int));
-    HDassert(wdata);
+    assert(wdata);
 
     /*
      * Initialize data.  i is the element in the dataspace, j and k the
@@ -3610,20 +3610,20 @@ gent_array8(void)
         dset = H5Dcreate2(file, F64_DATASET, filetype, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if (dset >= 0)
             status = H5Dwrite(dset, filetype, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-        HDassert(status >= 0);
+        assert(status >= 0);
     }
 
     /*
      * Close and release resources.
      */
     status = H5Dclose(dset);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Sclose(space);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Tclose(filetype);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Fclose(file);
-    HDassert(status >= 0);
+    assert(status >= 0);
     HDfree(wdata);
 }
 
@@ -3648,30 +3648,30 @@ gent_empty(void)
     dset = H5Dcreate2(file, "Dataset1.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     /* Don't write any data */
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(type);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* write out an empty native integer dataset dataset */
     dset = H5Dcreate2(file, "Dataset2.0", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     /* Don't write any data */
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* write out an empty native floating-point dataset dataset */
     dset = H5Dcreate2(file, "Dataset3.0", H5T_NATIVE_FLOAT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     /* Don't write any data */
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* write out an empty array dataset */
     type = H5Tarray_create2(H5T_NATIVE_INT, SPACE1_RANK, dims);
     dset = H5Dcreate2(file, "Dataset4.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     /* Don't write any data */
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(type);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* write out an empty compound dataset */
     type = H5Tcreate(H5T_COMPOUND, sizeof(empty_struct));
@@ -3681,15 +3681,15 @@ gent_empty(void)
     dset = H5Dcreate2(file, "Dataset5.0", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     /* Don't write any data */
     ret = H5Dclose(dset);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(type);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Sclose(space);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Fclose(file);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 static void
@@ -3881,7 +3881,7 @@ gent_multi(void)
     HDmemset(memb_name, 0, sizeof memb_name);
     HDmemset(memb_addr, 0, sizeof memb_addr);
 
-    HDassert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
+    assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
 
     for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
         memb_fapl[mt] = H5P_DEFAULT;
@@ -4168,9 +4168,9 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     tid    = H5Tvlen_create(H5T_NATIVE_INT);
     aid    = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf5);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
     status = H5Sclose(sid);
@@ -4277,9 +4277,9 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     tid    = H5Tvlen_create(H5T_NATIVE_INT);
     aid    = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf52);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
     status = H5Sclose(sid);
@@ -4408,9 +4408,9 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     tid    = H5Tvlen_create(H5T_NATIVE_INT);
     aid    = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(aid, tid, buf53);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Aclose(aid);
     status = H5Tclose(tid);
     status = H5Sclose(sid);
@@ -4597,9 +4597,9 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     tid    = H5Tvlen_create(H5T_NATIVE_INT);
     did    = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Treclaim(tid, sid, H5P_DEFAULT, buf5);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
     status = H5Sclose(sid);
@@ -4705,9 +4705,9 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     tid    = H5Tvlen_create(H5T_NATIVE_INT);
     did    = H5Dcreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf52);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Treclaim(tid, sid, H5P_DEFAULT, buf52);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
     status = H5Sclose(sid);
@@ -4842,9 +4842,9 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
     tid    = H5Tvlen_create(H5T_NATIVE_INT);
     did    = H5Dcreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf53);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Treclaim(tid, sid, H5P_DEFAULT, buf53);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Dclose(did);
     status = H5Tclose(tid);
     status = H5Sclose(sid);
@@ -4915,7 +4915,7 @@ gent_attr_all(void)
     sid    = H5Screate_simple(1, dims, NULL);
     did    = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Sclose(sid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create groups */
     group_id  = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -4940,17 +4940,17 @@ gent_attr_all(void)
 
     /* Close */
     status = H5Dclose(did);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Gclose(group_id);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Gclose(group2_id);
-    HDassert(status >= 0);
+    assert(status >= 0);
     status = H5Gclose(root_id);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Close file */
     status = H5Fclose(fid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -5091,65 +5091,65 @@ gent_compound_complex(void)
 
     /* Create the dataspace                                           */
     dataspace = H5Screate_simple(F41_RANK, dim, NULL);
-    HDassert(dataspace >= 0);
+    assert(dataspace >= 0);
 
     /* Create the file                                                */
     datafile = H5Fcreate(FILE41, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(datafile >= 0);
+    assert(datafile >= 0);
 
     /* Copy the array data type for the string array                  */
     array_tid = H5Tcopy(H5T_C_S1);
-    HDassert(array_tid >= 0);
+    assert(array_tid >= 0);
 
     /* Set the string array size to Variable                          */
     status = H5Tset_size(array_tid, H5T_VARIABLE);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the array data type for the string array                */
     str_array_id = H5Tarray_create2(array_tid, F41_ARRAY_RANK, array_dimb);
-    HDassert(str_array_id >= 0);
+    assert(str_array_id >= 0);
 
     /* Copy the array data type for the character array               */
     array1_tid = H5Tcopy(H5T_C_S1);
-    HDassert(array1_tid >= 0);
+    assert(array1_tid >= 0);
 
     /* Set the character array size                                   */
     status = H5Tset_size(array1_tid, F41_ARRAY_DIMc);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the array data type for the character array             */
     array2_tid = H5Tarray_create2(H5T_NATIVE_SHORT, F41_ARRAY_RANKd, array_dimd);
-    HDassert(array2_tid >= 0);
+    assert(array2_tid >= 0);
 
     /* Create the array data type for the character array             */
     array4_tid = H5Tarray_create2(H5T_NATIVE_DOUBLE, F41_ARRAY_RANK, array_dimf);
-    HDassert(array4_tid >= 0);
+    assert(array4_tid >= 0);
 
     /* Create the memory data type                                    */
     Array1Structid = H5Tcreate(H5T_COMPOUND, sizeof(Array1Struct));
-    HDassert(Array1Structid >= 0);
+    assert(Array1Structid >= 0);
 
     /* Insert the arrays and variables into the structure             */
     status = H5Tinsert(Array1Structid, "a_name", HOFFSET(Array1Struct, a), H5T_NATIVE_INT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, "b_name", HOFFSET(Array1Struct, b), str_array_id);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, "c_name", HOFFSET(Array1Struct, c), array1_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, "d_name", HOFFSET(Array1Struct, d), array2_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, "e_name", HOFFSET(Array1Struct, e), H5T_NATIVE_FLOAT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, "f_name", HOFFSET(Array1Struct, f), array4_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, "g_name", HOFFSET(Array1Struct, g), H5T_NATIVE_CHAR);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the dataset                                             */
     dataset = H5Dcreate2(datafile, F41_DATASETNAME, Array1Structid, dataspace, H5P_DEFAULT, H5P_DEFAULT,
@@ -5157,35 +5157,35 @@ gent_compound_complex(void)
 
     /* Write data to the dataset                                      */
     status = H5Dwrite(dataset, Array1Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Array1);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Release resources                                              */
     status = H5Tclose(Array1Structid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array1_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array2_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array4_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(str_array_id);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Sclose(dataspace);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Dclose(dataset);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Fclose(datafile);
-    HDassert(status >= 0);
+    assert(status >= 0);
 }
 
 static void
@@ -5202,7 +5202,7 @@ gent_named_dtype_attr(void)
 
     /* Create a file */
     fid = H5Fcreate(FILE42, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid > 0);
+    assert(fid > 0);
 
     /*-------------------------------------------------------------------------
      * datatype
@@ -5211,27 +5211,27 @@ gent_named_dtype_attr(void)
 
     /* Create a datatype to commit and use */
     tid = H5Tcopy(H5T_NATIVE_INT);
-    HDassert(tid > 0);
+    assert(tid > 0);
 
     /* Commit datatype to file */
     ret = H5Tcommit2(fid, F42_TYPENAME, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a hard link to the datatype */
     ret = H5Lcreate_hard(fid, F42_TYPENAME, fid, F42_LINKNAME, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Create a scalar dataspace used for all objects */
     sid = H5Screate(H5S_SCALAR);
-    HDassert(sid > 0);
+    assert(sid > 0);
 
     /* Create attribute on committed datatype */
     aid = H5Acreate2(tid, F42_ATTRNAME, H5T_STD_I32LE, sid, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(aid > 0);
+    assert(aid > 0);
 
     /* Write data into the attribute */
     ret = H5Awrite(aid, H5T_NATIVE_INT, &data);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * dataset
@@ -5240,15 +5240,15 @@ gent_named_dtype_attr(void)
 
     /* Create dataset */
     did = H5Dcreate2(fid, F42_DSETNAME, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(did > 0);
+    assert(did > 0);
 
     /* Create attribute on dataset */
     aid = H5Acreate2(did, F42_ATTRNAME, tid, sid, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(aid > 0);
+    assert(aid > 0);
 
     /* Write data into the attribute */
     ret = H5Awrite(aid, H5T_NATIVE_INT, &data);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * group
@@ -5257,15 +5257,15 @@ gent_named_dtype_attr(void)
 
     /* Create a group */
     gid = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(gid > 0);
+    assert(gid > 0);
 
     /* Create attribute on group */
     aid = H5Acreate2(gid, F42_ATTRNAME, tid, sid, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(aid > 0);
+    assert(aid > 0);
 
     /* Write data into the attribute */
     ret = H5Awrite(aid, H5T_NATIVE_INT, &data);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * close
@@ -5274,23 +5274,23 @@ gent_named_dtype_attr(void)
 
     /* Close attribute */
     ret = H5Aclose(aid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close dataset */
     ret = H5Dclose(did);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close dataspace */
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close datatype */
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* Close file */
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -5423,25 +5423,25 @@ make_external(hid_t fid)
 
     dcpl = H5Pcreate(H5P_DATASET_CREATE);
     ret  = H5Pset_external(dcpl, "ext1.bin", (off_t)0, size);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_external(dcpl, "ext2.bin", (off_t)0, size);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     sid = H5Screate_simple(1, cur_size, max_size);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     dsid = H5Dcreate2(fid, "external", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     H5Dclose(dsid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     H5Pclose(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -5477,7 +5477,7 @@ gent_filters(void)
 
     /* create a file */
     fid = H5Fcreate(FILE44, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* Check if we support comments in the current VOL connector */
     H5VLquery_optional(fid, H5VL_SUBCLS_OBJECT, H5VL_NATIVE_OBJECT_SET_COMMENT, &supports_comments);
@@ -5494,40 +5494,40 @@ gent_filters(void)
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_layout(dcpl, H5D_COMPACT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "compact", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     if (supports_comments & H5VL_OPT_QUERY_SUPPORTED) {
         ret = H5Oset_comment_by_name(fid, "compact", "This is a dataset with compact storage", H5P_DEFAULT);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
     }
 
     ret = H5Pset_layout(dcpl, H5D_CONTIGUOUS);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "contiguous", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     if (supports_comments & H5VL_OPT_QUERY_SUPPORTED) {
         ret = H5Oset_comment_by_name(fid, "contiguous", "This is a dataset with contiguous storage",
                                      H5P_DEFAULT);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
     }
 
     ret = H5Pset_layout(dcpl, H5D_CHUNKED);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_chunk(dcpl, SPACE2_RANK, chunk_dims);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "chunked", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     if (supports_comments & H5VL_OPT_QUERY_SUPPORTED) {
         ret = H5Oset_comment_by_name(fid, "chunked", "This is a dataset with chunked storage", H5P_DEFAULT);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
     }
 
     /*-------------------------------------------------------------------------
@@ -5537,7 +5537,7 @@ gent_filters(void)
 
     /* set up chunk */
     ret = H5Pset_chunk(dcpl, SPACE2_RANK, chunk_dims);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * SZIP
@@ -5547,14 +5547,14 @@ gent_filters(void)
     if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
         /* remove the filters from the dcpl */
         ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
 
         /* set szip data */
         ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
 
         ret = make_dset(fid, "szip", sid, H5T_NATIVE_INT, dcpl, buf1);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
     }
 #endif /* H5_HAVE_FILTER_SZIP */
 
@@ -5565,14 +5565,14 @@ gent_filters(void)
 #if defined(H5_HAVE_FILTER_DEFLATE)
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set deflate data */
     ret = H5Pset_deflate(dcpl, 9);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "deflate", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 #endif
 
     /*-------------------------------------------------------------------------
@@ -5582,14 +5582,14 @@ gent_filters(void)
 
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set the shuffle filter */
     ret = H5Pset_shuffle(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "shuffle", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * checksum
@@ -5598,14 +5598,14 @@ gent_filters(void)
 
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set the checksum filter */
     ret = H5Pset_fletcher32(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "fletcher32", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * nbit
@@ -5614,16 +5614,16 @@ gent_filters(void)
 
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set the checksum filter */
     ret = H5Pset_nbit(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     tid = H5Tcopy(H5T_NATIVE_INT);
     H5Tset_precision(tid, H5Tget_size(tid) - 1);
     ret = make_dset(fid, "nbit", sid, tid, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * scaleoffset
@@ -5632,14 +5632,14 @@ gent_filters(void)
 
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set the scaleoffset filter */
     ret = H5Pset_scaleoffset(dcpl, H5Z_SO_INT, (int)H5Tget_size(H5T_NATIVE_INT));
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "scaleoffset", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * all filters
@@ -5647,37 +5647,37 @@ gent_filters(void)
      */
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set the shuffle filter */
     ret = H5Pset_shuffle(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
 #ifdef H5_HAVE_FILTER_SZIP
     if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
         szip_options_mask = H5_SZIP_CHIP_OPTION_MASK | H5_SZIP_EC_OPTION_MASK;
         /* set szip data */
         ret = H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
     }
 #endif /* H5_HAVE_FILTER_SZIP */
 
 #if defined(H5_HAVE_FILTER_DEFLATE)
     /* set deflate data */
     ret = H5Pset_deflate(dcpl, 5);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 #endif
 
     /* set the checksum filter */
     ret = H5Pset_fletcher32(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* set the nbit filter */
     ret = H5Pset_nbit(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "all", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * user defined filter
@@ -5685,20 +5685,20 @@ gent_filters(void)
      */
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Zregister(H5Z_MYFILTER);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_filter(dcpl, MYFILTER_ID, 0, 0, NULL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "myfilter", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * make an external dataset
@@ -5711,27 +5711,27 @@ gent_filters(void)
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = make_dset(fid, "alloc_time_early", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * H5D_ALLOC_TIME_INCR
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_INCR);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = make_dset(fid, "alloc_time_incr", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * H5D_ALLOC_TIME_LATE
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = make_dset(fid, "alloc_time_late", sid, H5T_NATIVE_INT, dcpl, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * commit a H5G_TYPE type with a comment
@@ -5739,28 +5739,28 @@ gent_filters(void)
      */
     tid = H5Tcopy(H5T_STD_B8LE);
     ret = H5Tcommit2(fid, "mytype", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     if (supports_comments & H5VL_OPT_QUERY_SUPPORTED) {
         ret = H5Oset_comment_by_name(fid, "mytype", "This is a committed datatype", H5P_DEFAULT);
-        HDassert(ret >= 0);
+        assert(ret >= 0);
     }
 
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * close
      *-------------------------------------------------------------------------
      */
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pclose(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -5825,7 +5825,7 @@ gent_fcontents(void)
 
     /* create a file */
     fid = H5Fcreate(FILE46, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     write_dset(fid, 1, dims, "dset", H5T_NATIVE_INT, buf);
 
@@ -5851,27 +5851,27 @@ gent_fcontents(void)
 
     /* hard link to "dset" */
     ret = H5Lcreate_hard(fid, "/dset", H5L_SAME_LOC, "dset3", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* hard link to "dset" */
     ret = H5Lcreate_hard(fid, "/dset", H5L_SAME_LOC, "dset4", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* soft link to itself */
     ret = H5Lcreate_soft("mylink", fid, "mylink", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* soft link to "dset" */
     ret = H5Lcreate_soft("/dset", fid, "softlink", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* dangling external link */
     ret = H5Lcreate_external("fname", "oname", fid, "extlink", H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* dangling udlink */
     ret = H5Lcreate_ud(fid, "udlink", (H5L_type_t)MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * datatypes
@@ -5879,19 +5879,19 @@ gent_fcontents(void)
      */
     tid = H5Tcopy(H5T_NATIVE_INT);
     ret = H5Tcommit2(fid, "mytype", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* no name datatype */
     tid = H5Tcopy(H5T_NATIVE_INT);
     ret = H5Tcommit2(fid, "mytype2", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     write_dset(fid, 1, dims, "dsetmytype2", tid, buf);
     ret = H5Ldelete(fid, "mytype2", H5P_DEFAULT);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * close
@@ -5899,14 +5899,14 @@ gent_fcontents(void)
      */
 
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* create a file for the bootblock test */
     fid = H5Fcreate(FILE47, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -5943,7 +5943,7 @@ gent_fvalues(void)
 
     /* create a file */
     fid = H5Fcreate(FILE48, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* create a space */
     sid = H5Screate_simple(1, dims, NULL);
@@ -5957,42 +5957,42 @@ gent_fvalues(void)
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "fill_time_ifset", sid, H5T_NATIVE_INT, dcpl, buf);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * H5D_FILL_TIME_NEVER
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "fill_time_never", sid, H5T_NATIVE_INT, dcpl, buf);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * H5D_FILL_TIME_ALLOC
      *-------------------------------------------------------------------------
      */
     ret = H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillval1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = make_dset(fid, "fill_time_alloc", sid, H5T_NATIVE_INT, dcpl, buf);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pclose(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * dataset with no fill value
@@ -6009,13 +6009,13 @@ gent_fvalues(void)
     H5Tinsert(tid, "a", HOFFSET(c_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(c_t, b), H5T_NATIVE_DOUBLE);
     ret = H5Pset_fill_value(dcpl, tid, &fillval2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = make_dset(fid, "fill_compound", sid, tid, dcpl, buf2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Pclose(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * dataset with a H5T_VLEN fill value
@@ -6035,17 +6035,17 @@ gent_fvalues(void)
     fillval3.p   = NULL;
     fillval3.len = 0;
     ret          = H5Pset_fill_value(dcpl, tid, &fillval3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     did = H5Dcreate2(fid, "fill_vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Treclaim(tid, sid, H5P_DEFAULT, buf3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Dclose(did);
     ret = H5Tclose(tid);
     ret = H5Pclose(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * dataset with a H5T_ARRAY fill value
@@ -6060,9 +6060,9 @@ gent_fvalues(void)
      *-------------------------------------------------------------------------
      */
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -6105,7 +6105,7 @@ gent_string(void)
 
     /* create a file */
     fid = H5Fcreate(FILE49, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /*-------------------------------------------------------------------------
      * str1
@@ -6114,11 +6114,11 @@ gent_string(void)
 
     tid = H5Tcopy(H5T_C_S1);
     ret = H5Tset_size(tid, sizeof(buf1));
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     write_dset(fid, 1, dims1, "str1", tid, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * str2
@@ -6127,16 +6127,16 @@ gent_string(void)
     sid = H5Screate_simple(SPACE1_RANK, dims2, NULL);
     tid = H5Tcopy(H5T_C_S1);
     ret = H5Tset_size(tid, H5T_VARIABLE);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     did = H5Dcreate2(fid, "str2", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     ret = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Dclose(did);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * str3
@@ -6149,13 +6149,13 @@ gent_string(void)
     H5Tinsert(tid, "a", HOFFSET(c_t, a), H5T_NATIVE_INT);
     H5Tinsert(tid, "str", HOFFSET(c_t, str), str_tid);
     ret = make_dset(fid, "str3", sid, tid, H5P_DEFAULT, &buf3);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Tclose(str_tid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * str4
@@ -6164,14 +6164,14 @@ gent_string(void)
     sid = H5Screate_simple(SPACE1_RANK, dims4, NULL);
     ret = make_dset(fid, "str4", sid, H5T_NATIVE_CHAR, H5P_DEFAULT, buf4);
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * close
      *-------------------------------------------------------------------------
      */
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -6215,7 +6215,7 @@ gent_aindices(void)
 
     /* create a file */
     fid = H5Fcreate(FILE50, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /*-------------------------------------------------------------------------
      * root datasets
@@ -6248,7 +6248,7 @@ gent_aindices(void)
      *-------------------------------------------------------------------------
      */
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------
@@ -6269,34 +6269,34 @@ gent_longlinks(void)
 
     /* Create files */
     fid = H5Fcreate(FILE51, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* Create group with short name in file (used as target for hard links) */
     gid = H5Gcreate2(fid, "grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(gid >= 0);
+    assert(gid >= 0);
 
     /* Construct very long file name */
     objname = (char *)HDmalloc((size_t)(F51_MAX_NAME_LEN + 1));
-    HDassert(objname);
+    assert(objname);
     for (u = 0; u < F51_MAX_NAME_LEN; u++)
         objname[u] = 'a';
     objname[F51_MAX_NAME_LEN] = '\0';
 
     /* Create hard link to existing object */
-    HDassert(H5Lcreate_hard(fid, "grp1", fid, objname, H5P_DEFAULT, H5P_DEFAULT) >= 0);
+    assert(H5Lcreate_hard(fid, "grp1", fid, objname, H5P_DEFAULT, H5P_DEFAULT) >= 0);
 
     /* Create soft link to existing object */
     objname[0] = 'b';
-    HDassert(H5Lcreate_soft("grp1", fid, objname, H5P_DEFAULT, H5P_DEFAULT) >= 0);
+    assert(H5Lcreate_soft("grp1", fid, objname, H5P_DEFAULT, H5P_DEFAULT) >= 0);
 
     /* Create group with long name in existing group */
     gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(gid2 >= 0);
+    assert(gid2 >= 0);
 
     /* Close objects */
-    HDassert(H5Gclose(gid2) >= 0);
-    HDassert(H5Gclose(gid) >= 0);
-    HDassert(H5Fclose(fid) >= 0);
+    assert(H5Gclose(gid2) >= 0);
+    assert(H5Gclose(gid) >= 0);
+    assert(H5Fclose(fid) >= 0);
 
     /* Release memory */
     HDfree(objname);
@@ -6494,7 +6494,7 @@ gent_bigdims(void)
 
     /* create a file */
     fid = H5Fcreate(FILE56, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* create dataset */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@@ -6552,7 +6552,7 @@ gent_bigdims(void)
     did = H5I_INVALID_HID;
 
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     return;
 
@@ -6592,12 +6592,12 @@ gent_hyperslab(void)
 
     /* create a file */
     fid = H5Fcreate(FILE57, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     write_dset(fid, 2, dims, "stripmine", H5T_NATIVE_DOUBLE, buf);
 
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     HDfree(buf);
 }
@@ -7858,17 +7858,17 @@ gent_charsets(void)
     sid    = H5Screate_simple(1, dim, NULL);
     fid    = H5Fcreate(FILE68, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Tset_cset(ascii_dtid, H5T_CSET_ASCII);
-    HDassert(status >= 0);
+    assert(status >= 0);
     H5Tinsert(charset_dtid, "ascii", HOFFSET(CharSetInfo, ascii_p_), ascii_dtid);
 
     status = H5Tset_cset(utf8_dtid, H5T_CSET_UTF8);
-    HDassert(status >= 0);
+    assert(status >= 0);
     H5Tinsert(charset_dtid, "utf8", HOFFSET(CharSetInfo, utf8_p_), utf8_dtid);
 
     did = H5Dcreate2(fid, "CharSets", charset_dtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     status = H5Dwrite(did, charset_dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, writeData);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     H5Tclose(charset_dtid);
     H5Tclose(ascii_dtid);
@@ -7926,7 +7926,7 @@ gent_compound_intsizes(void)
 
     /* Allocate buffer */
     Array1 = (Array1Struct *)HDmalloc(sizeof(Array1Struct) * F70_LENGTH);
-    HDassert(Array1);
+    assert(Array1);
 
     /* Initialize the data in the arrays/datastructure                */
     for (m = 0; m < F70_LENGTH; m++) {
@@ -8038,126 +8038,126 @@ gent_compound_intsizes(void)
 
     /* Create the array data type for the 8 bits signed int array             */
     array8_tid = H5Tarray_create2(H5T_NATIVE_SCHAR, F70_ARRAY_RANK, array_dim8);
-    HDassert(array8_tid >= 0);
+    assert(array8_tid >= 0);
 
     /* Create the array data type for the 16 bits signed int array             */
     array16_tid = H5Tarray_create2(H5T_NATIVE_SHORT, F70_ARRAY_RANK, array_dim16);
-    HDassert(array16_tid >= 0);
+    assert(array16_tid >= 0);
 
     /* Create the array data type for the 32 bits signed int array             */
     array32_tid = H5Tarray_create2(H5T_NATIVE_INT, F70_ARRAY_RANK, array_dim32);
-    HDassert(array32_tid >= 0);
+    assert(array32_tid >= 0);
 
     /* Create the array data type for the 64 bits signed int array             */
     array64_tid = H5Tarray_create2(H5T_NATIVE_LONG, F70_ARRAY_RANK, array_dim64);
-    HDassert(array64_tid >= 0);
+    assert(array64_tid >= 0);
 
     /* Create the array data type for the 8 bits signed int array             */
     arrayu8_tid = H5Tarray_create2(H5T_NATIVE_UCHAR, F70_ARRAY_RANK, array_dim8);
-    HDassert(arrayu8_tid >= 0);
+    assert(arrayu8_tid >= 0);
 
     /* Create the array data type for the 16 bits signed int array             */
     arrayu16_tid = H5Tarray_create2(H5T_NATIVE_USHORT, F70_ARRAY_RANK, array_dim16);
-    HDassert(arrayu16_tid >= 0);
+    assert(arrayu16_tid >= 0);
 
     /* Create the array data type for the 32 bits signed int array             */
     arrayu32_tid = H5Tarray_create2(H5T_NATIVE_UINT, F70_ARRAY_RANK, array_dim32);
-    HDassert(arrayu32_tid >= 0);
+    assert(arrayu32_tid >= 0);
 
     /* Create the array data type for the 64 bits signed int array             */
     arrayu64_tid = H5Tarray_create2(H5T_NATIVE_ULONG, F70_ARRAY_RANK, array_dim64);
-    HDassert(arrayu64_tid >= 0);
+    assert(arrayu64_tid >= 0);
 
     /* Create the array data type for the 32 bits double array             */
     arraydbl_tid = H5Tarray_create2(H5T_NATIVE_DOUBLE, F70_ARRAY_RANK, array_dim8);
-    HDassert(arraydbl_tid >= 0);
+    assert(arraydbl_tid >= 0);
 
     /* Create the dataspace                                           */
     space = H5Screate_simple(F70_RANK, dim, NULL);
-    HDassert(space >= 0);
+    assert(space >= 0);
 
     /* Create the file                                                */
     fid = H5Fcreate(FILE70, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* Create the memory data type                                    */
     Array1Structid = H5Tcreate(H5T_COMPOUND, sizeof(Array1Struct));
-    HDassert(Array1Structid >= 0);
+    assert(Array1Structid >= 0);
 
     /* Insert the arrays and variables into the structure             */
     status = H5Tinsert(Array1Structid, F70_DATASETU08, HOFFSET(Array1Struct, dsetu8), arrayu8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETU16, HOFFSET(Array1Struct, dsetu16), arrayu16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETU32, HOFFSET(Array1Struct, dsetu32), arrayu32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETU64, HOFFSET(Array1Struct, dsetu64), arrayu64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS08, HOFFSET(Array1Struct, dset8), array8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS16, HOFFSET(Array1Struct, dset16), array16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS32, HOFFSET(Array1Struct, dset32), array32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS64, HOFFSET(Array1Struct, dset64), array64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DUMMYDBL, HOFFSET(Array1Struct, dsetdbl), arraydbl_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the dataset                                             */
     dataset = H5Dcreate2(fid, F70_DATASETNAME, Array1Structid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write data to the dataset                                      */
     status = H5Dwrite(dataset, Array1Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Array1);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Release resources                                              */
     status = H5Tclose(Array1Structid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arraydbl_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Sclose(space);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Dclose(dataset);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Fclose(fid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     HDfree(Array1);
 }
@@ -8328,79 +8328,79 @@ gent_compound_attr_intsizes(void)
 
     /* Create the array data type for the 8 bits signed int array             */
     array8_tid = H5Tarray_create2(H5T_NATIVE_SCHAR, F70_ARRAY_RANK, array_dim8);
-    HDassert(array8_tid >= 0);
+    assert(array8_tid >= 0);
 
     /* Create the array data type for the 16 bits signed int array             */
     array16_tid = H5Tarray_create2(H5T_NATIVE_SHORT, F70_ARRAY_RANK, array_dim16);
-    HDassert(array16_tid >= 0);
+    assert(array16_tid >= 0);
 
     /* Create the array data type for the 32 bits signed int array             */
     array32_tid = H5Tarray_create2(H5T_NATIVE_INT, F70_ARRAY_RANK, array_dim32);
-    HDassert(array32_tid >= 0);
+    assert(array32_tid >= 0);
 
     /* Create the array data type for the 64 bits signed int array             */
     array64_tid = H5Tarray_create2(H5T_NATIVE_LONG, F70_ARRAY_RANK, array_dim64);
-    HDassert(array64_tid >= 0);
+    assert(array64_tid >= 0);
 
     /* Create the array data type for the 8 bits signed int array             */
     arrayu8_tid = H5Tarray_create2(H5T_NATIVE_UCHAR, F70_ARRAY_RANK, array_dim8);
-    HDassert(arrayu8_tid >= 0);
+    assert(arrayu8_tid >= 0);
 
     /* Create the array data type for the 16 bits signed int array             */
     arrayu16_tid = H5Tarray_create2(H5T_NATIVE_USHORT, F70_ARRAY_RANK, array_dim16);
-    HDassert(arrayu16_tid >= 0);
+    assert(arrayu16_tid >= 0);
 
     /* Create the array data type for the 32 bits signed int array             */
     arrayu32_tid = H5Tarray_create2(H5T_NATIVE_UINT, F70_ARRAY_RANK, array_dim32);
-    HDassert(arrayu32_tid >= 0);
+    assert(arrayu32_tid >= 0);
 
     /* Create the array data type for the 64 bits signed int array             */
     arrayu64_tid = H5Tarray_create2(H5T_NATIVE_ULONG, F70_ARRAY_RANK, array_dim64);
-    HDassert(arrayu64_tid >= 0);
+    assert(arrayu64_tid >= 0);
 
     /* Create the array data type for the 32 bits double array             */
     arraydbl_tid = H5Tarray_create2(H5T_NATIVE_DOUBLE, F70_ARRAY_RANK, array_dim8);
-    HDassert(arraydbl_tid >= 0);
+    assert(arraydbl_tid >= 0);
 
     /* Create the dataspace                                           */
     space = H5Screate_simple(F70_RANK, dim, NULL);
-    HDassert(space >= 0);
+    assert(space >= 0);
 
     /* Create the file                                                */
     fid = H5Fcreate(FILE71, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* Create the memory data type                                    */
     Array1Structid = H5Tcreate(H5T_COMPOUND, sizeof(Array1Struct));
-    HDassert(Array1Structid >= 0);
+    assert(Array1Structid >= 0);
 
     /* Insert the arrays and variables into the structure             */
     status = H5Tinsert(Array1Structid, F70_DATASETU08, HOFFSET(Array1Struct, dsetu8), arrayu8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETU16, HOFFSET(Array1Struct, dsetu16), arrayu16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETU32, HOFFSET(Array1Struct, dsetu32), arrayu32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETU64, HOFFSET(Array1Struct, dsetu64), arrayu64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS08, HOFFSET(Array1Struct, dset8), array8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS16, HOFFSET(Array1Struct, dset16), array16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS32, HOFFSET(Array1Struct, dset32), array32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DATASETS64, HOFFSET(Array1Struct, dset64), array64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Array1Structid, F70_DUMMYDBL, HOFFSET(Array1Struct, dsetdbl), arraydbl_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     root = H5Gopen2(fid, "/", H5P_DEFAULT);
 
@@ -8409,47 +8409,47 @@ gent_compound_attr_intsizes(void)
 
     /* Write data to the attribute                                      */
     status = H5Awrite(attr, Array1Structid, Array1);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arraydbl_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Release resources                                              */
     status = H5Tclose(Array1Structid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Sclose(space);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Aclose(attr);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Fclose(fid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     HDfree(Array1);
 }
@@ -9230,7 +9230,7 @@ gent_compound_int_array(void)
 
     /* Allocate buffer */
     Cmpd1 = (Cmpd1Struct *)HDmalloc(sizeof(Cmpd1Struct) * F76_LENGTH);
-    HDassert(Cmpd1);
+    assert(Cmpd1);
 
     /* Initialize the data in the arrays/datastructure                */
     for (m = 0; m < F76_LENGTH; m++) {
@@ -9316,126 +9316,126 @@ gent_compound_int_array(void)
 
     /* Create the array data type for the 8 bits signed int array             */
     array8_tid = H5Tarray_create2(H5T_NATIVE_SCHAR, F76_ARRAY_RANK, array_dim8);
-    HDassert(array8_tid >= 0);
+    assert(array8_tid >= 0);
 
     /* Create the array data type for the 16 bits signed int array             */
     array16_tid = H5Tarray_create2(H5T_NATIVE_SHORT, F76_ARRAY_RANK, array_dim16);
-    HDassert(array16_tid >= 0);
+    assert(array16_tid >= 0);
 
     /* Create the array data type for the 32 bits signed int array             */
     array32_tid = H5Tarray_create2(H5T_NATIVE_INT, F76_ARRAY_RANK, array_dim32);
-    HDassert(array32_tid >= 0);
+    assert(array32_tid >= 0);
 
     /* Create the array data type for the 64 bits signed int array             */
     array64_tid = H5Tarray_create2(H5T_NATIVE_LONG, F76_ARRAY_RANK, array_dim64);
-    HDassert(array64_tid >= 0);
+    assert(array64_tid >= 0);
 
     /* Create the array data type for the 8 bits signed int array             */
     arrayu8_tid = H5Tarray_create2(H5T_NATIVE_UCHAR, F76_ARRAY_RANK, array_dim8);
-    HDassert(arrayu8_tid >= 0);
+    assert(arrayu8_tid >= 0);
 
     /* Create the array data type for the 16 bits signed int array             */
     arrayu16_tid = H5Tarray_create2(H5T_NATIVE_USHORT, F76_ARRAY_RANK, array_dim16);
-    HDassert(arrayu16_tid >= 0);
+    assert(arrayu16_tid >= 0);
 
     /* Create the array data type for the 32 bits signed int array             */
     arrayu32_tid = H5Tarray_create2(H5T_NATIVE_UINT, F76_ARRAY_RANK, array_dim32);
-    HDassert(arrayu32_tid >= 0);
+    assert(arrayu32_tid >= 0);
 
     /* Create the array data type for the 64 bits signed int array             */
     arrayu64_tid = H5Tarray_create2(H5T_NATIVE_ULONG, F76_ARRAY_RANK, array_dim64);
-    HDassert(arrayu64_tid >= 0);
+    assert(arrayu64_tid >= 0);
 
     /* Create the array data type for the 32 bits double array             */
     arraydbl_tid = H5Tarray_create2(H5T_NATIVE_DOUBLE, F76_ARRAY_RANK, array_dim8);
-    HDassert(arraydbl_tid >= 0);
+    assert(arraydbl_tid >= 0);
 
     /* Create the dataspace                                           */
     space = H5Screate_simple(F76_RANK, dim, NULL);
-    HDassert(space >= 0);
+    assert(space >= 0);
 
     /* Create the file                                                */
     fid = H5Fcreate(FILE76, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* Create the memory data type                                    */
     Cmpd1Structid = H5Tcreate(H5T_COMPOUND, sizeof(Cmpd1Struct));
-    HDassert(Cmpd1Structid >= 0);
+    assert(Cmpd1Structid >= 0);
 
     /* Insert the arrays and variables into the structure             */
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU08, HOFFSET(Cmpd1Struct, dsetu8), arrayu8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU16, HOFFSET(Cmpd1Struct, dsetu16), arrayu16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU32, HOFFSET(Cmpd1Struct, dsetu32), arrayu32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU64, HOFFSET(Cmpd1Struct, dsetu64), arrayu64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS08, HOFFSET(Cmpd1Struct, dset8), array8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS16, HOFFSET(Cmpd1Struct, dset16), array16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS32, HOFFSET(Cmpd1Struct, dset32), array32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS64, HOFFSET(Cmpd1Struct, dset64), array64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DUMMYDBL, HOFFSET(Cmpd1Struct, dsetdbl), arraydbl_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the dataset                                             */
     dataset = H5Dcreate2(fid, F76_DATASETNAME, Cmpd1Structid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write data to the dataset                                      */
     status = H5Dwrite(dataset, Cmpd1Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Cmpd1);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Release resources                                              */
     status = H5Tclose(Cmpd1Structid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arrayu64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array8_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array16_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array32_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(array64_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tclose(arraydbl_tid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Sclose(space);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Dclose(dataset);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Fclose(fid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     HDfree(Cmpd1);
 }
@@ -9488,9 +9488,9 @@ gent_compound_ints(void)
 
     /* Allocate buffers */
     Cmpd1 = (Cmpd1Struct *)HDmalloc(sizeof(Cmpd1Struct) * F77_LENGTH);
-    HDassert(Cmpd1);
+    assert(Cmpd1);
     Cmpd2 = (Cmpd2Struct *)HDmalloc(sizeof(Cmpd2Struct) * F77_LENGTH);
-    HDassert(Cmpd2);
+    assert(Cmpd2);
 
     /* Initialize the data in the arrays/datastructure                */
     for (m = 0; m < F77_LENGTH; m++) {
@@ -9558,116 +9558,116 @@ gent_compound_ints(void)
 
     /* Create the dataspace                                           */
     space = H5Screate_simple(F76_RANK, dim, NULL);
-    HDassert(space >= 0);
+    assert(space >= 0);
 
     /* Create the file                                                */
     fid = H5Fcreate(FILE77, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* Create the memory data type                                    */
     Cmpd1Structid = H5Tcreate(H5T_COMPOUND, sizeof(Cmpd1Struct));
-    HDassert(Cmpd1Structid >= 0);
+    assert(Cmpd1Structid >= 0);
 
     /* Insert the arrays and variables into the structure             */
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU08, HOFFSET(Cmpd1Struct, dsetu8), H5T_NATIVE_UCHAR);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU16, HOFFSET(Cmpd1Struct, dsetu16), H5T_NATIVE_USHORT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU32, HOFFSET(Cmpd1Struct, dsetu32), H5T_NATIVE_UINT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETU64, HOFFSET(Cmpd1Struct, dsetu64), H5T_NATIVE_ULONG);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS08, HOFFSET(Cmpd1Struct, dset8), H5T_NATIVE_SCHAR);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS16, HOFFSET(Cmpd1Struct, dset16), H5T_NATIVE_SHORT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS32, HOFFSET(Cmpd1Struct, dset32), H5T_NATIVE_INT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DATASETS64, HOFFSET(Cmpd1Struct, dset64), H5T_NATIVE_LONG);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd1Structid, F76_DUMMYDBL, HOFFSET(Cmpd1Struct, dsetdbl), H5T_NATIVE_DOUBLE);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the dataset                                             */
     dataset = H5Dcreate2(fid, F77_DATASETNAME1, Cmpd1Structid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write data to the dataset                                      */
     status = H5Dwrite(dataset, Cmpd1Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Cmpd1);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Release resources                                              */
     status = H5Tclose(Cmpd1Structid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Sclose(space);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Dclose(dataset);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the dataspace                                           */
     space = H5Screate_simple(F76_RANK, dim, NULL);
-    HDassert(space >= 0);
+    assert(space >= 0);
 
     /* Create the memory data type                                    */
     Cmpd2Structid = H5Tcreate(H5T_COMPOUND, sizeof(Cmpd2Struct));
-    HDassert(Cmpd2Structid >= 0);
+    assert(Cmpd2Structid >= 0);
 
     /* Insert the arrays and variables into the structure             */
     status = H5Tinsert(Cmpd2Structid, F76_DATASETU64, HOFFSET(Cmpd2Struct, dsetu64), H5T_NATIVE_ULONG);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETU32, HOFFSET(Cmpd2Struct, dsetu32), H5T_NATIVE_UINT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETU16, HOFFSET(Cmpd2Struct, dsetu16), H5T_NATIVE_USHORT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETU08, HOFFSET(Cmpd2Struct, dsetu8), H5T_NATIVE_UCHAR);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETS64, HOFFSET(Cmpd2Struct, dset64), H5T_NATIVE_LONG);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETS32, HOFFSET(Cmpd2Struct, dset32), H5T_NATIVE_INT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETS16, HOFFSET(Cmpd2Struct, dset16), H5T_NATIVE_SHORT);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DATASETS08, HOFFSET(Cmpd2Struct, dset8), H5T_NATIVE_SCHAR);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Tinsert(Cmpd2Structid, F76_DUMMYDBL, HOFFSET(Cmpd2Struct, dsetdbl), H5T_NATIVE_DOUBLE);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Create the dataset                                             */
     dataset = H5Dcreate2(fid, F77_DATASETNAME2, Cmpd2Structid, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write data to the dataset                                      */
     status = H5Dwrite(dataset, Cmpd2Structid, H5S_ALL, H5S_ALL, H5P_DEFAULT, Cmpd2);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     /* Release resources                                              */
     status = H5Tclose(Cmpd2Structid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Sclose(space);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Dclose(dataset);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     status = H5Fclose(fid);
-    HDassert(status >= 0);
+    assert(status >= 0);
 
     HDfree(Cmpd1);
     HDfree(Cmpd2);
@@ -10755,7 +10755,7 @@ gent_compound_complex2(void)
 
     /* Allocate buffer */
     buf = (compound *)HDmalloc(sizeof(compound) * F82_DIM32);
-    HDassert(buf);
+    assert(buf);
 
     file = H5Fcreate(FILE82, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -11124,54 +11124,54 @@ gent_udfilter(void)
 
     /* create a file */
     fid = H5Fcreate(FILE84, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    HDassert(fid >= 0);
+    assert(fid >= 0);
 
     /* create a space */
     sid = H5Screate_simple(SPACE2_RANK, dims1, NULL);
 
     dcpl = H5Pcreate(H5P_DATASET_CREATE);
-    HDassert(dcpl >= 0);
+    assert(dcpl >= 0);
 
     ret = H5Pset_layout(dcpl, H5D_CHUNKED);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_chunk(dcpl, SPACE2_RANK, chunk_dims);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Zregister(H5Z_DYNLIBUD);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pset_filter(dcpl, H5Z_FILTER_DYNLIBUD, H5Z_FLAG_MANDATORY, 0, NULL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* create the dataset */
     dsid = H5Dcreate2(fid, "dynlibud", H5T_STD_I32LE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    HDassert(dsid >= 0);
+    assert(dsid >= 0);
 
     /* write */
     ret = H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* close */
     ret = H5Dclose(dsid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /* remove the filters from the dcpl */
     ret = H5Premove_filter(dcpl, H5Z_FILTER_ALL);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     /*-------------------------------------------------------------------------
      * close
      *-------------------------------------------------------------------------
      */
     ret = H5Sclose(sid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Pclose(dcpl);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 
     ret = H5Fclose(fid);
-    HDassert(ret >= 0);
+    assert(ret >= 0);
 }
 
 /*-------------------------------------------------------------------------