Rename HDexit() and related to exit(), etc. (#3202)

* HDatexit
* HDexit
* HD_exit

27 files changed, 115 insertions, 115 deletions

diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index dd69eb8..983d4af 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -509,7 +509,7 @@ indentation(unsigned x)
     }
     else {
         fprintf(rawerrorstream, "error: the indentation exceeds the number of cols.\n");
-        HDexit(1);
+        exit(1);
     }
 }
 
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index fe0c031..80c7b10 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -63,7 +63,7 @@ leave(int ret)
         free(str_flag);
 
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5diff/h5diff_main.c b/tools/src/h5diff/h5diff_main.c
index fd594db..f2ab2f9 100644
--- a/tools/src/h5diff/h5diff_main.c
+++ b/tools/src/h5diff/h5diff_main.c
@@ -124,5 +124,5 @@ h5diff_exit(int status)
 {
     h5tools_close();
 
-    HDexit(status);
+    exit(status);
 }
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index d1be2ff..a74be6b 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -303,5 +303,5 @@ h5diff_exit(int status)
     /* Always exit(0), since MPI implementations do weird stuff when they
      *  receive a non-zero exit value. - QAK
      */
-    HDexit(status);
+    exit(status);
 }
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 80aa7be..9fdaaca 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -159,7 +159,7 @@ leave(int ret)
 {
     h5tools_close();
 
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 648b9a8..b39b451 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -178,7 +178,7 @@ leave(int ret)
 {
     h5tools_close();
 
-    HDexit(ret);
+    exit(ret);
 } /* leave() */
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index d6273e2..06a160b 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
 
     if (argv[1] && (HDstrcmp("-V", argv[1]) == 0)) {
         print_version(PROGRAMNAME);
-        HDexit(EXIT_SUCCESS);
+        exit(EXIT_SUCCESS);
     }
 
     /*
@@ -168,7 +168,7 @@ main(int argc, char *argv[])
 
             case 6: /* -h found; help, then exit */
                 help(argv[0]);
-                HDexit(EXIT_SUCCESS);
+                exit(EXIT_SUCCESS);
                 break;
 
             case 7: /* -d found; look for dimensions */
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 91eb937..04b29ea 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -89,7 +89,7 @@ leave(int ret)
 {
     h5tools_close();
 
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
@@ -395,7 +395,7 @@ copy_some_to_file(int infid, int outfid, hsize_t starting, hsize_t startout, ssi
         res = HDfstat(infid, &sbuf);
         if (res < 0) {
             error_msg("Can't stat file \n");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         } /* end if */
 
         howmuch = (ssize_t)sbuf.st_size;
@@ -432,12 +432,12 @@ copy_some_to_file(int infid, int outfid, hsize_t starting, hsize_t startout, ssi
 
         if (nchars <= 0) {
             error_msg("Read error \n");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         } /* end if */
 
         if (HDwrite(outfid, buf, (unsigned)nchars) < 0) {
             error_msg("Write error \n");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
 
         tot += nchars;
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index 34c817d..077f128 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -156,7 +156,7 @@ static void
 leave(int ret)
 {
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 8a08dac..2a826c1 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -2630,7 +2630,7 @@ leave(int ret)
 {
     h5tools_close();
 
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index c08b0d1..4682f2d 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -1306,7 +1306,7 @@ parse_command_line(int argc, const char *const *argv)
                     }
                     else {
                         fprintf(stderr, "pio_perf: invalid --api option %s\n", buf);
-                        HDexit(EXIT_FAILURE);
+                        exit(EXIT_FAILURE);
                     }
 
                     if (*end == '\0')
@@ -1354,7 +1354,7 @@ parse_command_line(int argc, const char *const *argv)
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
                             if (!isdigit(buf[j])) {
                                 fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
-                                HDexit(EXIT_FAILURE);
+                                exit(EXIT_FAILURE);
                             }
 
                         pio_debug_level = atoi(buf);
@@ -1380,7 +1380,7 @@ parse_command_line(int argc, const char *const *argv)
                                 break;
                             default:
                                 fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
-                                HDexit(EXIT_FAILURE);
+                                exit(EXIT_FAILURE);
                         }
                     }
 
@@ -1524,7 +1524,7 @@ parse_size_directive(const char *size)
                 break;
             default:
                 fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
         }
     }
 
diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c
index 2268237..3aad24e 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -873,7 +873,7 @@ parse_command_line(int argc, const char *const *argv)
                     }
                     else {
                         fprintf(stderr, "sio_perf: invalid --api option %s\n", buf);
-                        HDexit(EXIT_FAILURE);
+                        exit(EXIT_FAILURE);
                     }
 
                     if (*end == '\0')
@@ -937,7 +937,7 @@ parse_command_line(int argc, const char *const *argv)
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
                             if (!HDisdigit(buf[j])) {
                                 fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
-                                HDexit(EXIT_FAILURE);
+                                exit(EXIT_FAILURE);
                             }
 
                         sio_debug_level = atoi(buf);
@@ -963,7 +963,7 @@ parse_command_line(int argc, const char *const *argv)
                                 break;
                             default:
                                 fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
-                                HDexit(EXIT_FAILURE);
+                                exit(EXIT_FAILURE);
                         }
                     }
 
