diff options
Diffstat (limited to 'hl')
-rw-r--r-- | hl/c++/test/ptableTest.cpp | 8 | ||||
-rw-r--r-- | hl/src/H5LD.c | 4 | ||||
-rw-r--r-- | hl/src/H5LT.c | 4 | ||||
-rw-r--r-- | hl/tools/h5watch/extend_dset.c | 4 | ||||
-rw-r--r-- | hl/tools/h5watch/h5watch.c | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index a77a8e1..efb97a6 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -303,7 +303,7 @@ TestCompress() char filter_name[8]; dcpl.getFilterById(H5Z_FILTER_DEFLATE, flags, cd_nelemts, NULL, 8, filter_name, config); - if (HDstrncmp(filter_name, "deflate", 7) != 0) + if (strncmp(filter_name, "deflate", 7) != 0) H5_FAILED(); } catch (Exception const &) { @@ -313,7 +313,7 @@ TestCompress() PASSED(); #else SKIPPED(); - HDputs(" deflate filter not enabled"); + puts(" deflate filter not enabled"); #endif /* H5_HAVE_FILTER_DEFLATE */ return 0; } @@ -621,7 +621,7 @@ TestHDFFV_9758() s1[i].a = static_cast<int>(i); s1[i].b = 1.0F * static_cast<float>(i * i); s1[i].c = 1.0 / static_cast<double>(i + 1); - HDsnprintf(s1[i].d, STRING_LENGTH, "string%" PRIuHSIZE "", i); + snprintf(s1[i].d, STRING_LENGTH, "string%" PRIuHSIZE "", i); s1[i].e = static_cast<int>(100 + i); } @@ -692,7 +692,7 @@ TestHDFFV_9758() if (s2.a != s1[i].a || s2.e != s1[i].e) goto error; - else if (HDstrcmp(s2.d, s1[i].d) != 0) + else if (strcmp(s2.d, s1[i].d) != 0) goto error; } } // end of ptable block diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c index e618a66..6f140d0 100644 --- a/hl/src/H5LD.c +++ b/hl/src/H5LD.c @@ -344,7 +344,7 @@ H5LD_get_dset_type_size(hid_t did, const char *fields) goto done; /* Get a copy of "fields" */ - if (NULL == (dup_fields = HDstrdup(fields))) + if (NULL == (dup_fields = strdup(fields))) goto done; /* Allocate memory for a list of H5LD_memb_t pointers to store "fields" info */ @@ -499,7 +499,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims goto done; /* Make a copy of "fields" */ - if (NULL == (dup_fields = HDstrdup(fields))) + if (NULL == (dup_fields = strdup(fields))) goto done; /* Allocate memory for the vector of H5LD_memb_t pointers */ diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index d48f240..6bd1337 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1839,7 +1839,7 @@ H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type) } input_len = strlen(text); - myinput = HDstrdup(text); + myinput = strdup(text); if ((type_id = H5LTyyparse()) < 0) { free(myinput); @@ -3267,7 +3267,7 @@ H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid) } /* Duplicate the path to use */ - if (NULL == (tmp_path = HDstrdup(path))) { + if (NULL == (tmp_path = strdup(path))) { ret_value = FAIL; goto done; } diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c index 443a759..abba782 100644 --- a/hl/tools/h5watch/extend_dset.c +++ b/hl/tools/h5watch/extend_dset.c @@ -403,8 +403,8 @@ main(int argc, char *argv[]) } /* end if */ /* Get the dataset name to be extended */ - fname = HDstrdup(argv[1]); - dname = HDstrdup(argv[2]); + fname = strdup(argv[1]); + dname = strdup(argv[2]); action1 = atoi(argv[3]); action2 = atoi(argv[4]); diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c index 876b5d5..2e6071c 100644 --- a/hl/tools/h5watch/h5watch.c +++ b/hl/tools/h5watch/h5watch.c @@ -430,7 +430,7 @@ process_cmpd_fields(hid_t fid, char *dsetname) } /* Make a copy of "g_list_of_fields" */ - if ((g_dup_fields = HDstrdup(g_list_of_fields)) == NULL) { + if ((g_dup_fields = strdup(g_list_of_fields)) == NULL) { error_msg("error in duplicating g_list_of_fields\n"); ret_value = FAIL; goto done; @@ -703,7 +703,7 @@ parse_command_line(int argc, const char *const *argv) case 'f': /* --fields=<list_of_fields> */ if (g_list_of_fields == NULL) { - if ((g_list_of_fields = HDstrdup(H5_optarg)) == NULL) { + if ((g_list_of_fields = strdup(H5_optarg)) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); leave(EXIT_FAILURE); } @@ -711,7 +711,7 @@ parse_command_line(int argc, const char *const *argv) else { char *str; - if ((str = HDstrdup(H5_optarg)) == NULL) { + if ((str = strdup(H5_optarg)) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); leave(EXIT_FAILURE); } @@ -823,7 +823,7 @@ main(int argc, char *argv[]) * then there must have been something wrong with the file (perhaps it * doesn't exist). */ - if ((fname = HDstrdup(argv[H5_optind])) == NULL) { + if ((fname = strdup(argv[H5_optind])) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); h5tools_setstatus(EXIT_FAILURE); goto done; @@ -877,7 +877,7 @@ main(int argc, char *argv[]) else { *dname = '/'; x = dname; - if ((dname = HDstrdup(dname)) == NULL) { + if ((dname = strdup(dname)) == NULL) { error_msg("memory allocation failed (file %s:line %d)\n", __FILE__, __LINE__); h5tools_setstatus(EXIT_FAILURE); goto done; |