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

6 files changed, 74 insertions, 74 deletions

diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c
index 37e7307..ec86ec4 100644
--- a/tools/test/misc/clear_open_chk.c
+++ b/tools/test/misc/clear_open_chk.c
@@ -18,9 +18,9 @@ static void usage(void);
 static void
 usage(void)
 {
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Usage error!\n");
-    HDfprintf(stdout, "Usage: clear_open_chk filename\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Usage error!\n");
+    fprintf(stdout, "Usage: clear_open_chk filename\n");
 } /* usage() */
 
 /*-------------------------------------------------------------------------
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
     /* Check the # of arguments */
     if (argc != 2) {
         usage();
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     /* Get the file name */
@@ -53,18 +53,18 @@ main(int argc, char *argv[])
 
     /* Try opening the file */
     if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
-        HDfprintf(stderr, "clear_open_chk: unable to open the file\n");
-        HDfree(fname);
-        HDexit(EXIT_FAILURE);
+        fprintf(stderr, "clear_open_chk: unable to open the file\n");
+        free(fname);
+        exit(EXIT_FAILURE);
     }
-    HDfree(fname);
+    free(fname);
 
     /* Close the file */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "clear_open_chk: cannot close the file\n");
-        HDexit(EXIT_FAILURE);
+        fprintf(stderr, "clear_open_chk: cannot close the file\n");
+        exit(EXIT_FAILURE);
     }
 
     /* Return success */
-    HDexit(EXIT_SUCCESS);
+    exit(EXIT_SUCCESS);
 } /* main() */
diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c
index 666a3f7..15804fe 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -124,7 +124,7 @@ gen_cache_image_file(const char *fname)
     if (H5Fclose(fid) < 0)
         goto error;
 
-    HDfree(buf);
+    free(buf);
 
     return 0;
 
@@ -140,7 +140,7 @@ error:
     }
     H5E_END_TRY;
 
-    HDfree(buf);
+    free(buf);
 
     return 1;
 } /* gen_cache_image_file() */
@@ -600,10 +600,10 @@ main(void)
     fflush(stderr);
 
     /* Not going through library closing by calling _exit(0) with success */
-    HD_exit(0);
+    _exit(0);
 
 error:
 
     /* Exit with failure */
-    HD_exit(1);
+    _exit(1);
 }
diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c
index 5b898db..cf91c79 100644
--- a/tools/test/misc/h5perf_gentest.c
+++ b/tools/test/misc/h5perf_gentest.c
@@ -85,20 +85,20 @@ main(int argc, char *argv[])
         else if (strcmp(argv[i], "-z") == 0)
             z = 1;
         else if (strcmp(argv[i], "-h") == 0) {
-            HDprintf("\nOPTONS:\n");
-            HDprintf("\t-f F:\tname of the test file (default: %s).\n", FNAME);
-            HDprintf("\t-g N:\tnumber of top level groups (default: %d).\n", NGROUPS);
-            HDprintf("\t-d N:\tnumber of datasets (default: %d).\n", NDSETS);
-            HDprintf("\t-a N:\tnumber of attributes (default: %d).\n", NATTRS);
-            HDprintf("\t-r N:\tnumber of rows in the large compound dataset (default: %d).\n", NROWS);
-            HDprintf("\t-s N:\tsize of dim0 in datasets (default: %d).\n", DIM0);
-            HDprintf("\t-c N:\tchunk size of dim0 (default: %d).\n", (DIM0 / 10 + 1));
-            HDprintf("\t-v N:\tmax vlen size (default: %d).\n", MAXVLEN);
-            HDprintf("\t-l:\tuse latest format (default: no).\n");
-            HDprintf("\t-z:\tuse gzip compression (default: no).\n");
-            HDprintf("\t-h:\tthis help information.\n");
-            HDprintf("Example:\n");
-            HDprintf("\t./a.out -f test.h5 -g 10000 -d 5000 -a 500 -r 10000 -s 200 -c 20 -v 40 -l -z\n\n");
+            printf("\nOPTONS:\n");
+            printf("\t-f F:\tname of the test file (default: %s).\n", FNAME);
+            printf("\t-g N:\tnumber of top level groups (default: %d).\n", NGROUPS);
+            printf("\t-d N:\tnumber of datasets (default: %d).\n", NDSETS);
+            printf("\t-a N:\tnumber of attributes (default: %d).\n", NATTRS);
+            printf("\t-r N:\tnumber of rows in the large compound dataset (default: %d).\n", NROWS);
+            printf("\t-s N:\tsize of dim0 in datasets (default: %d).\n", DIM0);
+            printf("\t-c N:\tchunk size of dim0 (default: %d).\n", (DIM0 / 10 + 1));
+            printf("\t-v N:\tmax vlen size (default: %d).\n", MAXVLEN);
+            printf("\t-l:\tuse latest format (default: no).\n");
+            printf("\t-z:\tuse gzip compression (default: no).\n");
+            printf("\t-h:\tthis help information.\n");
+            printf("Example:\n");
+            printf("\t./a.out -f test.h5 -g 10000 -d 5000 -a 500 -r 10000 -s 200 -c 20 -v 40 -l -z\n\n");
             exit(0);
         }
     }
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index 04ac8e7..df1c312 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -36,13 +36,13 @@ main(void)
     hsize_t dims[2] = {FAMILY_NUMBER, FAMILY_SIZE};
 
     /* Set up data array */
