Remove HD from C std lib file ops (#3206)

* HDfclose
* HDferror
* HDfeof
* HDfflush
* HDfopen
* HDfread
* HDfwrite

7 files changed, 107 insertions, 107 deletions

diff --git a/testpar/API/testphdf5.c b/testpar/API/testphdf5.c
index b02d0a3..044ebac 100644
--- a/testpar/API/testphdf5.c
+++ b/testpar/API/testphdf5.c
@@ -83,7 +83,7 @@ pause_proc(void)
                 printf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid, pid);
             }
             printf("waiting(%ds) for file %s ...\n", time_int, greenlight);
-            HDfflush(stdout);
+            fflush(stdout);
             HDsleep(time_int);
         }
     MPI_Barrier(MPI_COMM_WORLD);
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 1de9b56..e2e0e21 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -486,7 +486,7 @@ print_stats(void)
             datum_flushes, datum_pinned_flushes, datum_loads);
     fprintf(stdout, "%d: pins: global / global dirty / local = %ld / %ld / %ld\n", world_mpi_rank,
             global_pins, global_dirty_pins, local_pins);
-    HDfflush(stdout);
+    fflush(stdout);
 
     return;
 
@@ -6420,11 +6420,11 @@ trace_file_check(int metadata_write_strategy)
         if (nerrors == 0) {
             HDsnprintf(trace_file_name, sizeof(trace_file_name), "t_cache_trace.txt.%d", (int)file_mpi_rank);
 
-            if ((trace_file_ptr = HDfopen(trace_file_name, "r")) == NULL) {
+            if ((trace_file_ptr = fopen(trace_file_name, "r")) == NULL) {
 
                 nerrors++;
                 if (verbose)
-                    fprintf(stdout, "%d:%s: HDfopen failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: fopen failed.\n", world_mpi_rank, __func__);
             }
         } /* end if */
 
@@ -6512,7 +6512,7 @@ trace_file_check(int metadata_write_strategy)
 
         /* Clean up the trace file */
         if (trace_file_ptr != NULL) {
-            HDfclose(trace_file_ptr);
+            fclose(trace_file_ptr);
             trace_file_ptr = NULL;
             HDremove(trace_file_name);
         }
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index d873c82..1ed713a 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -3592,17 +3592,17 @@ main(int argc, char **argv)
         int i;
 
         fprintf(stdout, "Constructing test files: \n");
-        HDfflush(stdout);
+        fflush(stdout);
 
         i = 0;
         while ((FILENAMES[i] != NULL) && (i < TEST_FILES_TO_CONSTRUCT)) {
             fprintf(stdout, "   writing %s ... ", FILENAMES[i]);
-            HDfflush(stdout);
+            fflush(stdout);
             construct_test_file(i);
 
             if (pass) {
                 printf("done.\n");
-                HDfflush(stdout);
+                fflush(stdout);
             }
             else {
                 printf("failed.\n");
diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c
index 8933e3a..dacdee5 100644
--- a/testpar/t_filters_parallel.c
+++ b/testpar/t_filters_parallel.c
@@ -475,7 +475,7 @@ test_write_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t fil
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -631,7 +631,7 @@ test_write_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fi
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -778,7 +778,7 @@ test_write_filtered_dataset_no_overlap_partial(const char *parent_group, H5Z_fil
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -939,7 +939,7 @@ test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filte
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -1110,7 +1110,7 @@ test_write_filtered_dataset_single_unlim_dim_no_overlap(const char *parent_group
                    ", %" PRIuHSIZE " ]\n",
                    mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
                    block[1]);
-            HDfflush(stdout);
+            fflush(stdout);
         }
 
         VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -1263,7 +1263,7 @@ test_write_filtered_dataset_single_unlim_dim_overlap(const char *parent_group, H
                    ", %" PRIuHSIZE " ]\n",
                    mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
                    block[1]);
-            HDfflush(stdout);
+            fflush(stdout);
         }
 
         VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -1427,7 +1427,7 @@ test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char *parent_group,
                    ", %" PRIuHSIZE " ]\n",
                    mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
                    block[1]);
-            HDfflush(stdout);
+            fflush(stdout);
         }
 
         VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -1594,7 +1594,7 @@ test_write_filtered_dataset_multi_unlim_dim_overlap(const char *parent_group, H5
                    ", %" PRIuHSIZE " ]\n",
                    mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
                    block[1]);
