diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-29 13:33:09 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-29 13:33:09 (GMT) |
commit | dd39b54c953854837cc316d80618f65fdb70a04a (patch) | |
tree | 6d7e2df3c2e57d977e44e1387ccbc15a48962fee /tools | |
parent | a90bdbbcfc6db6718d368fe7d0c570238e302bc7 (diff) | |
download | hdf5-dd39b54c953854837cc316d80618f65fdb70a04a.zip hdf5-dd39b54c953854837cc316d80618f65fdb70a04a.tar.gz hdf5-dd39b54c953854837cc316d80618f65fdb70a04a.tar.bz2 |
Rename HDato*() to ato*() (#3201)
Diffstat (limited to 'tools')
-rw-r--r-- | tools/src/h5copy/h5copy.c | 2 | ||||
-rw-r--r-- | tools/src/h5diff/h5diff_common.c | 20 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump.c | 18 | ||||
-rw-r--r-- | tools/src/h5ls/h5ls.c | 4 | ||||
-rw-r--r-- | tools/src/h5perf/pio_perf.c | 8 | ||||
-rw-r--r-- | tools/src/h5perf/sio_perf.c | 2 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_main.c | 34 | ||||
-rw-r--r-- | tools/src/h5repack/h5repack_parse.c | 2 | ||||
-rw-r--r-- | tools/src/h5stat/h5stat.c | 8 | ||||
-rw-r--r-- | tools/src/misc/h5clear.c | 4 | ||||
-rw-r--r-- | tools/src/misc/h5mkgrp.c | 4 |
11 files changed, 53 insertions, 53 deletions
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index deae9a9..fe0c031 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/h5copy/h5copy.c @@ -282,7 +282,7 @@ main(int argc, char *argv[]) case 'E': if (H5_optarg != NULL) - enable_error_stack = HDatoi(H5_optarg); + enable_error_stack = atoi(H5_optarg); else enable_error_stack = 1; break; diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index c15603d..f941d00 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -181,7 +181,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const } else { if (H5_optarg != NULL) - opts->mode_verbose_level = HDatoi(H5_optarg); + opts->mode_verbose_level = atoi(H5_optarg); else opts->mode_verbose_level = 0; } @@ -207,7 +207,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case 'S': if (H5_optarg != NULL) - enable_error_stack = HDatoi(H5_optarg); + enable_error_stack = atoi(H5_optarg); else enable_error_stack = 1; break; @@ -280,7 +280,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const usage(); h5diff_exit(EXIT_FAILURE); } - opts->delta = HDatof(H5_optarg); + opts->delta = atof(H5_optarg); /* do not check against default, the DBL_EPSILON is being replaced by user */ break; @@ -291,7 +291,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const usage(); h5diff_exit(EXIT_FAILURE); } - opts->percent = HDatof(H5_optarg); + opts->percent = atof(H5_optarg); /* -p 0 is the same as default */ if (H5_DBL_ABS_EQUAL(opts->percent, 0.0)) @@ -322,7 +322,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case '1': opts->vol_info[0].type = VOL_BY_VALUE; - opts->vol_info[0].u.value = (H5VL_class_value_t)HDatoi(H5_optarg); + opts->vol_info[0].u.value = (H5VL_class_value_t)atoi(H5_optarg); opts->custom_vol[0] = TRUE; break; @@ -338,7 +338,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case '4': opts->vol_info[1].type = VOL_BY_VALUE; - opts->vol_info[1].u.value = (H5VL_class_value_t)HDatoi(H5_optarg); + opts->vol_info[1].u.value = (H5VL_class_value_t)atoi(H5_optarg); opts->custom_vol[1] = TRUE; break; @@ -354,7 +354,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case '7': opts->vfd_info[0].type = VFD_BY_VALUE; - opts->vfd_info[0].u.value = (H5FD_class_value_t)HDatoi(H5_optarg); + opts->vfd_info[0].u.value = (H5FD_class_value_t)atoi(H5_optarg); opts->custom_vfd[0] = TRUE; break; @@ -370,7 +370,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case '0': opts->vfd_info[1].type = VFD_BY_VALUE; - opts->vfd_info[1].u.value = (H5FD_class_value_t)HDatoi(H5_optarg); + opts->vfd_info[1].u.value = (H5FD_class_value_t)atoi(H5_optarg); opts->custom_vfd[1] = TRUE; break; @@ -544,7 +544,7 @@ check_p_input(const char *str) if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x') return -1; - x = HDatof(str); + x = atof(str); if (x < 0) return -1; @@ -571,7 +571,7 @@ check_d_input(const char *str) if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x') return -1; - x = HDatof(str); + x = atof(str); if (x < 0) return -1; diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 3b17a34..80aa7be 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -606,7 +606,7 @@ parse_mask_list(const char *h_list) error_msg("Bad mask list(%s)\n", h_list); return FAIL; } - soffset_value = HDatoi(ptr); + soffset_value = atoi(ptr); offset_value = (unsigned)soffset_value; if (soffset_value < 0 || offset_value >= PACKED_BITS_SIZE_MAX) { error_msg("Packed Bit offset value(%d) must be between 0 and %u\n", soffset_value, @@ -628,7 +628,7 @@ parse_mask_list(const char *h_list) error_msg("Bad mask list(%s)\n", h_list); return FAIL; } - slength_value = HDatoi(ptr); + slength_value = atoi(ptr); if (slength_value <= 0) { error_msg("Packed Bit length value(%d) must be positive.\n", slength_value); return FAIL; @@ -778,7 +778,7 @@ parse_start: dump_opts.display_fi = TRUE; last_was_dset = FALSE; if (H5_optarg != NULL) - h5trav_set_verbose(HDatoi(H5_optarg)); + h5trav_set_verbose(atoi(H5_optarg)); break; case 'p': dump_opts.display_dcpl = TRUE; @@ -796,7 +796,7 @@ parse_start: break; case 'A': if (H5_optarg != NULL) { - if (0 == HDatoi(H5_optarg)) + if (0 == atoi(H5_optarg)) dump_opts.include_attrs = FALSE; } else { @@ -820,7 +820,7 @@ parse_start: goto done; break; case 'w': { - int sh5tools_nCols = HDatoi(H5_optarg); + int sh5tools_nCols = atoi(H5_optarg); if (sh5tools_nCols <= 0) h5tools_nCols = 65535; @@ -1006,7 +1006,7 @@ parse_start: dump_opts.display_vds_first = TRUE; break; case 'G': - dump_opts.vds_gap_size = HDatoi(H5_optarg); + dump_opts.vds_gap_size = atoi(H5_optarg); if (dump_opts.vds_gap_size < 0) { usage(h5tools_getprogname()); goto error; @@ -1139,7 +1139,7 @@ end_collect: case 'E': if (H5_optarg != NULL) - enable_error_stack = HDatoi(H5_optarg); + enable_error_stack = atoi(H5_optarg); else enable_error_stack = 1; break; @@ -1193,7 +1193,7 @@ end_collect: case '1': vol_info_g.type = VOL_BY_VALUE; - vol_info_g.u.value = (H5VL_class_value_t)HDatoi(H5_optarg); + vol_info_g.u.value = (H5VL_class_value_t)atoi(H5_optarg); use_custom_vol_g = TRUE; break; @@ -1209,7 +1209,7 @@ end_collect: case '4': vfd_info_g.type = VFD_BY_VALUE; - vfd_info_g.u.value = (H5FD_class_value_t)HDatoi(H5_optarg); + vfd_info_g.u.value = (H5FD_class_value_t)atoi(H5_optarg); use_custom_vfd_g = TRUE; break; diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 219abfd..8a08dac 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -2754,7 +2754,7 @@ main(int argc, char *argv[]) } else if (!HDstrncmp(argv[argno], "--vol-value=", (size_t)12)) { vol_info.type = VOL_BY_VALUE; - vol_info.u.value = (H5VL_class_value_t)HDatoi(argv[argno] + 12); + vol_info.u.value = (H5VL_class_value_t)atoi(argv[argno] + 12); custom_vol_fapl = TRUE; } else if (!HDstrncmp(argv[argno], "--vol-name=", (size_t)11)) { @@ -2772,7 +2772,7 @@ main(int argc, char *argv[]) } else if (!HDstrncmp(argv[argno], "--vfd-value=", (size_t)12)) { vfd_info.type = VFD_BY_VALUE; - vfd_info.u.value = (H5FD_class_value_t)HDatoi(argv[argno] + 12); + vfd_info.u.value = (H5FD_class_value_t)atoi(argv[argno] + 12); custom_vfd_fapl = TRUE; } else if (!HDstrncmp(argv[argno], "--vfd-name=", (size_t)11)) { diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c index 3be19f8..c08b0d1 100644 --- a/tools/src/h5perf/pio_perf.c +++ b/tools/src/h5perf/pio_perf.c @@ -1396,13 +1396,13 @@ parse_command_line(int argc, const char *const *argv) cl_opts->num_bpp = parse_size_directive(H5_optarg); break; case 'F': - cl_opts->num_files = HDatoi(H5_optarg); + cl_opts->num_files = atoi(H5_optarg); break; case 'g': cl_opts->dim2d = 1; break; case 'i': - cl_opts->num_iters = HDatoi(H5_optarg); + cl_opts->num_iters = atoi(H5_optarg); break; case 'I': cl_opts->interleaved = 1; @@ -1411,10 +1411,10 @@ parse_command_line(int argc, const char *const *argv) cl_opts->output_file = H5_optarg; break; case 'p': - cl_opts->min_num_procs = HDatoi(H5_optarg); + cl_opts->min_num_procs = atoi(H5_optarg); break; case 'P': - cl_opts->max_num_procs = HDatoi(H5_optarg); + cl_opts->max_num_procs = atoi(H5_optarg); break; case 'T': cl_opts->h5_threshold = parse_size_directive(H5_optarg); diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index a991e19..2268237 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -1003,7 +1003,7 @@ parse_command_line(int argc, const char *const *argv) break; case 'i': - cl_opts->num_iters = HDatoi(H5_optarg); + cl_opts->num_iters = atoi(H5_optarg); break; case 'o': cl_opts->output_file = H5_optarg; diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index a164d6a..fc64c98 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -570,7 +570,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) case 'v': if (H5_optarg != NULL) { - if (2 == HDatoi(H5_optarg)) + if (2 == atoi(H5_optarg)) options->verbose = 2; } else @@ -625,7 +625,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) break; case 'j': - bound = HDatoi(H5_optarg); + bound = atoi(H5_optarg); if (bound < H5F_LIBVER_EARLIEST || bound > H5F_LIBVER_LATEST) { error_msg("in parsing low bound\n"); h5tools_setstatus(EXIT_FAILURE); @@ -636,7 +636,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) break; case 'k': - bound = HDatoi(H5_optarg); + bound = atoi(H5_optarg); if (bound < H5F_LIBVER_EARLIEST || bound > H5F_LIBVER_LATEST) { error_msg("in parsing high bound\n"); h5tools_setstatus(EXIT_FAILURE); @@ -655,13 +655,13 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) break; case 'c': - options->grp_compact = HDatoi(H5_optarg); + options->grp_compact = atoi(H5_optarg); if (options->grp_compact > 0) options->latest = TRUE; /* must use latest format */ break; case 'd': - options->grp_indexed = HDatoi(H5_optarg); + options->grp_indexed = atoi(H5_optarg); if (options->grp_indexed > 0) options->latest = TRUE; /* must use latest format */ break; @@ -672,7 +672,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) char *msgPtr = HDstrchr(H5_optarg, ':'); options->latest = TRUE; /* must use latest format */ if (msgPtr == NULL) { - ssize = HDatoi(H5_optarg); + ssize = atoi(H5_optarg); for (idx = 0; idx < 5; idx++) options->msg_size[idx] = ssize; } @@ -681,7 +681,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) HDstrcpy(msgType, msgPtr + 1); msgPtr[0] = '\0'; - ssize = HDatoi(H5_optarg); + ssize = atoi(H5_optarg); if (!HDstrncmp(msgType, "dspace", 6)) options->msg_size[0] = ssize; else if (!HDstrncmp(msgType, "dtype", 5)) @@ -700,15 +700,15 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) break; case 'b': - options->ublock_size = (hsize_t)HDatol(H5_optarg); + options->ublock_size = (hsize_t)atol(H5_optarg); break; case 'M': - options->meta_block_size = (hsize_t)HDatol(H5_optarg); + options->meta_block_size = (hsize_t)atol(H5_optarg); break; case 't': - options->threshold = (hsize_t)HDatol(H5_optarg); + options->threshold = (hsize_t)atol(H5_optarg); break; case 'a': @@ -745,14 +745,14 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) } break; case 'P': - options->fs_persist = HDatoi(H5_optarg); + options->fs_persist = atoi(H5_optarg); if (options->fs_persist == 0) /* To distinguish the "specified" zero value */ options->fs_persist = -1; break; case 'T': - options->fs_threshold = HDatol(H5_optarg); + options->fs_threshold = atol(H5_optarg); if (options->fs_threshold == 0) /* To distinguish the "specified" zero value */ options->fs_threshold = -1; @@ -785,14 +785,14 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) case 'E': if (H5_optarg != NULL) - enable_error_stack = HDatoi(H5_optarg); + enable_error_stack = atoi(H5_optarg); else enable_error_stack = 1; break; case '1': in_vol_info.type = VOL_BY_VALUE; - in_vol_info.u.value = (H5VL_class_value_t)HDatoi(H5_optarg); + in_vol_info.u.value = (H5VL_class_value_t)atoi(H5_optarg); custom_in_vol = TRUE; break; @@ -808,7 +808,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) case '4': out_vol_info.type = VOL_BY_VALUE; - out_vol_info.u.value = (H5VL_class_value_t)HDatoi(H5_optarg); + out_vol_info.u.value = (H5VL_class_value_t)atoi(H5_optarg); custom_out_vol = TRUE; break; @@ -824,7 +824,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) case '7': in_vfd_info.type = VFD_BY_VALUE; - in_vfd_info.u.value = (H5FD_class_value_t)HDatoi(H5_optarg); + in_vfd_info.u.value = (H5FD_class_value_t)atoi(H5_optarg); custom_in_vfd = TRUE; break; @@ -840,7 +840,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) case '0': out_vfd_info.type = VFD_BY_VALUE; - out_vfd_info.u.value = (H5FD_class_value_t)HDatoi(H5_optarg); + out_vfd_info.u.value = (H5FD_class_value_t)atoi(H5_optarg); custom_out_vfd = TRUE; break; diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c index d4fa990..aa0e549 100644 --- a/tools/src/h5repack/h5repack_parse.c +++ b/tools/src/h5repack/h5repack_parse.c @@ -224,7 +224,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t if (str[u] == ',') { stype[q] = '\0'; /* end digit */ if (l == -1) { - filt->filtn = HDatoi(stype); + filt->filtn = atoi(stype); l = 0; } else if (f == -1) { diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index 23bde1a..fc93dfb 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -841,7 +841,7 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re case 'E': if (H5_optarg != NULL) - enable_error_stack = HDatoi(H5_optarg); + enable_error_stack = atoi(H5_optarg); else enable_error_stack = 1; break; @@ -868,7 +868,7 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re case 'l': if (H5_optarg) { - sgroups_threshold = HDatoi(H5_optarg); + sgroups_threshold = atoi(H5_optarg); if (sgroups_threshold < 1) { error_msg("Invalid threshold for small groups\n"); goto error; @@ -891,7 +891,7 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re case 'm': if (H5_optarg) { - sdsets_threshold = HDatoi(H5_optarg); + sdsets_threshold = atoi(H5_optarg); if (sdsets_threshold < 1) { error_msg("Invalid threshold for small datasets\n"); goto error; @@ -914,7 +914,7 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re case 'a': if (H5_optarg) { - sattrs_threshold = HDatoi(H5_optarg); + sattrs_threshold = atoi(H5_optarg); if (sattrs_threshold < 1) { error_msg("Invalid threshold for small # of attributes\n"); goto error; diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c index 4a6029c..6364101 100644 --- a/tools/src/misc/h5clear.c +++ b/tools/src/misc/h5clear.c @@ -144,11 +144,11 @@ parse_command_line(int argc, const char *const *argv) case 'i': increment_eoa_eof = TRUE; if (H5_optarg != NULL) { - if (HDatoi(H5_optarg) < 0) { + if (atoi(H5_optarg) < 0) { usage(h5tools_getprogname()); goto done; } - increment = (hsize_t)HDatoi(H5_optarg); + increment = (hsize_t)atoi(H5_optarg); } break; diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index a359db6..34247e0 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -189,7 +189,7 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options) case '1': vol_info.type = VOL_BY_VALUE; - vol_info.u.value = (H5VL_class_value_t)HDatoi(H5_optarg); + vol_info.u.value = (H5VL_class_value_t)atoi(H5_optarg); custom_vol = TRUE; break; @@ -205,7 +205,7 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options) case '4': vfd_info.type = VFD_BY_VALUE; - vfd_info.u.value = (H5FD_class_value_t)HDatoi(H5_optarg); + vfd_info.u.value = (H5FD_class_value_t)atoi(H5_optarg); custom_vfd = TRUE; break; |