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

1 files changed, 179 insertions, 179 deletions

diff --git a/testpar/API/H5_api_async_test_parallel.c b/testpar/API/H5_api_async_test_parallel.c
index 663e690..d6f55b1 100644
--- a/testpar/API/H5_api_async_test_parallel.c
+++ b/testpar/API/H5_api_async_test_parallel.c
@@ -84,7 +84,7 @@ test_one_dataset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         }
 
@@ -125,15 +125,15 @@ test_one_dataset_io(void)
         data_size *= dims[i];
     data_size *= sizeof(int);
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -154,7 +154,7 @@ test_one_dataset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -164,7 +164,7 @@ test_one_dataset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -206,7 +206,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_eswait);
                 } /* end if */
 
@@ -247,7 +247,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_dclose);
                 } /* end if */
 
@@ -292,7 +292,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_dflush);
                 } /* end if */
 
@@ -345,7 +345,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_fclose);
                 } /* end if */
 
@@ -364,17 +364,17 @@ test_one_dataset_io(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -395,11 +395,11 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Sclose(mspace_id);
         H5Dclose(dset_id);
@@ -449,7 +449,7 @@ test_multi_dataset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         }
 
@@ -483,15 +483,15 @@ test_multi_dataset_io(void)
     data_size *= sizeof(int);
     data_size *= MULTI_DATASET_IO_TEST_NDSETS;
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -512,7 +512,7 @@ test_multi_dataset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -522,7 +522,7 @@ test_multi_dataset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -587,7 +587,7 @@ test_multi_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_dset_open);
                 } /* end if */
 
@@ -668,7 +668,7 @@ test_multi_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_dset_close);
                 } /* end if */
 
@@ -687,17 +687,17 @@ test_multi_dataset_io(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -718,11 +718,11 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Sclose(mspace_id);
         for (i = 0; i < MULTI_DATASET_IO_TEST_NDSETS; i++)
@@ -775,7 +775,7 @@ test_multi_file_dataset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         }
 
@@ -805,15 +805,15 @@ test_multi_file_dataset_io(void)
     data_size *= sizeof(int);
     data_size *= MULTI_FILE_DATASET_IO_TEST_NFILES;
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -834,7 +834,7 @@ test_multi_file_dataset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -844,7 +844,7 @@ test_multi_file_dataset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -919,7 +919,7 @@ test_multi_file_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_dset_open);
                 } /* end if */
 
@@ -994,7 +994,7 @@ test_multi_file_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_dset_dclose);
                 } /* end if */
 
@@ -1092,7 +1092,7 @@ test_multi_file_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_dset_fclose);
                 } /* end if */
 
@@ -1111,17 +1111,17 @@ test_multi_file_dataset_io(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -1142,11 +1142,11 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Sclose(mspace_id);
         for (i = 0; i < MULTI_FILE_DATASET_IO_TEST_NFILES; i++) {
@@ -1198,7 +1198,7 @@ test_multi_file_grp_dset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, group, or dataset aren't supported with this connector\n");
         }
 
@@ -1228,15 +1228,15 @@ test_multi_file_grp_dset_io(void)
     data_size *= sizeof(int);
     data_size *= MULTI_FILE_GRP_DSET_IO_TEST_NFILES;
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -1257,7 +1257,7 @@ test_multi_file_grp_dset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -1267,7 +1267,7 @@ test_multi_file_grp_dset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1382,7 +1382,7 @@ test_multi_file_grp_dset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_grp_dset_no_kick);
                 } /* end if */
 
@@ -1508,7 +1508,7 @@ test_multi_file_grp_dset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_grp_dset_kick);
                 } /* end if */
 
@@ -1527,17 +1527,17 @@ test_multi_file_grp_dset_io(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -1558,11 +1558,11 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Sclose(mspace_id);
         H5Dclose(dset_id);
@@ -1619,8 +1619,8 @@ test_set_extent(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, or flush aren't supported "
-                     "with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, or flush aren't supported "
+                   "with this connector\n");
         }
 
         return 0;
@@ -1633,15 +1633,15 @@ test_set_extent(void)
     if (generate_random_parallel_dimensions(SET_EXTENT_TEST_SPACE_RANK, &dims) < 0)
         TEST_ERROR;
 
