Brings over most of the HD prefix removal (#3293)

1 files changed, 195 insertions, 196 deletions

diff --git a/test/vds.c b/test/vds.c
index 987771a..6776976 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -55,7 +55,7 @@ const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0",  "vds_src_1",
 /* Print config directly to output */
 #define PRINT_CONFIG(...)                                                                                    \
     do {                                                                                                     \
-        HDprintf("Config: " __VA_ARGS__);                                                                    \
+        printf("Config: " __VA_ARGS__);                                                                      \
         HDputs("");                                                                                          \
     } while (0)
 
@@ -80,11 +80,11 @@ char vds_test_str_g[128]   = "";
 /* Replacement for TEST_ERROR for non-verbose output */
 #define TEST_ERROR_SUPPRESSED                                                                                \
     do {                                                                                                     \
-        HDprintf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g);                  \
+        printf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g);                    \
         TEST_ERROR;                                                                                          \
     } while (0)
 
-/* Replacement for HDprintf for printing configuration for non-verbose output */
+/* Replacement for printf for printing configuration for non-verbose output */
 #define PRINT_CONFIG(...)                                                                                    \
     do {                                                                                                     \
         HDsnprintf(vds_config_str_g, sizeof(vds_config_str_g), __VA_ARGS__);                                 \
@@ -164,9 +164,9 @@ vds_select_equal(hid_t space1, hid_t space2)
 
             /* Allocate point lists.  Do not return directly after
              * allocating, to make sure buffers are freed. */
-            if (NULL == (buf1 = (hsize_t *)HDmalloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t))))
+            if (NULL == (buf1 = (hsize_t *)malloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t))))
                 TEST_ERROR;
-            if (NULL == (buf2 = (hsize_t *)HDmalloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t))))
+            if (NULL == (buf2 = (hsize_t *)malloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t))))
                 TEST_ERROR;
 
             /* Get and compare point lists */
@@ -181,9 +181,9 @@ vds_select_equal(hid_t space1, hid_t space2)
                 }
 
             /* Free buffers */
-            HDfree(buf1);
+            free(buf1);
             buf1 = NULL;
-            HDfree(buf2);
+            free(buf2);
             buf2 = NULL;
         } /* end block */
 
@@ -214,10 +214,10 @@ vds_select_equal(hid_t space1, hid_t space2)
             /* Allocate block lists.  Do not return directly after
              * allocating, to make sure buffers are freed. */
             if (NULL ==
-                (buf1 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf1))))
+                (buf1 = (hsize_t *)malloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf1))))
                 TEST_ERROR;
             if (NULL ==
-                (buf2 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf2))))
+                (buf2 = (hsize_t *)malloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf2))))
                 TEST_ERROR;
 
             /* Get and compare block lists */
@@ -232,9 +232,9 @@ vds_select_equal(hid_t space1, hid_t space2)
                 }
 
             /* Free buffers */
-            HDfree(buf1);
+            free(buf1);
             buf1 = NULL;
-            HDfree(buf2);
+            free(buf2);
             buf2 = NULL;
         } /* end block */
 
@@ -250,9 +250,9 @@ vds_select_equal(hid_t space1, hid_t space2)
 
 error:
     if (buf1)
-        HDfree(buf1);
+        free(buf1);
     if (buf2)
-        HDfree(buf2);
+        free(buf2);
 
     return -1;
 } /* end vds_select_equal() */
@@ -277,11 +277,11 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char
     htri_t  tri_ret;
     ssize_t str_len;
 
-    HDassert(dcpl >= 0);
-    HDassert(vspace >= 0);
-    HDassert(srcspace >= 0);
-    HDassert(filename);
-    HDassert(dsetname);
+    assert(dcpl >= 0);
+    assert(vspace >= 0);
+    assert(srcspace >= 0);
+    assert(filename);
+    assert(dsetname);
 
     /* Check vspace */
     if ((space_out = H5Pget_virtual_vspace(dcpl, i)) < 0)
@@ -314,7 +314,7 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char
         TEST_ERROR;
     if ((size_t)str_len != HDstrlen(filename))
         TEST_ERROR;
