diff options
Diffstat (limited to 'tools/src/misc/h5mkgrp.c')
-rw-r--r-- | tools/src/misc/h5mkgrp.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index fc7d5b6..36e6c15 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -58,18 +58,18 @@ leave(int ret) size_t curr_group; if (params_g.fname) - HDfree(params_g.fname); + free(params_g.fname); if (params_g.ngroups) { for (curr_group = 0; curr_group < params_g.ngroups; curr_group++) - HDfree(params_g.groups[curr_group]); - HDfree(params_g.groups); + free(params_g.groups[curr_group]); + free(params_g.groups); } if (H5I_INVALID_HID != params_g.fapl_id && H5P_DEFAULT != params_g.fapl_id) if (H5Pclose(params_g.fapl_id) < 0) error_msg("Could not close file access property list\n"); h5tools_close(); - HDexit(ret); + exit(ret); } /* end leave() */ /*------------------------------------------------------------------------- @@ -147,8 +147,8 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options) } /* Initialize fapl info structs */ - HDmemset(&vol_info, 0, sizeof(h5tools_vol_info_t)); - HDmemset(&vfd_info, 0, sizeof(h5tools_vfd_info_t)); + memset(&vol_info, 0, sizeof(h5tools_vol_info_t)); + memset(&vfd_info, 0, sizeof(h5tools_vfd_info_t)); /* Parse command line options */ while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) { @@ -182,7 +182,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; @@ -198,7 +198,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; @@ -239,7 +239,7 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options) /* Allocate space for the group name pointers */ options->ngroups = (size_t)(argc - H5_optind); - options->groups = (char **)HDmalloc(options->ngroups * sizeof(char *)); + options->groups = (char **)malloc(options->ngroups * sizeof(char *)); /* Retrieve the group names */ curr_group = 0; @@ -293,7 +293,7 @@ main(int argc, char *argv[]) h5tools_init(); /* Initialize the parameters */ - HDmemset(¶ms_g, 0, sizeof(params_g)); + memset(¶ms_g, 0, sizeof(params_g)); /* Create file access property list */ if ((params_g.fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { @@ -320,7 +320,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (params_g.verbose) - HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname()); + printf("%s: Creating groups with latest version of the format\n", h5tools_getprogname()); } /* Attempt to open an existing HDF5 file first */ @@ -354,7 +354,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (params_g.verbose) - HDprintf("%s: Creating parent groups\n", h5tools_getprogname()); + printf("%s: Creating parent groups\n", h5tools_getprogname()); } /* Loop over creating requested groups */ @@ -375,7 +375,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (params_g.verbose) - HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]); + printf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]); } /* end for */ /* Close link creation property list */ |