@@ -1035,7 +1035,7 @@ parse_command_line(int argc, const char *const *argv)
                 }
                 else {
                     fprintf(stderr, "sio_perf: invalid --api option %s\n", H5_optarg);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
                 break;
             case 'w':
@@ -1199,7 +1199,7 @@ parse_size_directive(const char *size)
 
             default:
                 fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
         }
     }
 
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index fc64c98..15b206e 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -371,7 +371,7 @@ static void
 leave(int ret)
 {
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5repack/h5repack_opttable.c b/tools/src/h5repack/h5repack_opttable.c
index 64f3011..2018527 100644
--- a/tools/src/h5repack/h5repack_opttable.c
+++ b/tools/src/h5repack/h5repack_opttable.c
@@ -200,7 +200,7 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
                     /* already chunk info inserted for this one; exit */
                     if (table->objs[i].chunk.rank > 0) {
                         H5TOOLS_INFO("chunk information already inserted for <%s>\n", obj_list[j].obj);
-                        HDexit(EXIT_FAILURE);
+                        exit(EXIT_FAILURE);
                     }
                     /* insert the layout info */
                     else {
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index aa0e549..ad1f852 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -105,7 +105,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
         if (obj_list)
             free(obj_list);
         error_msg("input Error: Invalid compression type in <%s>\n", str);
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     /* get filter additional parameters */
@@ -136,7 +136,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                             if (obj_list)
                                 free(obj_list);
                             error_msg("compression parameter not digit in <%s>\n", str);
-                            HDexit(EXIT_FAILURE);
+                            exit(EXIT_FAILURE);
                         }
                         if (l == -1)
                             stype[m] = c;
@@ -152,7 +152,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                                     filt->cd_values[j++] = H5_SZIP_EC_OPTION_MASK;
                                 else {
                                     error_msg("szip mask must be 'NN' or 'EC' \n");
-                                    HDexit(EXIT_FAILURE);
+                                    exit(EXIT_FAILURE);
                                 }
                             }
                         }
@@ -186,7 +186,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                             if (obj_list)
                                 free(obj_list);
                             error_msg("compression parameter is not a digit in <%s>\n", str);
-                            HDexit(EXIT_FAILURE);
+                            exit(EXIT_FAILURE);
                         }
                         if (l == -1)
                             stype[m] = c;
@@ -202,7 +202,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                                     filt->cd_values[j++] = H5Z_SO_FLOAT_DSCALE;
                                 else {
                                     error_msg("scale type must be 'IN' or 'DS' \n");
-                                    HDexit(EXIT_FAILURE);
+                                    exit(EXIT_FAILURE);
                                 }
                             }
                         }
@@ -246,13 +246,13 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                             if (obj_list)
                                 free(obj_list);
                             error_msg("filter number parameter is not a digit in <%s>\n", str);
-                            HDexit(EXIT_FAILURE);
+                            exit(EXIT_FAILURE);
                         }
                         else if (!HDisdigit(c) && f == -1) {
                             if (obj_list)
                                 free(obj_list);
                             error_msg("filter flag parameter is not a digit in <%s>\n", str);
-                            HDexit(EXIT_FAILURE);
+                            exit(EXIT_FAILURE);
                         }
                         stype[q] = c;
                     } /* for u */
@@ -271,7 +271,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                             if (obj_list)
                                 free(obj_list);
                             error_msg("compression parameter is not a digit in <%s>\n", str);