-            HDfflush(stdout);
+            fflush(stdout);
         }
 
         VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -1740,7 +1740,7 @@ test_write_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fi
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -2176,7 +2176,7 @@ test_write_filtered_dataset_interleaved_write(const char *parent_group, H5Z_filt
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -2347,7 +2347,7 @@ test_write_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -2520,7 +2520,7 @@ test_write_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_grou
                " ]\n",
                mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
                start[2], block[0], block[1], block[2]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -2682,7 +2682,7 @@ test_write_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H
                " ]\n",
                mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
                start[2], block[0], block[1], block[2]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -2843,7 +2843,7 @@ test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fi
                " ]\n",
                mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
                start[2], block[0], block[1], block[2]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -3031,7 +3031,7 @@ test_write_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -3212,7 +3212,7 @@ test_write_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group,
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -3419,7 +3419,7 @@ test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_gro
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -3618,7 +3618,7 @@ test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -3834,7 +3834,7 @@ test_read_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t filt
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -4034,7 +4034,7 @@ test_read_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fil
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -4236,7 +4236,7 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -4463,7 +4463,7 @@ test_read_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fil
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     if (mpi_rank == READ_SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC)
@@ -5043,7 +5043,7 @@ test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -5269,7 +5269,7 @@ test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -5494,7 +5494,7 @@ test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -5713,7 +5713,7 @@ test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -5935,7 +5935,7 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -6173,7 +6173,7 @@ test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group,
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -6406,7 +6406,7 @@ test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -6641,7 +6641,7 @@ test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_grou
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -6883,7 +6883,7 @@ test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group,
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -7173,7 +7173,7 @@ test_write_parallel_read_serial(const char *parent_group, H5Z_filter_t filter_id
                " ]\n",
                mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], offset[0], offset[1],
                offset[2], block[0], block[1], block[2]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -7340,7 +7340,7 @@ test_shrinking_growing_chunks(const char *parent_group, H5Z_filter_t filter_id,
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -7488,7 +7488,7 @@ test_edge_chunks_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hi
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -7562,7 +7562,7 @@ test_edge_chunks_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hi
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -7691,7 +7691,7 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -7766,7 +7766,7 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -7936,7 +7936,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -8013,7 +8013,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -8084,7 +8084,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -8149,7 +8149,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -8303,7 +8303,7 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -8358,7 +8358,7 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
@@ -8527,7 +8527,7 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     /* Select hyperslab in the file */
@@ -8609,7 +8609,7 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap
                ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
                ", %" PRIuHSIZE " ]\n",
                mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
-        HDfflush(stdout);
+        fflush(stdout);
     }
 
     VRFY((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, start, stride, count, block) >= 0),
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index 774087f..cbe9835 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -169,8 +169,8 @@ main(int argc, char *argv[])
     if (mpi_rank == 0)
         PASSED();
 
-    HDfflush(stdout);
-    HDfflush(stderr);
+    fflush(stdout);
+    fflush(stderr);
 
     /* Some systems like AIX do not like files not being closed when MPI_Finalize
      * is called.  So, we need to get the MPI file handles, close them by hand.
@@ -191,8 +191,8 @@ main(int argc, char *argv[])
     if (MPI_File_close(mpifh_p) != MPI_SUCCESS)
         goto error;
 
-    HDfflush(stdout);
-    HDfflush(stderr);
+    fflush(stdout);
+    fflush(stderr);
 
     if (data_g) {
         free(data_g);
@@ -210,11 +210,11 @@ main(int argc, char *argv[])
     _exit(EXIT_FAILURE);
 
 error:
-    HDfflush(stdout);
-    HDfflush(stderr);
+    fflush(stdout);
+    fflush(stderr);
     printf("*** ERROR ***\n");
     printf("THERE WAS A REAL ERROR IN t_pflush1.\n");
-    HDfflush(stdout);
+    fflush(stdout);
 
     if (data_g)
         free(data_g);
diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c
index 9fc7f9b..7135617 100644
--- a/testpar/t_subfiling_vfd.c
+++ b/testpar/t_subfiling_vfd.c
@@ -328,8 +328,8 @@ test_config_file(void)
         HDsnprintf(config_filename, PATH_MAX, "%s/" H5FD_SUBFILING_CONFIG_FILENAME_TEMPLATE, config_dir,
                    SUBF_FILENAME, (uint64_t)file_info.st_ino);
 
-        config_file = HDfopen(config_filename, "r");
-        VRFY(config_file, "HDfopen succeeded");
+        config_file = fopen(config_filename, "r");
+        VRFY(config_file, "fopen succeeded");
 
         free(config_filename);
 
@@ -343,7 +343,7 @@ test_config_file(void)
         config_buf = malloc((size_t)config_file_len + 1);
         VRFY(config_buf, "malloc succeeded");
 
-        VRFY((HDfread(config_buf, (size_t)config_file_len, 1, config_file) == 1), "HDfread succeeded");
+        VRFY((fread(config_buf, (size_t)config_file_len, 1, config_file) == 1), "fread succeeded");
         config_buf[config_file_len] = '\0';
 
         /* Check the stripe_size field in the configuration file */
@@ -421,7 +421,7 @@ test_config_file(void)
         free(subfile_name);
         free(config_buf);
 
-        VRFY((HDfclose(config_file) >= 0), "HDfclose on configuration file succeeded");
+        VRFY((fclose(config_file) >= 0), "fclose on configuration file succeeded");
     }
 
     mpi_code_g = MPI_Barrier(comm_g);
