diff options
Diffstat (limited to 'tools/src/h5dump/h5dump.c')
| -rw-r--r-- | tools/src/h5dump/h5dump.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index e11999d..a1a6de0 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -515,15 +515,15 @@ set_binary_form(const char *form) { int bform = -1; - if (HDstrcmp(form, "NATIVE") == 0 || HDstrcmp(form, "MEMORY") == 0) { + if (strcmp(form, "NATIVE") == 0 || strcmp(form, "MEMORY") == 0) { /* native form */ bform = 0; } - else if (HDstrcmp(form, "FILE") == 0) /* file type form */ + else if (strcmp(form, "FILE") == 0) /* file type form */ bform = 1; - else if (HDstrcmp(form, "LE") == 0) /* convert to little endian */ + else if (strcmp(form, "LE") == 0) /* convert to little endian */ bform = 2; - else if (HDstrcmp(form, "BE") == 0) /* convert to big endian */ + else if (strcmp(form, "BE") == 0) /* convert to big endian */ bform = 3; return bform; @@ -544,9 +544,9 @@ set_sort_by(const char *form) { H5_index_t idx_type = H5_INDEX_UNKNOWN; - if (HDstrcmp(form, "name") == 0) /* H5_INDEX_NAME */ + if (strcmp(form, "name") == 0) /* H5_INDEX_NAME */ idx_type = H5_INDEX_NAME; - else if (HDstrcmp(form, "creation_order") == 0) /* H5_INDEX_CRT_ORDER */ + else if (strcmp(form, "creation_order") == 0) /* H5_INDEX_CRT_ORDER */ idx_type = H5_INDEX_CRT_ORDER; return idx_type; @@ -567,9 +567,9 @@ set_sort_order(const char *form) { H5_iter_order_t iter_order = H5_ITER_UNKNOWN; - if (HDstrcmp(form, "ascending") == 0) /* H5_ITER_INC */ + if (strcmp(form, "ascending") == 0) /* H5_ITER_INC */ iter_order = H5_ITER_INC; - else if (HDstrcmp(form, "descending") == 0) /* H5_ITER_DEC */ + else if (strcmp(form, "descending") == 0) /* H5_ITER_DEC */ iter_order = H5_ITER_DEC; return iter_order; @@ -837,7 +837,7 @@ parse_start: for (i = 0; i < argc; i++) if (!hand[i].func) { hand[i].func = handle_paths; - hand[i].obj = HDstrdup(H5_optarg); + hand[i].obj = strdup(H5_optarg); break; } @@ -849,7 +849,7 @@ parse_start: for (i = 0; i < argc; i++) if (!hand[i].func) { hand[i].func = handle_attributes; - hand[i].obj = HDstrdup(H5_optarg); + hand[i].obj = strdup(H5_optarg); break; } @@ -861,7 +861,7 @@ parse_start: for (i = 0; i < argc; i++) if (!hand[i].func) { hand[i].func = handle_datasets; - hand[i].obj = HDstrdup(H5_optarg); + hand[i].obj = strdup(H5_optarg); if (!dump_opts.disable_compact_subset) hand[i].subset_info = parse_subset_params(hand[i].obj); last_dset = &hand[i]; @@ -876,12 +876,12 @@ parse_start: use_custom_vfd_g = true; #ifdef H5_HAVE_ROS3_VFD - if (0 == HDstrcmp(vfd_info_g.u.name, drivernames[ROS3_VFD_IDX])) + if (0 == strcmp(vfd_info_g.u.name, drivernames[ROS3_VFD_IDX])) if (!vfd_info_g.info) vfd_info_g.info = &ros3_fa_g; #endif #ifdef H5_HAVE_LIBHDFS - if (0 == HDstrcmp(vfd_info_g.u.name, drivernames[HDFS_VFD_IDX])) + if (0 == strcmp(vfd_info_g.u.name, drivernames[HDFS_VFD_IDX])) if (!vfd_info_g.info) vfd_info_g.info = &hdfs_fa_g; #endif @@ -893,7 +893,7 @@ parse_start: for (i = 0; i < argc; i++) if (!hand[i].func) { hand[i].func = handle_groups; - hand[i].obj = HDstrdup(H5_optarg); + hand[i].obj = strdup(H5_optarg); break; } @@ -905,7 +905,7 @@ parse_start: for (i = 0; i < argc; i++) if (!hand[i].func) { hand[i].func = handle_links; - hand[i].obj = HDstrdup(H5_optarg); + hand[i].obj = strdup(H5_optarg); break; } @@ -917,7 +917,7 @@ parse_start: for (i = 0; i < argc; i++) if (!hand[i].func) { hand[i].func = handle_datatypes; - hand[i].obj = HDstrdup(H5_optarg); + hand[i].obj = strdup(H5_optarg); break; } @@ -1053,7 +1053,7 @@ parse_start: usage(h5tools_getprogname()); goto error; } - if (HDstrcmp(H5_optarg, ":") == 0) + if (strcmp(H5_optarg, ":") == 0) xmlnsprefix = ""; else xmlnsprefix = H5_optarg; @@ -1234,10 +1234,10 @@ end_collect: } /* If the file uses the onion VFD, get the revision number */ - if (vfd_info_g.u.name && !HDstrcmp(vfd_info_g.u.name, "onion")) { + if (vfd_info_g.u.name && !strcmp(vfd_info_g.u.name, "onion")) { if (vfd_info_g.info) { - if (!HDstrcmp(vfd_info_g.info, "revision_count")) + if (!strcmp(vfd_info_g.info, "revision_count")) get_onion_revision_count = true; else { errno = 0; @@ -1373,7 +1373,7 @@ main(int argc, char *argv[]) } while (H5_optind < argc) { - fname = HDstrdup(argv[H5_optind++]); + fname = strdup(argv[H5_optind++]); /* A short cut to get the revision count of an onion file without opening the file */ if (get_onion_revision_count && H5FD_ONION == H5Pget_driver(fapl_id)) { @@ -1406,7 +1406,7 @@ main(int argc, char *argv[]) if (doxml_g) { /* initialize XML */ /* reset prefix! */ - HDstrcpy(prefix, ""); + strcpy(prefix, ""); /* make sure the URI is initialized to something */ if (xml_dtd_uri_g == NULL) { @@ -1419,7 +1419,7 @@ main(int argc, char *argv[]) } } else { - if (useschema_g && HDstrcmp(xmlnsprefix, "") != 0) { + if (useschema_g && strcmp(xmlnsprefix, "") != 0) { error_msg( "Cannot set Schema URL for a qualified namespace--use -X or -U option with -D \n"); h5tools_setstatus(EXIT_FAILURE); @@ -1462,7 +1462,7 @@ main(int argc, char *argv[]) /* alternative first element, depending on schema or DTD. */ if (useschema_g) { - if (HDstrcmp(xmlnsprefix, "") == 0) { + if (strcmp(xmlnsprefix, "") == 0) { PRINTSTREAM(rawoutstream, "<HDF5-File xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " "xsi:noNamespaceSchemaLocation=\"%s\">\n", @@ -1473,8 +1473,8 @@ main(int argc, char *argv[]) char *ns; char *indx; - ns = HDstrdup(xmlnsprefix); - indx = HDstrrchr(ns, (int)':'); + ns = strdup(xmlnsprefix); + indx = strrchr(ns, (int)':'); if (indx) *indx = '\0'; @@ -1633,7 +1633,7 @@ init_prefix(char **prfx, size_t prfx_len) void add_prefix(char **prfx, size_t *prfx_len, const char *name) { - size_t new_len = HDstrlen(*prfx) + HDstrlen(name) + 2; + size_t new_len = strlen(*prfx) + strlen(name) + 2; /* Check if we need more space */ if (*prfx_len <= new_len) { @@ -1642,5 +1642,5 @@ add_prefix(char **prfx, size_t *prfx_len, const char *name) } /* Append object name to prefix */ - HDstrcat(HDstrcat(*prfx, "/"), name); + strcat(strcat(*prfx, "/"), name); } /* end add_prefix */ |