diff options
Diffstat (limited to 'c++/test/titerate.cpp')
-rw-r--r-- | c++/test/titerate.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp index 4c84d80..b9196d4 100644 --- a/c++/test/titerate.cpp +++ b/c++/test/titerate.cpp @@ -78,7 +78,7 @@ static void printelems(const Group &group, const H5std_string &dsname, const H5s static int iter_strcmp(const void *s1, const void *s2) { - return (HDstrcmp(*reinterpret_cast<const char *const *>(s1), *reinterpret_cast<const char *const *>(s2))); + return (strcmp(*reinterpret_cast<const char *const *>(s1), *reinterpret_cast<const char *const *>(s2))); } /*------------------------------------------------------------------------- @@ -95,7 +95,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR static int count = 0; static int count2 = 0; - HDstrcpy(info->name, name); + strcpy(info->name, name); switch (info->command) { case RET_ZERO: @@ -162,18 +162,18 @@ test_iter_group(FileAccPropList &fapl) DataSet dataset = file.createDataSet(name, datatype, filespace); /* Keep a copy of the dataset names */ - lnames[i] = HDstrdup(name); - check_values(lnames[i], "HDstrdup returns NULL", __LINE__, __FILE__); + lnames[i] = strdup(name); + check_values(lnames[i], "strdup returns NULL", __LINE__, __FILE__); } /* Create a group and named datatype under root group for testing */ Group grp(file.createGroup(GROUP1, 0)); - lnames[NDATASETS] = HDstrdup("grp"); - check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__); + lnames[NDATASETS] = strdup("grp"); + check_values(lnames[NDATASETS], "strdup returns NULL", __LINE__, __FILE__); datatype.commit(file, "dtype"); - lnames[NDATASETS + 1] = HDstrdup("dtype"); - check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__); + lnames[NDATASETS + 1] = strdup("dtype"); + check_values(lnames[NDATASETS], "strdup returns NULL", __LINE__, __FILE__); /* Sort the dataset names */ qsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp); @@ -301,7 +301,7 @@ test_iter_group(FileAccPropList &fapl) TestErrPrintf("Group iteration function walked too far!\n"); /* Verify that the correct name is retrieved */ - if(HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0) + if(strcmp(info.name, lnames[(size_t)(idx - 1)]) != 0) TestErrPrintf("Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n", (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]); } /* end while */ verify_val(ret, -1, "H5Literate", __LINE__, __FILE__); @@ -327,7 +327,7 @@ test_iter_group(FileAccPropList &fapl) TestErrPrintf("Group iteration function walked too far!\n"); /* Verify that the correct name is retrieved */ - if(HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0) + if(strcmp(info.name, lnames[(size_t)(idx - 1)]) != 0) TestErrPrintf("Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n", (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]); } /* end while */ verify_val(ret, -1, "H5Literate", __LINE__, __FILE__); |