@@ -570,9 +570,9 @@ test_stripe_sizes(void)
                            (uint64_t)file_info.st_ino, num_digits, j + 1, num_subfiles);
 
                 /* Ensure file exists */
-                subfile_ptr = HDfopen(tmp_filename, "r");
-                VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-                VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+                subfile_ptr = fopen(tmp_filename, "r");
+                VRFY(subfile_ptr, "fopen on subfile succeeded");
+                VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
 
                 /* Check file size */
                 VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded");
@@ -586,8 +586,8 @@ test_stripe_sizes(void)
                        (uint64_t)file_info.st_ino, num_digits, num_subfiles + 1, num_subfiles);
 
             /* Ensure file doesn't exist */
-            subfile_ptr = HDfopen(tmp_filename, "r");
-            VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+            subfile_ptr = fopen(tmp_filename, "r");
+            VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
 
             /* Set EOA for following write call */
             VRFY((H5FDset_eoa(file_ptr, H5FD_MEM_DEFAULT, file_end_addr + nbytes) >= 0),
@@ -616,9 +616,9 @@ test_stripe_sizes(void)
                            (uint64_t)file_info.st_ino, num_digits, j + 1, num_subfiles);
 
                 /* Ensure file exists */
-                subfile_ptr = HDfopen(tmp_filename, "r");
-                VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-                VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+                subfile_ptr = fopen(tmp_filename, "r");
+                VRFY(subfile_ptr, "fopen on subfile succeeded");
+                VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
 
                 /* Check file size */
                 VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded");
@@ -632,8 +632,8 @@ test_stripe_sizes(void)
                        (uint64_t)file_info.st_ino, num_digits, num_subfiles + 1, num_subfiles);
 
             /* Ensure file doesn't exist */
-            subfile_ptr = HDfopen(tmp_filename, "r");
-            VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+            subfile_ptr = fopen(tmp_filename, "r");
+            VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
 
             free(write_buf);
             write_buf = NULL;
@@ -736,9 +736,9 @@ test_stripe_sizes(void)
                            (uint64_t)file_info.st_ino, num_digits, j + 1, num_subfiles);
 
                 /* Ensure file exists */
-                subfile_ptr = HDfopen(tmp_filename, "r");
-                VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-                VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+                subfile_ptr = fopen(tmp_filename, "r");
+                VRFY(subfile_ptr, "fopen on subfile succeeded");
+                VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
 
                 /* Check file size */
                 VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded");
@@ -752,8 +752,8 @@ test_stripe_sizes(void)
                        (uint64_t)file_info.st_ino, num_digits, num_subfiles + 1, num_subfiles);
 
             /* Ensure file doesn't exist */
-            subfile_ptr = HDfopen(tmp_filename, "r");
-            VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+            subfile_ptr = fopen(tmp_filename, "r");
+            VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
         }
 
         mpi_code_g = MPI_Barrier(comm_g);
@@ -793,9 +793,9 @@ test_stripe_sizes(void)
                            (uint64_t)file_info.st_ino, num_digits, j + 1, num_subfiles);
 
                 /* Ensure file exists */
-                subfile_ptr = HDfopen(tmp_filename, "r");
-                VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-                VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+                subfile_ptr = fopen(tmp_filename, "r");
+                VRFY(subfile_ptr, "fopen on subfile succeeded");
+                VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
 
                 /* Check file size */
                 VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded");
@@ -809,8 +809,8 @@ test_stripe_sizes(void)
                        (uint64_t)file_info.st_ino, num_digits, num_subfiles + 1, num_subfiles);
 
             /* Ensure file doesn't exist */
-            subfile_ptr = HDfopen(tmp_filename, "r");
-            VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+            subfile_ptr = fopen(tmp_filename, "r");
+            VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
         }
 
         VRFY((H5FDclose(file_ptr) >= 0), "H5FDclose succeeded");