-                            HDexit(EXIT_FAILURE);
+                            exit(EXIT_FAILURE);
                         }
                         stype[m] = c;
                     } /* u */
@@ -314,7 +314,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("missing compression parameter in <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
 
@@ -329,7 +329,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("missing compression parameter in <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
 
@@ -344,7 +344,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("extra parameter in SHUF <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
             /*-------------------------------------------------------------------------
@@ -358,7 +358,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("extra parameter in FLET <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
             /*-------------------------------------------------------------------------
@@ -372,7 +372,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("extra parameter in NBIT <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
             /*-------------------------------------------------------------------------
@@ -386,7 +386,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("missing compression parameter in <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
             /*-------------------------------------------------------------------------
@@ -399,14 +399,14 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     if (obj_list)
                         free(obj_list);
                     error_msg("incorrect number of compression parameters in <%s>\n", str);
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
             else {
                 if (obj_list)
                     free(obj_list);
                 error_msg("invalid filter type in <%s>\n", str);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             break;
         }
@@ -427,7 +427,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                 if (obj_list)
                     free(obj_list);
                 error_msg("invalid compression parameter in <%s>\n", str);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             break;
             /*-------------------------------------------------------------------------
@@ -440,19 +440,19 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                 if (obj_list)
                     free(obj_list);
                 error_msg("pixels_per_block is not even in <%s>\n", str);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             if (pixels_per_block > H5_SZIP_MAX_PIXELS_PER_BLOCK) {
                 if (obj_list)
                     free(obj_list);
                 error_msg("pixels_per_block is too large in <%s>\n", str);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             if ((HDstrcmp(smask, "NN") != 0) && (HDstrcmp(smask, "EC") != 0)) {
                 if (obj_list)
                     free(obj_list);
                 error_msg("szip mask must be 'NN' or 'EC' \n");
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             break;
         default:
@@ -543,7 +543,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
         if (obj_list)
             free(obj_list);
         error_msg("in parse layout, no characters after : in <%s>\n", str);
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     /* get layout info */
@@ -558,7 +558,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                 pack->layout = H5D_CHUNKED;
             else {
                 error_msg("in parse layout, not a valid layout in <%s>\n", str);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
         }
         else {
@@ -577,7 +577,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
             if (obj_list)
                 free(obj_list);
             error_msg("in parse layout,  <%s> Chunk dimensions missing\n", str);
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
 
         for (i = j, c_index = 0; i < len; i++) {
@@ -589,7 +589,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                 if (obj_list)
                     free(obj_list);
                 error_msg("in parse layout, <%s> Not a valid character in <%s>\n", sdim, str);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
 
             if (c == 'x' || i == len - 1) {
@@ -601,7 +601,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                         if (obj_list)
                             free(obj_list);
                         error_msg("in parse layout, <%s> conversion to number in <%s>\n", sdim, str);
-                        HDexit(EXIT_FAILURE);
+                        exit(EXIT_FAILURE);
                     }
                     c_index++;
                 }
@@ -617,7 +617,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                             if (obj_list)
                                 free(obj_list);
                             error_msg("in parse layout, <%s> conversion to number in <%s>\n", sdim, str);
-                            HDexit(EXIT_FAILURE);
+                            exit(EXIT_FAILURE);
                         }
                         pack->chunk.rank = c_index + 1;
                     }
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index fc93dfb..6744b56 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -192,7 +192,7 @@ static void
 leave(int ret)
 {
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 6364101..642143b 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -189,7 +189,7 @@ static void
 leave(int ret)
 {
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 } /* leave() */
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index 34247e0..f923192 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -69,7 +69,7 @@ leave(int ret)
             error_msg("Could not close file access property list\n");
 
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 } /* end leave() */
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index 843e9a3..17c3a97 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -65,7 +65,7 @@ usage(const char *progname)
                     "'k' for kB.\n");
     fprintf(stderr, "File family names include an integer printf "
                     "format such as '%%d'\n");
-    HDexit(EXIT_FAILURE);
+    exit(EXIT_FAILURE);
 }
 
 /*-------------------------------------------------------------------------
@@ -204,7 +204,7 @@ main(int argc, char *argv[])
         else if (!HDstrcmp(argv[argno], "-V")) {
             printf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR,
                    H5_VERS_RELEASE);
-            HDexit(EXIT_SUCCESS);
+            exit(EXIT_SUCCESS);
         }
         else if (!HDstrcmp(argv[argno], "-family_to_sec2")) {
             family_to_single = TRUE;
@@ -227,9 +227,9 @@ main(int argc, char *argv[])
 
     /* allocate names */
     if (NULL == (src_name = (char *)calloc((size_t)NAMELEN, sizeof(char))))
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     if (NULL == (dst_name = (char *)calloc((size_t)NAMELEN, sizeof(char))))
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
 
     /*
      * Get the name for the source file and open the first member.  The size
@@ -243,12 +243,12 @@ main(int argc, char *argv[])
 
     if ((src = HDopen(src_name, O_RDONLY)) < 0) {
         HDperror(src_name);
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (HDfstat(src, &sb) < 0) {
         HDperror("fstat");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
     src_size = src_act_size = sb.st_size;
     if (verbose)
@@ -265,7 +265,7 @@ main(int argc, char *argv[])
 
     if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
         HDperror(dst_name);
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
     if (verbose)
         fprintf(stderr, "> %s\n", dst_name);
@@ -295,11 +295,11 @@ main(int argc, char *argv[])
             n = (size_t)MIN((off_t)n, src_act_size - src_offset);
             if ((nio = HDread(src, buf, n)) < 0) {
                 HDperror("read");
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             else if ((size_t)nio != n) {
                 fprintf(stderr, "%s: short read\n", src_name);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             for (i = 0; i < n; i++) {
                 if (buf[i])
@@ -321,15 +321,15 @@ main(int argc, char *argv[])
         if (need_write) {
             if (need_seek && HDlseek(dst, dst_offset, SEEK_SET) < 0) {
                 HDperror("HDlseek");
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             if ((nio = HDwrite(dst, buf, n)) < 0) {
                 HDperror("write");
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             else if ((size_t)nio != n) {
                 fprintf(stderr, "%s: short write\n", dst_name);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             need_seek = FALSE;
         }
@@ -359,11 +359,11 @@ main(int argc, char *argv[])
             }
             else if (src < 0) {
                 HDperror(src_name);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             if (HDfstat(src, &sb) < 0) {
                 HDperror("fstat");
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             src_act_size = sb.st_size;
             if (src_act_size > src_size) {
@@ -384,26 +384,26 @@ main(int argc, char *argv[])
             if (0 == dst_membno) {
                 if (HDlseek(dst, dst_size - 1, SEEK_SET) < 0) {
                     HDperror("HDHDlseek");
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
                 if (HDread(dst, buf, 1) < 0) {
                     HDperror("read");
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
                 if (HDlseek(dst, dst_size - 1, SEEK_SET) < 0) {
                     HDperror("HDlseek");
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
                 if (HDwrite(dst, buf, 1) < 0) {
                     HDperror("write");
-                    HDexit(EXIT_FAILURE);
+                    exit(EXIT_FAILURE);
                 }
             }
             HDclose(dst);
             HDsnprintf(dst_name, NAMELEN, dst_gen_name, ++dst_membno);
             if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
                 HDperror(dst_name);
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
             }
             dst_offset = 0;
             need_seek  = FALSE;
@@ -420,19 +420,19 @@ main(int argc, char *argv[])
     if (need_seek) {
         if (HDlseek(dst, dst_offset - 1, SEEK_SET) < 0) {
             HDperror("HDlseek");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
         if (HDread(dst, buf, 1) < 0) {
             HDperror("read");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
         if (HDlseek(dst, dst_offset - 1, SEEK_SET) < 0) {
             HDperror("HDlseek");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
         if (HDwrite(dst, buf, 1) < 0) {
             HDperror("write");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
     }
     HDclose(dst);
@@ -441,7 +441,7 @@ main(int argc, char *argv[])
      * These private properties are for this tool only. */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         HDperror("H5Pcreate");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
 
     if (family_to_single) {
@@ -451,7 +451,7 @@ main(int argc, char *argv[])
          */
         if (H5Pset(fapl, H5F_ACS_FAMILY_TO_SINGLE_NAME, &family_to_single) < 0) {
             HDperror("H5Pset");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
     }
     else {
@@ -460,14 +460,14 @@ main(int argc, char *argv[])
          * This private property is for this tool only. */
         if (H5Pset_fapl_family(fapl, H5F_FAMILY_DEFAULT, H5P_DEFAULT) < 0) {
             HDperror("H5Pset_fapl_family");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
 
         /* Set the property of the new member size as hsize_t */
         hdsize = (hsize_t)dst_size;
         if (H5Pset(fapl, H5F_ACS_FAMILY_NEWSIZE_NAME, &hdsize) < 0) {
             HDperror("H5Pset");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         }
     }
 
@@ -488,13 +488,13 @@ main(int argc, char *argv[])
     if (file >= 0) {
         if (H5Fclose(file) < 0) {
             HDperror("H5Fclose");
-            HDexit(EXIT_FAILURE);
+            exit(EXIT_FAILURE);
         } /* end if */
     }     /* end if */
 
     if (H5Pclose(fapl) < 0) {
         HDperror("H5Pclose");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Free resources and return */
diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c
index ffa3327..49fbbab 100644
--- a/tools/test/h5format_convert/h5fc_chk_idx.c
+++ b/tools/test/h5format_convert/h5fc_chk_idx.c
@@ -51,7 +51,7 @@ main(int argc, char *argv[])
     /* h5fc_chk_idx fname dname */
     if (argc != 3) {
         usage();
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Duplicate the file name  & dataset name */
@@ -61,39 +61,39 @@ 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) {
         fprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Open the dataset */
     if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Get the dataset's chunk indexing type */
     if (H5Dget_chunk_index_type(did, &idx_type) < 0) {
         fprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Close the dataset */
     if (H5Dclose(did) < 0) {
         fprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Close the file */
     if (H5Fclose(fid) < 0) {
         fprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
     /* Return success when the chunk indexing type is version 1 B-tree */
     if (idx_type == H5D_CHUNK_IDX_BTREE)
-        HDexit(EXIT_SUCCESS);
+        exit(EXIT_SUCCESS);
     else {
         fprintf(stderr, "Error: chunk indexing type is %d\n", idx_type);
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 
 } /* main() */
diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c
index 5ac9c7f..139ead6 100644
--- a/tools/test/h5jam/getub.c
+++ b/tools/test/h5jam/getub.c
@@ -64,14 +64,14 @@ parse_command_line(int argc, const char *const *argv)
             case '?':
             default:
                 usage(h5tools_getprogname());
-                HDexit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
         } /* end switch */
     }     /* end while */
 
     if (argc <= H5_optind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     } /* end if */
 } /* end parse_command_line() */
 
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index ba0457b..4b5606c 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -85,7 +85,7 @@ static void
 leave(int ret)
 {
     h5tools_close();
-    HDexit(ret);
+    exit(ret);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c
index b57eb4a..ec86ec4 100644
--- a/tools/test/misc/clear_open_chk.c
+++ b/tools/test/misc/clear_open_chk.c
@@ -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 */
@@ -55,16 +55,16 @@ main(int argc, char *argv[])
     if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
         fprintf(stderr, "clear_open_chk: unable to open the file\n");
         free(fname);
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
     free(fname);
 
     /* Close the file */
     if (H5Fclose(fid) < 0) {
         fprintf(stderr, "clear_open_chk: cannot close the file\n");
-        HDexit(EXIT_FAILURE);
+        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 3636c98..d2a5068 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -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/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index 1f26c4d..5d5cb2f 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -38,11 +38,11 @@ main(void)
     /* Set up data array */
     if (NULL == (buf_data = (int *)calloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) {
         HDperror("calloc");
-        HDexit(EXIT_FAILURE);
+        exit(EXIT_FAILURE);
     }
     if (NULL == (buf = (int **)calloc(FAMILY_NUMBER, sizeof(buf_data)))) {
         HDperror("calloc");
-        HDexit(EXIT_FAILURE);
+        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,27 +80,27 @@ 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);
     }
 
     free(buf);
diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c
index 1ff6230..3857ee2 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);
     printf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
-    HDexit(EXIT_FAILURE);
+    exit(EXIT_FAILURE);
 } /* end main() */
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index c891bf9..7527716 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -90,7 +90,7 @@ error(const char *fmt, ...)
     H5_GCC_CLANG_DIAG_ON("format-nonliteral")
     fprintf(stderr, "\n");
     va_end(ap);
-    HDexit(EXIT_FAILURE);
+    exit(EXIT_FAILURE);
 }
 
 /*