-    if (NULL == (maxdims = HDmalloc(SET_EXTENT_TEST_SPACE_RANK * sizeof(hsize_t)))) {
+    if (NULL == (maxdims = malloc(SET_EXTENT_TEST_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate max dataspace dimension buffer\n");
+        printf("    couldn't allocate max dataspace dimension buffer\n");
         TEST_ERROR;
     }
 
-    if (NULL == (cdims = HDmalloc(SET_EXTENT_TEST_SPACE_RANK * sizeof(hsize_t)))) {
+    if (NULL == (cdims = malloc(SET_EXTENT_TEST_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate chunk dimension buffer\n");
+        printf("    couldn't allocate chunk dimension buffer\n");
         TEST_ERROR;
     }
 
@@ -1685,15 +1685,15 @@ test_set_extent(void)
     data_size *= sizeof(int);
     data_size *= SET_EXTENT_TEST_NUM_EXTENDS;
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -1714,7 +1714,7 @@ test_set_extent(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -1724,7 +1724,7 @@ test_set_extent(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1766,7 +1766,7 @@ test_set_extent(void)
 
             if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 goto error;
             }
 
@@ -1821,7 +1821,7 @@ test_set_extent(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed, expected %d but got %d\n", write_buf[i], read_buf[i]);
+            printf("    data verification failed, expected %d but got %d\n", write_buf[i], read_buf[i]);
             goto error;
         } /* end if */
 
@@ -1844,27 +1844,27 @@ test_set_extent(void)
         FAIL_PUTS_ERROR("    dataspaces are not equal\n");
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (cdims) {
-        HDfree(cdims);
+        free(cdims);
         cdims = NULL;
     }
 
     if (maxdims) {
-        HDfree(maxdims);
+        free(maxdims);
         maxdims = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -1897,15 +1897,15 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (cdims)
-            HDfree(cdims);
+            free(cdims);
         if (maxdims)
-            HDfree(maxdims);
+            free(maxdims);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Sclose(mspace_id);
         H5Sclose(space_id_out);
@@ -1952,8 +1952,8 @@ test_attribute_exists(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -2045,7 +2045,7 @@ test_attribute_exists(void)
         TEST_ERROR;
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -2060,7 +2060,7 @@ error:
     H5E_BEGIN_TRY
     {
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Aclose(attr_id);
         H5Dclose(dset_id);
@@ -2105,8 +2105,8 @@ test_attribute_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -2150,15 +2150,15 @@ test_attribute_io(void)
         data_size *= dims[i];
     data_size *= sizeof(int);
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute write\n");
+        printf("    couldn't allocate buffer for attribute write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read\n");
+        printf("    couldn't allocate buffer for attribute read\n");
         TEST_ERROR;
     }
 
@@ -2191,7 +2191,7 @@ test_attribute_io(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2217,7 +2217,7 @@ test_attribute_io(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2240,17 +2240,17 @@ test_attribute_io(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -2265,11 +2265,11 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Aclose(attr_id);
         H5Dclose(dset_id);
@@ -2312,8 +2312,8 @@ test_attribute_io_tconv(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, attribute, or flush aren't supported with this "
-                     "connector\n");
+            printf("    API functions for basic file, attribute, or flush aren't supported with this "
+                   "connector\n");
         }
 
         return 0;
@@ -2348,15 +2348,15 @@ test_attribute_io_tconv(void)
         data_size *= dims[i];
     data_size *= sizeof(int);
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute write\n");
+        printf("    couldn't allocate buffer for attribute write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read\n");
+        printf("    couldn't allocate buffer for attribute read\n");
         TEST_ERROR;
     }
 
@@ -2387,7 +2387,7 @@ test_attribute_io_tconv(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2414,7 +2414,7 @@ test_attribute_io_tconv(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2433,17 +2433,17 @@ test_attribute_io_tconv(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -2460,11 +2460,11 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Aclose(attr_id);
         H5Dclose(dset_id);
@@ -2516,8 +2516,8 @@ test_attribute_io_compound(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -2577,21 +2577,21 @@ test_attribute_io_compound(void)
         data_size *= dims[i];
     data_size *= sizeof(tattr_cmpd_t);
 
-    if (NULL == (write_buf = HDmalloc(data_size))) {
+    if (NULL == (write_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute write\n");
+        printf("    couldn't allocate buffer for attribute write\n");
         TEST_ERROR;
     }
 
-    if (NULL == (read_buf = HDmalloc(data_size))) {
+    if (NULL == (read_buf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read\n");
+        printf("    couldn't allocate buffer for attribute read\n");
         TEST_ERROR;
     }
 
-    if (NULL == (fbuf = HDmalloc(data_size))) {
+    if (NULL == (fbuf = malloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read verification\n");
+        printf("    couldn't allocate buffer for attribute read verification\n");
         TEST_ERROR;
     }
 
@@ -2630,12 +2630,12 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
@@ -2660,12 +2660,12 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != -2) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
@@ -2690,19 +2690,19 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != -2) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -2746,19 +2746,19 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -2802,12 +2802,12 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
@@ -2835,22 +2835,22 @@ test_attribute_io_compound(void)
         TEST_ERROR;
 
     if (read_buf) {
-        HDfree(read_buf);
+        free(read_buf);
         read_buf = NULL;
     }
 
     if (write_buf) {
-        HDfree(write_buf);
+        free(write_buf);
         write_buf = NULL;
     }
 
     if (fbuf) {
-        HDfree(fbuf);
+        free(fbuf);
         fbuf = NULL;
     }
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -2867,13 +2867,13 @@ error:
     H5E_BEGIN_TRY
     {
         if (read_buf)
-            HDfree(read_buf);
+            free(read_buf);
         if (write_buf)
-            HDfree(write_buf);
+            free(write_buf);
         if (fbuf)
-            HDfree(fbuf);
+            free(fbuf);
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Tclose(mtype_id);
         H5Tclose(ftype_id);
@@ -2916,8 +2916,8 @@ test_group(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, group, group more or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, group, group more or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -3098,8 +3098,8 @@ test_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, link, hard link, soft link, flush, or creation order "
-                     "aren't supported with this connector\n");
+            printf("    API functions for basic file, link, hard link, soft link, flush, or creation order "
+                   "aren't supported with this connector\n");
         }
 
         return 0;
@@ -3179,7 +3179,7 @@ test_link(void)
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -3218,7 +3218,7 @@ test_link(void)
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -3256,7 +3256,7 @@ test_link(void)
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -3353,8 +3353,8 @@ test_ocopy_orefresh(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, group, dataset, object more, flush, or refresh "
-                     "aren't supported with this connector\n");
+            printf("    API functions for basic file, group, dataset, object more, flush, or refresh "
+                   "aren't supported with this connector\n");
         }
 
         return 0;
@@ -3423,7 +3423,7 @@ test_ocopy_orefresh(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
     }
@@ -3457,7 +3457,7 @@ test_ocopy_orefresh(void)
         TEST_ERROR;
 
     if (dims) {
-        HDfree(dims);
+        free(dims);
         dims = NULL;
     }
 
@@ -3474,7 +3474,7 @@ error:
     H5E_BEGIN_TRY
     {
         if (dims)
-            HDfree(dims);
+            free(dims);
         H5Sclose(space_id);
         H5Dclose(dset_id);
         H5Gclose(parent_group_id);
@@ -3508,7 +3508,7 @@ test_file_reopen(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file or file more aren't supported with this connector\n");
+            printf("    API functions for basic file or file more aren't supported with this connector\n");
         }
 
         return 0;
@@ -3595,17 +3595,17 @@ H5_api_async_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*      API Parallel Async Tests              *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*      API Parallel Async Tests              *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ASYNC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    Async APIs aren't supported with this connector\n");
+            printf("    Async APIs aren't supported with this connector\n");
         }
 
         return 0;
@@ -3616,19 +3616,19 @@ H5_api_async_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS) {
-        HDprintf("\n");
-        HDprintf("Cleaning up testing files\n");
+        printf("\n");
+        printf("Cleaning up testing files\n");
     }
 
     cleanup_files();
 
     if (MAINPROCESS) {
-        HDprintf("\n * Re-testing with independent metadata reads *\n");
+        printf("\n * Re-testing with independent metadata reads *\n");
     }
 
     coll_metadata_read = FALSE;
@@ -3638,13 +3638,13 @@ H5_api_async_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS) {
-        HDprintf("\n");
-        HDprintf("Cleaning up testing files\n");
+        printf("\n");
+        printf("Cleaning up testing files\n");
     }
 
     cleanup_files();
@@ -3658,14 +3658,14 @@ int
 H5_api_async_test_parallel(void)
 {
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*      API Parallel Async Tests              *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*      API Parallel Async Tests              *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
-    HDprintf("SKIPPED due to no async support in HDF5 library\n");
+    printf("SKIPPED due to no async support in HDF5 library\n");
 
     return 0;
 }