summaryrefslogtreecommitdiffstats
path: root/tools/test/h5diff
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-09-15 22:13:18 (GMT)
committerGitHub <noreply@github.com>2023-09-15 22:13:18 (GMT)
commit44a00ef876ad3e1922847e93feac57c479217fbe (patch)
tree5e9fc677913a06a71eba1342633f92e93bd07a6c /tools/test/h5diff
parent59a90368cdb696205bdf15040d1a48b4f69af97f (diff)
downloadhdf5-44a00ef876ad3e1922847e93feac57c479217fbe.zip
hdf5-44a00ef876ad3e1922847e93feac57c479217fbe.tar.gz
hdf5-44a00ef876ad3e1922847e93feac57c479217fbe.tar.bz2
Strip HD prefix from string/char C API calls (#3540)
* Strip HD prefix from string/char C API calls * HD(f)(put|get)(s|c) * HDstr* * HDv*printf * HD(s)(print|scan)f * HDperror But NOT: * HDstrcase* * HDvasprintf * HDstrtok_r * HDstrndup As those are not C99 and have portability work-around implementations. They will be handled later. * Fix th5_system.c screwup
Diffstat (limited to 'tools/test/h5diff')
-rw-r--r--tools/test/h5diff/h5diffgentest.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 06bd2a9..e595dd3 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -333,16 +333,16 @@ onion_filepaths_init(const char *basename)
if (NULL == (paths = calloc(1, sizeof(struct onion_filepaths))))
goto error;
- if (NULL == (paths->canon = HDstrdup(basename)))
+ if (NULL == (paths->canon = strdup(basename)))
goto error;
if (NULL == (paths->onion = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE)))
goto error;
- HDsnprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon);
+ snprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon);
if (NULL == (paths->recovery = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE)))
goto error;
- HDsnprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon);
+ snprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon);
return paths;
@@ -4262,35 +4262,35 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
comp9_buf.str_vlen = comp9_buf.str_vlen_repeat = vlen_str_buf;
/* copy fixlen string data to compound buffers */
- HDstrcpy(comp1_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp1_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp1_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp1_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp2_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp2_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp2_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp2_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp3_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp3_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp3_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp3_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp4_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp4_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp4_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp4_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp5_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp5_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp5_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp5_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp6_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp6_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp6_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp6_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp7_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp7_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp7_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp7_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp8_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp8_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp8_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp8_buf.str_fixlen_repeat, fixlen_str_buf);
- HDstrcpy(comp9_buf.str_fixlen, fixlen_str_buf);
- HDstrcpy(comp9_buf.str_fixlen_repeat, fixlen_str_buf);
+ strcpy(comp9_buf.str_fixlen, fixlen_str_buf);
+ strcpy(comp9_buf.str_fixlen_repeat, fixlen_str_buf);
/* copy vlen string array data to compound buffers */
for (i = 0; i < VLEN_STR_ARRY_DIM; i++) {
@@ -4307,32 +4307,32 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
/* copy fixlen string attay data to compound buffers */
for (i = 0; i < FIXLEN_STR_ARRY_DIM; i++) {
- HDstrcpy(comp1_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp1_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp1_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp1_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp2_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp2_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp2_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp2_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp3_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp3_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp3_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp3_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp4_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp4_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp4_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp4_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp5_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp5_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp5_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp5_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp6_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp6_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp6_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp6_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp7_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp7_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp7_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp7_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp8_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp8_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp8_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp8_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp9_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
- HDstrcpy(comp9_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+ strcpy(comp9_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+ strcpy(comp9_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
}
/* int data */