-    HDassert((size_t)str_len < sizeof(name_out));
+    assert((size_t)str_len < sizeof(name_out));
     if ((str_len = H5Pget_virtual_filename(dcpl, i, name_out, sizeof(name_out))) < 0)
         TEST_ERROR;
     if ((size_t)str_len != HDstrlen(filename))
@@ -327,7 +327,7 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char
         TEST_ERROR;
     if ((size_t)str_len != HDstrlen(dsetname))
         TEST_ERROR;
-    HDassert((size_t)str_len < sizeof(name_out));
+    assert((size_t)str_len < sizeof(name_out));
     if ((str_len = H5Pget_virtual_dsetname(dcpl, i, name_out, sizeof(name_out))) < 0)
         TEST_ERROR;
     if ((size_t)str_len != HDstrlen(dsetname))
@@ -368,13 +368,13 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
     H5O_native_info_t  ninfo;            /* Object info struct */
     htri_t             tri_ret;
 
-    HDassert((config >= TEST_API_BASIC) && (config < TEST_API_NTESTS));
-    HDassert(fapl >= 0);
-    HDassert(dcpl >= 0);
-    HDassert(ex_dcpl);
-    HDassert(*ex_dcpl < 0);
-    HDassert(vspace >= 0);
-    HDassert(filename);
+    assert((config >= TEST_API_BASIC) && (config < TEST_API_NTESTS));
+    assert(fapl >= 0);
+    assert(dcpl >= 0);
+    assert(ex_dcpl);
+    assert(*ex_dcpl < 0);
+    assert(vspace >= 0);
+    assert(filename);
 
     /* Take different action depending on test configuration */
     if (config >= TEST_API_CREATE_DSET) {
@@ -426,9 +426,8 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
             TEST_ERROR;
         if (config == TEST_API_REOPEN_FILE) {
             if (ninfo.meta_size.obj.heap_size != exp_meta_size) {
-                HDprintf("VDS metadata size: %llu Expected: %llu\n",
-                         (long long unsigned)ninfo.meta_size.obj.heap_size,
-                         (long long unsigned)exp_meta_size);
+                printf("VDS metadata size: %llu Expected: %llu\n",
+                       (long long unsigned)ninfo.meta_size.obj.heap_size, (long long unsigned)exp_meta_size);
                 TEST_ERROR;
             }
         }
@@ -471,7 +470,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
         /* Encode property list to plist_buf */
         if (H5Pencode2(dcpl, NULL, &plist_buf_size, fapl) < 0)
             TEST_ERROR;
-        if (NULL == (plist_buf = HDmalloc(plist_buf_size)))
+        if (NULL == (plist_buf = malloc(plist_buf_size)))
             TEST_ERROR;
         if (H5Pencode2(dcpl, plist_buf, &plist_buf_size, fapl) < 0)
             TEST_ERROR;
@@ -481,7 +480,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
             TEST_ERROR;
 
         /* Free plist_buf */
-        HDfree(plist_buf);
+        free(plist_buf);
         plist_buf = NULL;
     }
     else {
@@ -513,7 +512,7 @@ error:
     }
     H5E_END_TRY;
     if (plist_buf)
-        HDfree(plist_buf);
+        free(plist_buf);
 
     return -1;
 } /* end test_api_get_ex_dcpl() */
@@ -1208,15 +1207,15 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     TESTING_2_SUPPRESSED("basic virtual dataset I/O via H5Pset_vds_prefix(): all selection");
 
