diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-09-15 22:13:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 22:13:18 (GMT) |
| commit | 44a00ef876ad3e1922847e93feac57c479217fbe (patch) | |
| tree | 5e9fc677913a06a71eba1342633f92e93bd07a6c /tools/libtest | |
| parent | 59a90368cdb696205bdf15040d1a48b4f69af97f (diff) | |
| download | hdf5-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/libtest')
| -rw-r--r-- | tools/libtest/h5tools_test_utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index ebbb57b..6f3c0a6 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -241,7 +241,7 @@ H5_GCC_CLANG_DIAG_OFF("format") *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(expected, actual, reason) \ - if (HDstrcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -277,7 +277,7 @@ H5_GCC_CLANG_DIAG_OFF("format") *---------------------------------------------------------------------------- */ #define JSVERIFY_STR(actual, expected, reason) \ - if (HDstrcmp((actual), (expected)) != 0) { \ + if (strcmp((actual), (expected)) != 0) { \ JSERR_STR((expected), (actual), (reason)); \ goto error; \ } /* JSVERIFY_STR */ @@ -543,8 +543,8 @@ test_populate_ros3_fa(void) TESTING("programmatic ros3 fapl population"); #ifndef H5_HAVE_ROS3_VFD - HDputs(" -SKIP-"); - HDputs(" Read-Only S3 VFD not enabled"); + puts(" -SKIP-"); + puts(" Read-Only S3 VFD not enabled"); fflush(stdout); return 0; #else @@ -681,7 +681,7 @@ test_populate_ros3_fa(void) printf("region overflow\n"); } - assert(HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN); + assert(strlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN); JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL) @@ -754,7 +754,7 @@ test_populate_ros3_fa(void) printf("id overflow\n"); } - assert(HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN); + assert(strlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN); JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL) @@ -887,7 +887,7 @@ test_populate_ros3_fa(void) printf("key overflow\n"); } - assert(HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN); + assert(strlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN); JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL) |