From 718ed0929afc47d6555969b6a2a27a715344dfa8 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 28 Jun 2023 16:20:01 -0700 Subject: [PATCH] Rename HDato*() to ato*() --- src/H5FDsubfiling/H5FDioc_threads.c | 2 +- src/H5FDsubfiling/H5FDsubfiling.c | 2 +- src/H5private.h | 12 ---------- test/mirror_vfd.c | 2 +- test/swmr_addrem_writer.c | 6 ++--- test/swmr_generator.c | 4 ++-- test/swmr_reader.c | 10 ++++---- test/swmr_remove_reader.c | 10 ++++---- test/swmr_remove_writer.c | 6 ++--- test/swmr_sparse_reader.c | 6 ++--- test/swmr_sparse_writer.c | 4 ++-- test/swmr_start_write.c | 8 +++---- test/swmr_writer.c | 6 ++--- test/testframe.c | 2 +- test/twriteorder.c | 6 ++--- test/use_common.c | 4 ++-- test/use_disable_mdc_flushes.c | 8 +++---- test/vds_swmr_writer.c | 2 +- testpar/t_subfiling_vfd.c | 2 +- tools/src/h5copy/h5copy.c | 2 +- tools/src/h5diff/h5diff_common.c | 20 ++++++++-------- tools/src/h5dump/h5dump.c | 18 +++++++------- tools/src/h5ls/h5ls.c | 4 ++-- tools/src/h5perf/pio_perf.c | 8 +++---- tools/src/h5perf/sio_perf.c | 2 +- tools/src/h5repack/h5repack_main.c | 34 +++++++++++++-------------- tools/src/h5repack/h5repack_parse.c | 2 +- tools/src/h5stat/h5stat.c | 8 +++---- tools/src/misc/h5clear.c | 4 ++-- tools/src/misc/h5mkgrp.c | 4 ++-- utils/mirror_vfd/mirror_server.c | 4 ++-- utils/mirror_vfd/mirror_server_stop.c | 2 +- utils/tools/h5dwalk/h5dwalk.c | 2 +- 33 files changed, 102 insertions(+), 114 deletions(-) diff --git a/src/H5FDsubfiling/H5FDioc_threads.c b/src/H5FDsubfiling/H5FDioc_threads.c index e0d351ff814..fad5cf60095 100644 --- a/src/H5FDsubfiling/H5FDioc_threads.c +++ b/src/H5FDsubfiling/H5FDioc_threads.c @@ -171,7 +171,7 @@ initialize_ioc_threads(void *_sf_context) /* Allow experimentation with the number of helper threads */ if ((env_value = HDgetenv(H5FD_IOC_THREAD_POOL_SIZE)) != NULL) { - int value_check = HDatoi(env_value); + int value_check = atoi(env_value); if (value_check > 0) { thread_pool_size = (unsigned int)value_check; } diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c index 20d617d04d1..e234dc92286 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.c +++ b/src/H5FDsubfiling/H5FDsubfiling.c @@ -599,7 +599,7 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi config_out->shared_cfg.stripe_count = H5FD_SUBFILING_DEFAULT_STRIPE_COUNT; if ((h5_require_ioc = HDgetenv("H5_REQUIRE_IOC")) != NULL) { - int value_check = HDatoi(h5_require_ioc); + int value_check = atoi(h5_require_ioc); if (value_check == 0) config_out->require_ioc = FALSE; } diff --git a/src/H5private.h b/src/H5private.h index 676fb22e1f5..d71d19810b6 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -626,18 +626,6 @@ typedef off_t h5_stat_size_t; #ifndef HDatexit #define HDatexit(F) atexit(F) #endif -#ifndef HDatof -#define HDatof(S) atof(S) -#endif -#ifndef HDatoi -#define HDatoi(S) atoi(S) -#endif -#ifndef HDatol -#define HDatol(S) atol(S) -#endif -#ifndef HDatoll -#define HDatoll(S) atoll(S) -#endif #ifndef HDceil #define HDceil(X) ceil(X) #endif diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index 46b6de6def7..0ae40182679 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -2302,7 +2302,7 @@ parse_args(int argc, char **argv, struct mt_opts *opts) if (!HDstrncmp(argv[i], "--ip=", 5)) HDstrncpy(opts->ip, argv[i] + 5, H5FD_MIRROR_MAX_IP_LEN); else if (!HDstrncmp(argv[i], "--port=", 7)) - opts->portno = HDatoi(argv[i] + 7); + opts->portno = atoi(argv[i] + 7); else { printf("Unrecognized option: '%s'\n", argv[i]); return -1; diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c index 2a41dc4225f..0d9bde4aefd 100644 --- a/test/swmr_addrem_writer.c +++ b/test/swmr_addrem_writer.c @@ -303,7 +303,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of records to write between flushing file */ case 'f': - flush_count = HDatol(argv[u + 1]); + flush_count = atol(argv[u + 1]); if (flush_count < 0) usage(); u += 2; @@ -318,7 +318,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -333,7 +333,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nops = HDatol(argv[u]); + nops = atol(argv[u]); if (nops <= 0) usage(); diff --git a/test/swmr_generator.c b/test/swmr_generator.c index 9b8a689837c..a938f8d4c39 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -276,7 +276,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* Compress dataset chunks */ case 'c': - comp_level = HDatoi(argv[u + 1]); + comp_level = atoi(argv[u + 1]); if (comp_level < -1 || comp_level > 9) usage(); u += 2; @@ -293,7 +293,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else diff --git a/test/swmr_reader.c b/test/swmr_reader.c index af4a6ae9280..5b0cacff16b 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -409,7 +409,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of common symbols to poll */ case 'h': - ncommon = HDatoi(argv[u + 1]); + ncommon = atoi(argv[u + 1]); if (ncommon < 0) usage(); u += 2; @@ -417,7 +417,7 @@ main(int argc, char *argv[]) /* # of random symbols to poll */ case 'l': - nrandom = HDatoi(argv[u + 1]); + nrandom = atoi(argv[u + 1]); if (nrandom < 0) usage(); u += 2; @@ -432,7 +432,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -442,7 +442,7 @@ main(int argc, char *argv[]) /* # of seconds between polling */ case 's': - poll_time = HDatoi(argv[u + 1]); + poll_time = atoi(argv[u + 1]); if (poll_time < 0) usage(); u += 2; @@ -455,7 +455,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nseconds = HDatol(argv[u]); + nseconds = atol(argv[u]); if (nseconds <= 0) usage(); diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c index 4418d0a06ab..09c462ded7c 100644 --- a/test/swmr_remove_reader.c +++ b/test/swmr_remove_reader.c @@ -392,7 +392,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of common symbols to poll */ case 'h': - ncommon = HDatoi(argv[u + 1]); + ncommon = atoi(argv[u + 1]); if (ncommon < 0) usage(); u += 2; @@ -400,7 +400,7 @@ main(int argc, char *argv[]) /* # of random symbols to poll */ case 'l': - nrandom = HDatoi(argv[u + 1]); + nrandom = atoi(argv[u + 1]); if (nrandom < 0) usage(); u += 2; @@ -415,7 +415,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -425,7 +425,7 @@ main(int argc, char *argv[]) /* # of seconds between polling */ case 's': - poll_time = HDatoi(argv[u + 1]); + poll_time = atoi(argv[u + 1]); if (poll_time < 0) usage(); u += 2; @@ -438,7 +438,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nseconds = HDatol(argv[u]); + nseconds = atol(argv[u]); if (nseconds <= 0) usage(); diff --git a/test/swmr_remove_writer.c b/test/swmr_remove_writer.c index 3e989f8e3e5..0cdb1ac201a 100644 --- a/test/swmr_remove_writer.c +++ b/test/swmr_remove_writer.c @@ -238,7 +238,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of records to write between flushing file */ case 'f': - flush_count = HDatol(argv[u + 1]); + flush_count = atol(argv[u + 1]); if (flush_count < 0) usage(); u += 2; @@ -253,7 +253,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); random_seed = (unsigned)temp; u += 2; break; @@ -271,7 +271,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nshrinks = HDatol(argv[u]); + nshrinks = atol(argv[u]); if (nshrinks <= 0) usage(); diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c index b26ee4a5ad6..e79961b7ed4 100644 --- a/test/swmr_sparse_reader.c +++ b/test/swmr_sparse_reader.c @@ -358,7 +358,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of reads between reopens */ case 'n': - reopen_count = HDatoi(argv[u + 1]); + reopen_count = atoi(argv[u + 1]); if (reopen_count < 0) usage(); u += 2; @@ -372,7 +372,7 @@ main(int argc, char *argv[]) /* # of seconds between polling */ case 's': - poll_time = HDatoi(argv[u + 1]); + poll_time = atoi(argv[u + 1]); if (poll_time < 0) usage(); u += 2; @@ -385,7 +385,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to read */ - nrecords = HDatol(argv[u]); + nrecords = atol(argv[u]); if (nrecords <= 0) usage(); diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c index b3c471d649c..6ea02a17442 100644 --- a/test/swmr_sparse_writer.c +++ b/test/swmr_sparse_writer.c @@ -335,7 +335,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of records to write between flushing file */ case 'f': - flush_count = HDatol(argv[u + 1]); + flush_count = atol(argv[u + 1]); if (flush_count < 0) usage(); u += 2; @@ -354,7 +354,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nrecords = HDatol(argv[u]); + nrecords = atol(argv[u]); if (nrecords <= 0) usage(); diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index 156821495a9..f2163605ce8 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -375,7 +375,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* Compress dataset chunks */ case 'c': - comp_level = HDatoi(argv[u + 1]); + comp_level = atoi(argv[u + 1]); if (comp_level < -1 || comp_level > 9) usage(); u += 2; @@ -391,7 +391,7 @@ main(int argc, char *argv[]) /* # of records to write between flushing file */ case 'f': - flush_count = HDatol(argv[u + 1]); + flush_count = atol(argv[u + 1]); if (flush_count < 0) usage(); u += 2; @@ -406,7 +406,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -421,7 +421,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nrecords = HDatol(argv[u]); + nrecords = atol(argv[u]); if (nrecords <= 0) usage(); diff --git a/test/swmr_writer.c b/test/swmr_writer.c index fa24880f321..609a6655ded 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -297,7 +297,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of records to write between flushing file */ case 'f': - flush_count = HDatol(argv[u + 1]); + flush_count = atol(argv[u + 1]); if (flush_count < 0) usage(); u += 2; @@ -312,7 +312,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); random_seed = (unsigned)temp; u += 2; break; @@ -330,7 +330,7 @@ main(int argc, char *argv[]) } /* end if */ else { /* Get the number of records to append */ - nrecords = HDatol(argv[u]); + nrecords = atol(argv[u]); if (nrecords <= 0) usage(); diff --git a/test/testframe.c b/test/testframe.c index cd2947b1d1e..a99bdef5718 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -530,7 +530,7 @@ ParseTestVerbosity(char *argv) else if (*argv == 'h') SetTestVerbosity(VERBO_HI); else - SetTestVerbosity(HDatoi(argv)); + SetTestVerbosity(atoi(argv)); } /* diff --git a/test/twriteorder.c b/test/twriteorder.c index 5f47a953d0d..9026bd16dc7 100644 --- a/test/twriteorder.c +++ b/test/twriteorder.c @@ -139,21 +139,21 @@ parse_option(int argc, char *const argv[]) HDexit(EXIT_SUCCESS); break; case 'b': /* number of planes to write/read */ - if ((blocksize_g = HDatoi(optarg)) <= 0) { + if ((blocksize_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad blocksize %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case 'n': /* number of planes to write/read */ - if ((nlinkedblock_g = HDatoi(optarg)) < 2) { + if ((nlinkedblock_g = atoi(optarg)) < 2) { fprintf(stderr, "bad number of linked blocks %s, must be greater than 1.\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case 'p': /* number of planes to write/read */ - if ((part_size_g = HDatoi(optarg)) <= 0) { + if ((part_size_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad partition size %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); diff --git a/test/use_common.c b/test/use_common.c index fde73e8cdd0..7c0a1546717 100644 --- a/test/use_common.c +++ b/test/use_common.c @@ -72,7 +72,7 @@ parse_option(int argc, char *const argv[], options_t *opts) opts->filename = HDstrdup(optarg); break; case 'i': /* iterations */ - if ((opts->iterations = HDatoi(optarg)) <= 0) { + if ((opts->iterations = atoi(optarg)) <= 0) { fprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg); usage(opts->progname); Hgoto_error(-1); @@ -101,7 +101,7 @@ parse_option(int argc, char *const argv[], options_t *opts) } break; case 's': /* use swmr file open mode */ - use_swmr = HDatoi(optarg); + use_swmr = atoi(optarg); if (use_swmr != 0 && use_swmr != 1) { fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); usage(opts->progname); diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index f2a4e0f113e..16930e474d7 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -108,21 +108,21 @@ parse_option(int argc, char *const argv[]) filename_g = optarg; break; case 'n': /* number of planes to write/read */ - if ((nplanes_g = (hsize_t)HDatoi(optarg)) <= 0) { + if ((nplanes_g = (hsize_t)atoi(optarg)) <= 0) { fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case 's': /* use swmr file open mode */ - if ((use_swmr_g = HDatoi(optarg)) < 0) { + if ((use_swmr_g = atoi(optarg)) < 0) { fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); usage(progname_g); Hgoto_error(-1); }; break; case 'y': /* Number of planes per chunk */ - if ((chunkplanes_g = HDatoi(optarg)) <= 0) { + if ((chunkplanes_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", optarg); usage(progname_g); @@ -130,7 +130,7 @@ parse_option(int argc, char *const argv[]) }; break; case 'z': /* size of chunk=(z,z) */ - if ((chunksize_g = HDatoi(optarg)) <= 0) { + if ((chunksize_g = atoi(optarg)) <= 0) { fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); diff --git a/test/vds_swmr_writer.c b/test/vds_swmr_writer.c index 46cd668f9da..d5fa74b2f6e 100644 --- a/test/vds_swmr_writer.c +++ b/test/vds_swmr_writer.c @@ -47,7 +47,7 @@ main(int argc, char *argv[]) return EXIT_FAILURE; } - file_number = HDatoi(argv[1]); + file_number = atoi(argv[1]); if (file_number < 0 || file_number >= N_SOURCES) TEST_ERROR; diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index f8043b1b1a3..95d1f96892e 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2093,7 +2093,7 @@ parse_subfiling_env_vars(void) } if (NULL != (env_value = HDgetenv(H5FD_IOC_THREAD_POOL_SIZE))) { - ioc_thread_pool_size_g = HDatoi(env_value); + ioc_thread_pool_size_g = atoi(env_value); if (ioc_thread_pool_size_g <= 0) ioc_thread_pool_size_g = -1; } diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index deae9a9dda2..fe0c0318953 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 c15603d2700..f941d002642 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 3b17a34a761..80aa7becf6a 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_command_line(int argc, const char *const *argv) 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_command_line(int argc, const char *const *argv) 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_command_line(int argc, const char *const *argv) 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_command_line(int argc, const char *const *argv) 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 @@ parse_command_line(int argc, const char *const *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; @@ -1193,7 +1193,7 @@ parse_command_line(int argc, const char *const *argv) 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 @@ parse_command_line(int argc, const char *const *argv) 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 219abfd7c50..8a08dac8a8e 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 3be19f8a970..c08b0d1af12 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 a991e19ae4e..22682374aac 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 a164d6a6dcc..fc64c98bb8a 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 d4fa990e9fc..aa0e549935e 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 23bde1a9b62..fc93dfb200b 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 4a6029cc33e..63641019df8 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 a359db6b813..34247e0151b 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; diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c index 5278e7cd4d1..681f724f436 100644 --- a/utils/mirror_vfd/mirror_server.c +++ b/utils/mirror_vfd/mirror_server.c @@ -194,11 +194,11 @@ parse_args(int argc, char **argv, struct op_args *args_out) } /* end if help */ else if (!HDstrncmp(argv[i], "--port=", 7)) { mirror_log(NULL, V_INFO, "parsing 'main_port' (%s)", argv[i] + 7); - args_out->main_port = HDatoi(argv[i] + 7); + args_out->main_port = atoi(argv[i] + 7); } /* end if port */ else if (!HDstrncmp(argv[i], "--verbosity=", 12)) { mirror_log(NULL, V_INFO, "parsing 'verbosity' (%s)", argv[i] + 12); - args_out->verbosity = (unsigned int)HDatoi(argv[i] + 12); + args_out->verbosity = (unsigned int)atoi(argv[i] + 12); } /* end if verbosity */ else if (!HDstrncmp(argv[i], "--logpath=", 10)) { mirror_log(NULL, V_INFO, "parsing 'logpath' (%s)", argv[i] + 10); diff --git a/utils/mirror_vfd/mirror_server_stop.c b/utils/mirror_vfd/mirror_server_stop.c index 1546d7075ab..7830f92503b 100644 --- a/utils/mirror_vfd/mirror_server_stop.c +++ b/utils/mirror_vfd/mirror_server_stop.c @@ -99,7 +99,7 @@ parse_args(int argc, char **argv, struct mshs_opts *opts) HDstrncpy(opts->ip, argv[i] + 5, MSHS_IP_STR_SIZE); } else if (!HDstrncmp(argv[i], "--port=", 7)) { - opts->portno = HDatoi(argv[i] + 7); + opts->portno = atoi(argv[i] + 7); } else { printf("Unrecognized option: '%s'\n", argv[i]); diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c index 5f0cf79e644..74b2e2e826d 100644 --- a/utils/tools/h5dwalk/h5dwalk.c +++ b/utils/tools/h5dwalk/h5dwalk.c @@ -1352,7 +1352,7 @@ main(int argc, char *argv[]) #if 0 env_var = HDgetenv("HDF5_H5DWALK_PRINT_CMDLINE"); if (env_var) { - int enable = HDatoi(env_var); + int enable = atoi(env_var); if (enable) { }