-    if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((vfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((vfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilenamepct = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilenamepct = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilenamepct_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilenamepct_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
 
     h5_fixname(FILENAME[0], vds_fapl, vfilename, FILENAME_BUF_SIZE);
@@ -1335,7 +1334,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -1373,7 +1372,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data directly from source dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -1409,11 +1408,11 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
     dcpl = -1;
 
-    HDfree(srcfilename);
-    HDfree(srcfilename_map);
-    HDfree(vfilename);
-    HDfree(srcfilenamepct);
-    HDfree(srcfilenamepct_map);
+    free(srcfilename);
+    free(srcfilename_map);
+    free(vfilename);
+    free(srcfilenamepct);
+    free(srcfilenamepct_map);
 
     PASSED_SUPPRESSED();
     return 0;
@@ -1440,11 +1439,11 @@ error:
     if (HDsetenv("HDF5_VDS_PREFIX", "", 1) < 0)
         TEST_ERROR_SUPPRESSED;
 
-    HDfree(srcfilename);
-    HDfree(srcfilename_map);
-    HDfree(vfilename);
-    HDfree(srcfilenamepct);
-    HDfree(srcfilenamepct_map);
+    free(srcfilename);
+    free(srcfilename_map);
+    free(vfilename);
+    free(srcfilenamepct);
+    free(srcfilenamepct_map);
 
     return 1;
 } /* end test_vds_prefix */
@@ -1495,17 +1494,17 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     TESTING_2_SUPPRESSED("basic virtual dataset I/O");
 
-    if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((vfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((vfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((vfilename2 = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((vfilename2 = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilenamepct = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilenamepct = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilenamepct_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilenamepct_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
 
     h5_fixname(FILENAME[0], vds_fapl, vfilename, FILENAME_BUF_SIZE);
@@ -1606,7 +1605,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -1635,7 +1634,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data directly from source dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -1778,7 +1777,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -1809,7 +1808,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data directly from source datasets */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
     if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -1872,7 +1871,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Read data through copied virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -1950,7 +1949,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
             TEST_ERROR_SUPPRESSED;
 
         /* Read data through copied virtual dataset */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
         if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
             TEST_ERROR_SUPPRESSED;
 
@@ -2120,7 +2119,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -2151,7 +2150,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data directly from source datasets */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     offset[1] = -3;
     if (H5Soffset_simple(vspace[0], offset) < 0)
         TEST_ERROR_SUPPRESSED;
@@ -2305,7 +2304,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read first source dataset through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -2316,7 +2315,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
                 TEST_ERROR_SUPPRESSED;
 
     /* Read second source dataset through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, vspace[1], vspace[1], H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -2356,7 +2355,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     }
 
     /* Read data directly from source datasets */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
     if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -2539,7 +2538,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset by hyperslab */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read first slice */
     if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
@@ -2619,7 +2618,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data directly from source datasets */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read first dataset */
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, srcspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
@@ -2844,7 +2843,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset by hyperslab */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read first stripe pattern */
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
@@ -2915,7 +2914,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data directly from source datasets */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read first dataset */
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
@@ -3170,7 +3169,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -3182,7 +3181,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset by hyperslab */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select stripe */
     start[0] = 0;
@@ -3201,7 +3200,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Update erbuf */
-    HDmemset(erbuf, 0, sizeof(erbuf));
+    memset(erbuf, 0, sizeof(erbuf));
     for (i = 0; i < 9; i++)
         for (j = 0; j < 3; j++)
             erbuf[i][j] = fill;
@@ -3223,7 +3222,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
                 TEST_ERROR_SUPPRESSED;
 
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select stripe */
     start[0] = 0;
@@ -3277,7 +3276,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
                 TEST_ERROR_SUPPRESSED;
 
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select stripe */
     start[0] = 0;
@@ -3402,7 +3401,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Update erbuf */
-    HDmemset(erbuf, 0, sizeof(erbuf));
+    memset(erbuf, 0, sizeof(erbuf));
     erbuf[0][0]  = buf[0][0];
     erbuf[0][1]  = buf[0][1];
     erbuf[0][8]  = buf[0][2];
@@ -3553,7 +3552,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read dataset */
     if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -3686,7 +3685,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Reset erbuf */
-    HDmemset(erbuf[0], 0, sizeof(rbuf));
+    memset(erbuf[0], 0, sizeof(rbuf));
 
     /* Populate write buffer */
     for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -3786,7 +3785,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -3919,7 +3918,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Reset erbuf */
-    HDmemset(erbuf[0], 0, sizeof(rbuf));
+    memset(erbuf[0], 0, sizeof(rbuf));
 
     /* Populate write buffer */
     for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -4043,7 +4042,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -4180,7 +4179,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Initialize erbuf */
-    HDmemset(erbuf[0], 0, sizeof(rbuf));
+    memset(erbuf[0], 0, sizeof(rbuf));
     for (i = 0; i < 10; i++)
         for (j = 0; j < 24; j += 6) {
             erbuf[i][j]     = -1;
@@ -4295,7 +4294,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
 
     /* Read data through virtual dataset */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0)
         TEST_ERROR_SUPPRESSED;
 
@@ -4341,12 +4340,12 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
     dcpl = -1;
 
-    HDfree(srcfilename);
-    HDfree(srcfilename_map);
-    HDfree(vfilename);
-    HDfree(vfilename2);
-    HDfree(srcfilenamepct);
-    HDfree(srcfilenamepct_map);
+    free(srcfilename);
+    free(srcfilename_map);
+    free(vfilename);
+    free(vfilename2);
+    free(srcfilenamepct);
+    free(srcfilenamepct_map);
 
     PASSED_SUPPRESSED();
     return 0;
@@ -4370,12 +4369,12 @@ error:
     }
     H5E_END_TRY;
 
-    HDfree(srcfilename);
-    HDfree(srcfilename_map);
-    HDfree(vfilename);
-    HDfree(vfilename2);
-    HDfree(srcfilenamepct);
-    HDfree(srcfilenamepct_map);
+    free(srcfilename);
+    free(srcfilename_map);
+    free(vfilename);
+    free(vfilename2);
+    free(srcfilenamepct);
+    free(srcfilenamepct_map);
 
     return 1;
 } /* end test_basic_io() */
@@ -4615,7 +4614,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -4691,7 +4690,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read data */
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -4797,7 +4796,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[1] = 0;
@@ -4867,7 +4866,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[1] = 0;
@@ -4981,7 +4980,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[1] = 0;
@@ -4999,7 +4998,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
                 TEST_ERROR_SUPPRESSED;
 
     /* Now just read middle 2 rows */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     start[0] = 4;
     count[0] = 2;
     count[1] = 20;
@@ -5035,7 +5034,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         start[0] = 0;
@@ -5061,7 +5060,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         start[0] = 0;
@@ -5091,7 +5090,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         start[0] = 0;
@@ -5157,7 +5156,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -5196,7 +5195,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         start[1] = 0;
@@ -5226,7 +5225,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         start[0] = 0;
@@ -5256,7 +5255,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         start[0] = 0;
@@ -5483,7 +5482,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -5546,7 +5545,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read data */
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -5657,7 +5656,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -5725,7 +5724,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -5838,7 +5837,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -5855,7 +5854,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
                 TEST_ERROR_SUPPRESSED;
 
     /* Now just read middle 2 rows */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     start[0] = 4;
     count[0] = 2;
     count[1] = 20;
@@ -5924,7 +5923,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6204,7 +6203,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6267,7 +6266,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read data */
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -6372,7 +6371,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6443,7 +6442,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6559,7 +6558,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6622,7 +6621,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6736,7 +6735,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6795,7 +6794,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -6817,7 +6816,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         }
 
     /* Now just read middle 2 rows */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
     start[0] = 4;
     count[0] = 2;
     count[1] = 19;
@@ -7052,7 +7051,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -7117,7 +7116,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Read data */
     if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0)
@@ -7222,7 +7221,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -7287,7 +7286,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -7436,21 +7435,21 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     TESTING_2_SUPPRESSED("virtual dataset I/O with printf source");
 
-    if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilename2 = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename2 = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilename2_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilename2_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((vfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((vfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((printf_srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((printf_srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilenamepct = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilenamepct = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
-    if ((srcfilenamepct_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
+    if ((srcfilenamepct_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL)
         TEST_ERROR_SUPPRESSED;
 
     h5_fixname(FILENAME[0], vds_fapl, vfilename, FILENAME_BUF_SIZE);
@@ -7679,7 +7678,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -7775,7 +7774,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -7801,7 +7800,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
     for (start[1] = (hsize_t)0; start[1] < (hsize_t)5; start[1]++)
         for (count[1] = (hsize_t)1; count[1] < (hsize_t)11; count[1]++) {
             /* Reset rbuf */
-            HDmemset(rbuf[0], 0, sizeof(rbuf));
+            memset(rbuf[0], 0, sizeof(rbuf));
 
             /* Select hyperslab in memory space */
             if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0)
@@ -8187,7 +8186,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8262,7 +8261,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8331,7 +8330,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8400,7 +8399,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8469,7 +8468,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8532,7 +8531,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8755,7 +8754,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -8852,7 +8851,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9065,7 +9064,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9162,7 +9161,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9431,7 +9430,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9530,7 +9529,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9594,7 +9593,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9693,7 +9692,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9757,7 +9756,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -9821,7 +9820,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10112,7 +10111,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10176,7 +10175,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10279,7 +10278,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10342,7 +10341,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10442,7 +10441,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10479,7 +10478,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10508,7 +10507,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10536,7 +10535,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10600,7 +10599,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10637,7 +10636,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10666,7 +10665,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10694,7 +10693,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
         /* Read data through virtual dataset */
         /* Reset rbuf */
-        HDmemset(rbuf[0], 0, sizeof(rbuf));
+        memset(rbuf[0], 0, sizeof(rbuf));
 
         /* Select hyperslab in memory space */
         if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10933,7 +10932,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -10996,7 +10995,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0)
@@ -11059,14 +11058,14 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl)
         TEST_ERROR_SUPPRESSED;
     memspace = -1;
 
-    HDfree(srcfilename);
-    HDfree(srcfilename_map);
-    HDfree(srcfilename2);
-    HDfree(srcfilename2_map);
-    HDfree(vfilename);
-    HDfree(printf_srcfilename_map);
-    HDfree(srcfilenamepct);
-    HDfree(srcfilenamepct_map);
+    free(srcfilename);
+    free(srcfilename_map);
+    free(srcfilename2);
+    free(srcfilename2_map);
+    free(vfilename);
+    free(printf_srcfilename_map);
+    free(srcfilenamepct);
+    free(srcfilenamepct_map);
 
     PASSED_SUPPRESSED();
     return 0;
@@ -11090,14 +11089,14 @@ error:
     }
     H5E_END_TRY;
 
-    HDfree(srcfilename);
-    HDfree(srcfilename_map);
-    HDfree(srcfilename2);
-    HDfree(srcfilename2_map);
-    HDfree(vfilename);
-    HDfree(printf_srcfilename_map);
-    HDfree(srcfilenamepct);
-    HDfree(srcfilenamepct_map);
+    free(srcfilename);
+    free(srcfilename_map);
+    free(srcfilename2);
+    free(srcfilename2_map);
+    free(vfilename);
+    free(printf_srcfilename_map);
+    free(srcfilenamepct);
+    free(srcfilenamepct_map);
 
     return 1;
 } /* end test_printf() */
@@ -11387,7 +11386,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -11495,7 +11494,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -11600,7 +11599,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -11717,7 +11716,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -11822,7 +11821,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -11940,7 +11939,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -12045,7 +12044,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl)
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
-    HDmemset(rbuf[0], 0, sizeof(rbuf));
+    memset(rbuf[0], 0, sizeof(rbuf));
 
     /* Select hyperslab in memory space */
     start[0] = 0;
@@ -12326,7 +12325,7 @@ main(void)
      */
     if (driver_is_parallel || !HDstrcmp(env_h5_drvr, "splitter")) {
         HDputs(" -- SKIPPED for incompatible VFD --");
-        HDexit(EXIT_SUCCESS);
+        exit(EXIT_SUCCESS);
     }
 
     h5_fixname(FILENAME[0], fapl, filename, sizeof(filename));
@@ -12437,13 +12436,13 @@ main(void)
 
     if (nerrors)
         goto error;
-    HDprintf("All virtual dataset tests passed.\n");
+    printf("All virtual dataset tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return EXIT_SUCCESS;
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return EXIT_FAILURE;
 } /* end main() */