Remove HD from strto* calls (#3204)

* HDstrtod
* HDstrtol
* HDstrtoll
* HDstrtoul
* HDstrtoull
* HDstrtoumax

2 files changed, 10 insertions, 10 deletions

diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index 15b206e..7134865 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -598,7 +598,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
                 break;
 
             case 'm':
-                options->min_comp = HDstrtoull(H5_optarg, NULL, 0);
+                options->min_comp = strtoull(H5_optarg, NULL, 0);
                 if ((int)options->min_comp <= 0) {
                     error_msg("invalid minimum compress size <%s>\n", H5_optarg);
                     h5tools_setstatus(EXIT_FAILURE);
@@ -712,7 +712,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
                 break;
 
             case 'a':
-                options->alignment = HDstrtoull(H5_optarg, NULL, 0);
+                options->alignment = strtoull(H5_optarg, NULL, 0);
                 if (options->alignment < 1) {
                     error_msg("invalid alignment size `%s`\n", H5_optarg);
                     h5tools_setstatus(EXIT_FAILURE);
@@ -759,7 +759,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
                 break;
 
             case 'G':
-                options->fs_pagesize = HDstrtoll(H5_optarg, NULL, 0);
+                options->fs_pagesize = strtoll(H5_optarg, NULL, 0);
                 if (options->fs_pagesize == 0)
                     /* To distinguish the "specified" zero value */
                     options->fs_pagesize = -1;
@@ -890,7 +890,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
     if (in_vfd_info.u.name && !HDstrcmp(in_vfd_info.u.name, "onion")) {
         if (in_vfd_info.info) {
             errno                      = 0;
-            onion_fa_in_g.revision_num = HDstrtoull(in_vfd_info.info, NULL, 10);
+            onion_fa_in_g.revision_num = strtoull(in_vfd_info.info, NULL, 10);
             if (errno == ERANGE) {
                 printf("Invalid onion revision specified for the input file\n");
                 usage(h5tools_getprogname());
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index ad1f852..38f9d3b 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -228,15 +228,15 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                                 l           = 0;
                             }
                             else if (f == -1) {
-                                filt->filt_flag = (unsigned)HDstrtoul(stype, NULL, 0);
+                                filt->filt_flag = (unsigned)strtoul(stype, NULL, 0);
                                 f               = 0;
                             }
                             else if (p == -1) {
-                                filt->cd_nelmts = HDstrtoull(stype, NULL, 0);
+                                filt->cd_nelmts = strtoull(stype, NULL, 0);
                                 p               = 0;
                             }
                             else {
-                                filt->cd_values[j++] = (unsigned)HDstrtoul(stype, NULL, 0);
+                                filt->cd_values[j++] = (unsigned)strtoul(stype, NULL, 0);
                             }
                             q = 0;
                             u++; /* skip ',' */
@@ -279,7 +279,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     stype[m] = '\0';
                 } /*if */
 
-                filt->cd_values[j++] = (unsigned)HDstrtoul(stype, NULL, 0);
+                filt->cd_values[j++] = (unsigned)strtoul(stype, NULL, 0);
                 if (filt->cd_nelmts == 0)
                     j = 0;
                 i += m; /* jump */
@@ -596,7 +596,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                 if (c == 'x') {
                     sdim[k - 1]                        = '\0';
                     k                                  = 0;
-                    pack->chunk.chunk_lengths[c_index] = HDstrtoull(sdim, NULL, 0);
+                    pack->chunk.chunk_lengths[c_index] = strtoull(sdim, NULL, 0);
                     if (pack->chunk.chunk_lengths[c_index] == 0) {
                         if (obj_list)
                             free(obj_list);
@@ -612,7 +612,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                         pack->chunk.rank = -2;
                     }
                     else {
-                        pack->chunk.chunk_lengths[c_index] = HDstrtoull(sdim, NULL, 0);
+                        pack->chunk.chunk_lengths[c_index] = strtoull(sdim, NULL, 0);
                         if (pack->chunk.chunk_lengths[c_index] == 0) {
                             if (obj_list)
                                 free(obj_list);