@@ -985,9 +985,9 @@ test_selection_strategies(void)
                                    (uint64_t)file_info.st_ino, num_digits, i + 1, expected_num_subfiles);
 
                         /* Ensure file exists */
-                        subfile_ptr = HDfopen(tmp_filename, "r");
-                        VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-                        VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+                        subfile_ptr = fopen(tmp_filename, "r");
+                        VRFY(subfile_ptr, "fopen on subfile succeeded");
+                        VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
                     }
 
                     /* Ensure no extra subfiles are present */
@@ -996,8 +996,8 @@ test_selection_strategies(void)
                                expected_num_subfiles);
 
                     /* Ensure file doesn't exist */
-                    subfile_ptr = HDfopen(tmp_filename, "r");
-                    VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+                    subfile_ptr = fopen(tmp_filename, "r");
+                    VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
 
                     VRFY((H5Fclose(file_id) >= 0), "File close succeeded");
 
@@ -1144,9 +1144,9 @@ test_read_different_stripe_size(void)
                        (uint64_t)file_info.st_ino, num_digits, j + 1, num_subfiles);
 
             /* Ensure file exists */
-            subfile_ptr = HDfopen(tmp_filename, "r");
-            VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-            VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+            subfile_ptr = fopen(tmp_filename, "r");
+            VRFY(subfile_ptr, "fopen on subfile succeeded");
+            VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
 
             /* Check file size */
             VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded");
@@ -1215,14 +1215,14 @@ test_read_different_stripe_size(void)
 
             if (j < (num_subfiles / 2)) {
                 /* Ensure file exists */
-                subfile_ptr = HDfopen(tmp_filename, "r");
-                VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-                VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+                subfile_ptr = fopen(tmp_filename, "r");
+                VRFY(subfile_ptr, "fopen on subfile succeeded");
+                VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
             }
             else {
                 /* Ensure file doesn't exist */
-                subfile_ptr = HDfopen(tmp_filename, "r");
-                VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+                subfile_ptr = fopen(tmp_filename, "r");
+                VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
             }
         }
     }
@@ -1367,9 +1367,9 @@ test_subfiling_precreate_rank_0(void)
                        (uint64_t)file_info.st_ino, num_digits, i + 1, num_subfiles);
 
             /* Ensure file exists */
-            subfile_ptr = HDfopen(tmp_filename, "r");
-            VRFY(subfile_ptr, "HDfopen on subfile succeeded");
-            VRFY((HDfclose(subfile_ptr) >= 0), "HDfclose on subfile succeeded");
+            subfile_ptr = fopen(tmp_filename, "r");
+            VRFY(subfile_ptr, "fopen on subfile succeeded");
+            VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded");
 
             /* Check file size */
             VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded");
@@ -1383,8 +1383,8 @@ test_subfiling_precreate_rank_0(void)
                    (uint64_t)file_info.st_ino, num_digits, num_subfiles + 1, num_subfiles);
 
         /* Ensure file doesn't exist */
-        subfile_ptr = HDfopen(tmp_filename, "r");
-        VRFY(subfile_ptr == NULL, "HDfopen on subfile correctly failed");
+        subfile_ptr = fopen(tmp_filename, "r");
+        VRFY(subfile_ptr == NULL, "fopen on subfile correctly failed");
 
         free(tmp_filename);
         tmp_filename = NULL;
@@ -1829,9 +1829,9 @@ test_subfiling_h5fuse(void)
     if (MAINPROCESS) {
         FILE *h5fuse_script;
 
-        h5fuse_script = HDfopen("h5fuse.sh", "r");
+        h5fuse_script = fopen("h5fuse.sh", "r");
         if (h5fuse_script)
-            HDfclose(h5fuse_script);
+            fclose(h5fuse_script);
         else
             skip_test = 1;
     }
@@ -1958,13 +1958,13 @@ test_subfiling_h5fuse(void)
 
                 if ((ret = WEXITSTATUS(status)) != 0) {
                     printf("h5fuse process exited with error code %d\n", ret);
-                    HDfflush(stdout);
+                    fflush(stdout);
                     MPI_Abort(comm_g, -1);
                 }
             }
             else {
                 printf("h5fuse process terminated abnormally\n");
-                HDfflush(stdout);
+                fflush(stdout);
                 MPI_Abort(comm_g, -1);
             }
         }
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index dc28cc9..5b7cd14 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -79,7 +79,7 @@ pause_proc(void)
                 printf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid, pid);
             }
             printf("waiting(%ds) for file %s ...\n", time_int, greenlight);
-            HDfflush(stdout);
+            fflush(stdout);
             HDsleep(time_int);
         }
     MPI_Barrier(MPI_COMM_WORLD);