-    if (NULL == (buf_data = (int *)HDcalloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) {
-        HDperror("HDcalloc");
-        HDexit(EXIT_FAILURE);
+    if (NULL == (buf_data = (int *)calloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) {
+        HDperror("calloc");
+        exit(EXIT_FAILURE);
     }
-    if (NULL == (buf = (int **)HDcalloc(FAMILY_NUMBER, sizeof(buf_data)))) {
-        HDperror("HDcalloc");
-        HDexit(EXIT_FAILURE);
+    if (NULL == (buf = (int **)calloc(FAMILY_NUMBER, sizeof(buf_data)))) {
+        HDperror("calloc");
+        exit(EXIT_FAILURE);
     }
     for (i = 0; i < FAMILY_NUMBER; i++)
         buf[i] = buf_data + (i * FAMILY_SIZE);
@@ -50,28 +50,28 @@ main(void)
     /* Set property list and file name for FAMILY driver */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         HDperror("H5Pcreate");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (H5Pset_fapl_family(fapl, (hsize_t)FAMILY_SIZE, H5P_DEFAULT) < 0) {
         HDperror("H5Pset_fapl_family");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if ((file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
         HDperror("H5Fcreate");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     /* Create and write dataset */
     if ((space = H5Screate_simple(2, dims, NULL)) < 0) {
         HDperror("H5Screate_simple");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if ((dset = H5Dcreate2(file, dname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         HDperror("H5Dcreate2");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     for (i = 0; i < FAMILY_NUMBER; i++)
@@ -80,34 +80,34 @@ main(void)
 
     if (H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_data) < 0) {
         HDperror("H5Dwrite");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (H5Sclose(space) < 0) {
         HDperror("H5Sclose");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (H5Dclose(dset) < 0) {
         HDperror("H5Dclose");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (H5Pclose(fapl) < 0) {
         HDperror("H5Pclose");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (H5Fclose(file) < 0) {
         HDperror("H5Fclose");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
-    HDfree(buf);
-    HDfree(buf_data);
+    free(buf);
+    free(buf_data);
 
     HDputs(" PASSED");
-    HDfflush(stdout);
+    fflush(stdout);
 
     return EXIT_SUCCESS;
 }
diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c
index 5c3ebf2..5951fd2 100644
--- a/tools/test/misc/repart_test.c
+++ b/tools/test/misc/repart_test.c
@@ -142,10 +142,10 @@ main(void)
     if (nerrors)
         goto error;
 
-    HDexit(EXIT_SUCCESS);
+    exit(EXIT_SUCCESS);
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
-    HDexit(EXIT_FAILURE);
+    printf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    exit(EXIT_FAILURE);
 } /* end main() */
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index 7764e34..f8fe076 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -51,7 +51,7 @@ main(void)
     int    result = 0;
     herr_t error  = 1;
 
-    HDprintf("%-70s", "Testing alignment in compound datatypes");
+    printf("%-70s", "Testing alignment in compound datatypes");
 
     HDstrcpy(string5, "Hi!");
     HDunlink(fname);
@@ -122,7 +122,7 @@ main(void)
     H5Dclose(set);
 
     /* Now open the set, and read it back in */
-    data = (char *)HDmalloc(H5Tget_size(fix));
+    data = (char *)malloc(H5Tget_size(fix));
 
     if (!data) {
         HDperror("malloc() failed");
@@ -146,39 +146,39 @@ out:
 
         result = 1;
         mname  = H5Tget_member_name(fix, 0);
-        HDprintf("%14s (%2d) %6s = %s\n", mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 0),
-                 string5, (char *)(data + H5Tget_member_offset(fix, 0)));
+        printf("%14s (%2d) %6s = %s\n", mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 0), string5,
+               (char *)(data + H5Tget_member_offset(fix, 0)));
         if (mname)
             H5free_memory(mname);
 
         fptr  = (float *)((void *)(data + H5Tget_member_offset(fix, 1)));
         mname = H5Tget_member_name(fix, 1);
-        HDprintf("Data comparison:\n"
-                 "%14s (%2d) %6f = %f\n"
-                 "                    %6f = %f\n",
-                 mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 1), (double)fok[0], (double)fptr[0],
-                 (double)fok[1], (double)fptr[1]);
+        printf("Data comparison:\n"
+               "%14s (%2d) %6f = %f\n"
+               "                    %6f = %f\n",
+               mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 1), (double)fok[0], (double)fptr[0],
+               (double)fok[1], (double)fptr[1]);
         if (mname)
             H5free_memory(mname);
 
         fptr  = (float *)((void *)(data + H5Tget_member_offset(fix, 2)));
         mname = H5Tget_member_name(fix, 2);
-        HDprintf("%14s (%2d) %6f = %f\n"
-                 "                    %6f = %6f\n",
-                 mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 2), (double)fnok[0],
-                 (double)fptr[0], (double)fnok[1], (double)fptr[1]);
+        printf("%14s (%2d) %6f = %f\n"
+               "                    %6f = %6f\n",
+               mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 2), (double)fnok[0], (double)fptr[0],
+               (double)fnok[1], (double)fptr[1]);
         if (mname)
             H5free_memory(mname);
 
         fptr = (float *)((void *)(data + H5Tget_member_offset(fix, 1)));
-        HDprintf("\n"
-                 "Short circuit\n"
-                 "                    %6f = %f\n"
-                 "                    %6f = %f\n"
-                 "                    %6f = %f\n"
-                 "                    %6f = %f\n",
-                 (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
-                 (double)fptr[2], (double)fnok[1], (double)fptr[3]);
+        printf("\n"
+               "Short circuit\n"
+               "                    %6f = %f\n"
+               "                    %6f = %f\n"
+               "                    %6f = %f\n"
+               "                    %6f = %f\n",
+               (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
+               (double)fptr[2], (double)fnok[1], (double)fptr[3]);
         HDputs("*FAILED - compound type alignmnent problem*");
     }
     else {
@@ -186,7 +186,7 @@ out:
     }
 
     if (data)
-        HDfree(data);
+        free(data);
     H5Sclose(spc);
     H5Tclose(cs6);
     H5Tclose(cmp);
@@ -197,6 +197,6 @@ out:
     H5Pclose(plist);
     H5Fclose(fil);
     HDunlink(fname);
-    HDfflush(stdout);
+    fflush(stdout);
     return result;
 }