summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-06-29 15:19:31 (GMT)
committerGitHub <noreply@github.com>2023-06-29 15:19:31 (GMT)
commitfd56a593b7928da636b2494b25cd7478fed78c29 (patch)
treeb815098d8bcf67f4290d3ca74132ce793503b94e /tools/test
parent8aef67f0ae3e037df22c5319eb2eac8b95521b19 (diff)
downloadhdf5-fd56a593b7928da636b2494b25cd7478fed78c29.zip
hdf5-fd56a593b7928da636b2494b25cd7478fed78c29.tar.gz
hdf5-fd56a593b7928da636b2494b25cd7478fed78c29.tar.bz2
Remove HD from C std lib file ops (#3206)
* HDfclose * HDferror * HDfeof * HDfflush * HDfopen * HDfread * HDfwrite
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/h5import/h5importtest.c82
-rw-r--r--tools/test/h5jam/getub.c2
-rw-r--r--tools/test/h5jam/tellub.c2
-rw-r--r--tools/test/misc/h5repart_gentest.c2
-rw-r--r--tools/test/misc/talign.c2
-rw-r--r--tools/test/perform/iopipe.c14
-rw-r--r--tools/test/perform/zip_perf.c2
7 files changed, 53 insertions, 53 deletions
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
index 96da5c8..003c343 100644
--- a/tools/test/h5import/h5importtest.c
+++ b/tools/test/h5import/h5importtest.c
@@ -159,7 +159,7 @@ main(void)
*-------------------------------------------------------------------------
*/
- sp = HDfopen("txtin8.txt", "w");
+ sp = fopen("txtin8.txt", "w");
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++)
@@ -167,14 +167,14 @@ main(void)
(void)fprintf(sp, "\n");
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5
*-------------------------------------------------------------------------
*/
- sp = HDfopen("txtin16.txt", "w");
+ sp = fopen("txtin16.txt", "w");
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++)
@@ -182,14 +182,14 @@ main(void)
(void)fprintf(sp, "\n");
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST txtin32.txt -c $srcdir/testfiles/textin32.conf -o textin32.h5
*-------------------------------------------------------------------------
*/
- sp = HDfopen("txtin32.txt", "w");
+ sp = fopen("txtin32.txt", "w");
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++)
@@ -197,7 +197,7 @@ main(void)
(void)fprintf(sp, "\n");
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
#endif
/*-------------------------------------------------------------------------
@@ -205,17 +205,17 @@ main(void)
*-------------------------------------------------------------------------
*/
- sp = HDfopen("binin32.bin", OPEN_FLAGS);
+ sp = fopen("binin32.bin", OPEN_FLAGS);
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++) {
- (void)HDfwrite((char *)&b32i3[k][i][j], sizeof(int), 1, sp);
+ (void)fwrite((char *)&b32i3[k][i][j], sizeof(int), 1, sp);
}
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
- sp = HDfopen("binin32.conf", "w");
+ sp = fopen("binin32.conf", "w");
(void)fprintf(sp, "PATH /int/bin/32-bit\n");
(void)fprintf(sp, "INPUT-CLASS IN\n");
(void)fprintf(sp, "INPUT-SIZE 32\n");
@@ -226,24 +226,24 @@ main(void)
(void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
(void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5
*-------------------------------------------------------------------------
*/
- sp = HDfopen("binuin32.bin", OPEN_FLAGS);
+ sp = fopen("binuin32.bin", OPEN_FLAGS);
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++) {
- (void)HDfwrite((char *)&b32i3[k][i][j], sizeof(unsigned int), 1, sp);
+ (void)fwrite((char *)&b32i3[k][i][j], sizeof(unsigned int), 1, sp);
}
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
- sp = HDfopen("binuin32.conf", "w");
+ sp = fopen("binuin32.conf", "w");
(void)fprintf(sp, "PATH /int/buin/32-bit\n");
(void)fprintf(sp, "INPUT-CLASS UIN\n");
(void)fprintf(sp, "INPUT-SIZE 32\n");
@@ -253,24 +253,24 @@ main(void)
(void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binin16.bin -c binin16.conf -o binin16.h5
*-------------------------------------------------------------------------
*/
- sp = HDfopen("binin16.bin", OPEN_FLAGS);
+ sp = fopen("binin16.bin", OPEN_FLAGS);
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++) {
- (void)HDfwrite((char *)&b16i3[k][i][j], sizeof(short), 1, sp);
+ (void)fwrite((char *)&b16i3[k][i][j], sizeof(short), 1, sp);
}
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
- sp = HDfopen("binin16.conf", "w");
+ sp = fopen("binin16.conf", "w");
(void)fprintf(sp, "PATH /int/bin/16-bit\n");
(void)fprintf(sp, "INPUT-CLASS IN\n");
(void)fprintf(sp, "INPUT-SIZE 16\n");
@@ -282,23 +282,23 @@ main(void)
(void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
(void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5
*-------------------------------------------------------------------------
*/
- sp = HDfopen("binuin16.bin", OPEN_FLAGS);
+ sp = fopen("binuin16.bin", OPEN_FLAGS);
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++) {
- (void)HDfwrite((char *)&b16i3[k][i][j], sizeof(unsigned short), 1, sp);
+ (void)fwrite((char *)&b16i3[k][i][j], sizeof(unsigned short), 1, sp);
}
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
- sp = HDfopen("binuin16.conf", "w");
+ sp = fopen("binuin16.conf", "w");
(void)fprintf(sp, "PATH /int/buin/16-bit\n");
(void)fprintf(sp, "INPUT-CLASS UIN\n");
(void)fprintf(sp, "INPUT-SIZE 16\n");
@@ -310,24 +310,24 @@ main(void)
(void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
(void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binin8.bin -c binin8.conf -o binin8.h5
*-------------------------------------------------------------------------
*/
- sp = HDfopen("binin8.bin", OPEN_FLAGS);
+ sp = fopen("binin8.bin", OPEN_FLAGS);
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++) {
- (void)HDfwrite((char *)&b8i3[k][i][j], sizeof(char), 1, sp);
+ (void)fwrite((char *)&b8i3[k][i][j], sizeof(char), 1, sp);
}
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
- sp = HDfopen("binin8.conf", "w");
+ sp = fopen("binin8.conf", "w");
(void)fprintf(sp, "PATH /int/bin/8-bit\n");
(void)fprintf(sp, "INPUT-CLASS IN\n");
(void)fprintf(sp, "INPUT-SIZE 8\n");
@@ -342,7 +342,7 @@ main(void)
(void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
(void)fprintf(sp, "COMPRESSION-PARAM 3\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
#endif /* UNICOS */
@@ -355,17 +355,17 @@ main(void)
* binary 64-bit file - rank 2 & 3
*/
- sp = HDfopen("binfp64.bin", OPEN_FLAGS);
+ sp = fopen("binfp64.bin", OPEN_FLAGS);
for (k = 0; k < npln; k++) {
for (i = 0; i < nrow; i++) {
for (j = 0; j < ncol; j++) {
- (void)HDfwrite((char *)&b64r3[k][i][j], sizeof(double), 1, sp);
+ (void)fwrite((char *)&b64r3[k][i][j], sizeof(double), 1, sp);
}
}
}
- (void)HDfclose(sp);
+ (void)fclose(sp);
- sp = HDfopen("binfp64.conf", "w");
+ sp = fopen("binfp64.conf", "w");
(void)fprintf(sp, "PATH /fp/bin/64-bit\n");
(void)fprintf(sp, "INPUT-CLASS FP\n");
(void)fprintf(sp, "INPUT-SIZE 64\n");
@@ -378,7 +378,7 @@ main(void)
(void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
(void)fprintf(sp, "COMPRESSION-PARAM 8\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
/*-------------------------------------------------------------------------
* TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5
@@ -389,15 +389,15 @@ main(void)
/* test CR+LF (13,10) and EOF (26) in windows */
char bin8w[4] = {13, 10, 26, 0};
- sp = HDfopen("binin8w.bin", OPEN_FLAGS);
+ sp = fopen("binin8w.bin", OPEN_FLAGS);
for (i = 0; i < 4; i++) {
char c = bin8w[i];
- if (HDfwrite(&c, sizeof(char), 1, sp) != 1)
+ if (fwrite(&c, sizeof(char), 1, sp) != 1)
printf("error writing file\n");
}
- HDfclose(sp);
+ fclose(sp);
- sp = HDfopen("binin8w.conf", "w");
+ sp = fopen("binin8w.conf", "w");
(void)fprintf(sp, "INPUT-CLASS IN\n");
(void)fprintf(sp, "INPUT-SIZE 8\n");
(void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
@@ -408,7 +408,7 @@ main(void)
(void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
(void)fprintf(sp, "DIMENSION-SIZES 4\n");
(void)fprintf(sp, "\n");
- (void)HDfclose(sp);
+ (void)fclose(sp);
}
return (EXIT_SUCCESS);
}
diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c
index 139ead6..b90ddeb 100644
--- a/tools/test/h5jam/getub.c
+++ b/tools/test/h5jam/getub.c
@@ -35,7 +35,7 @@ static struct h5_long_options l_opts[] = {{"c", require_arg, 'c'}, /* input file
static void
usage(const char *prog)
{
- HDfflush(stdout);
+ fflush(stdout);
fprintf(stdout, "usage: %s -c nb file] \n", prog);
fprintf(stdout, " print first 'nb' byts of file to stdoug.\n");
}
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 4b5606c..501ecc5 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -37,7 +37,7 @@ static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"hel", no_arg,
static void
usage(const char *prog)
{
- HDfflush(stdout);
+ fflush(stdout);
fprintf(stdout, "usage: %s h5_file\n", prog);
fprintf(stdout, " Check that h5_fil is HDF5 file and print size of user block \n");
fprintf(stdout, " %s -h\n", prog);
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index 5d5cb2f..df1c312 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -107,7 +107,7 @@ main(void)
free(buf_data);
HDputs(" PASSED");
- HDfflush(stdout);
+ fflush(stdout);
return EXIT_SUCCESS;
}
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index c876d9f..805b30b 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -197,6 +197,6 @@ out:
H5Pclose(plist);
H5Fclose(fil);
HDunlink(fname);
- HDfflush(stdout);
+ fflush(stdout);
return result;
}
diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c
index e77e288..8131f9d 100644
--- a/tools/test/perform/iopipe.c
+++ b/tools/test/perform/iopipe.c
@@ -173,7 +173,7 @@ main(void)
fprintf(stderr, HEADING, "fill raw");
for (u = 0; u < nwrite; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
HDmemset(the_data, 0xAA, (size_t)(size[0] * size[1]));
}
#ifdef H5_HAVE_GETRUSAGE
@@ -196,7 +196,7 @@ main(void)
fprintf(stderr, HEADING, "fill hdf5");
for (u = 0; u < nread; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space, H5P_DEFAULT, the_data);
assert(status >= 0);
}
@@ -220,7 +220,7 @@ main(void)
fprintf(stderr, HEADING, "out raw");
for (u = 0; u < nwrite; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
offset = HDlseek(fd, (off_t)0, SEEK_SET);
assert(0 == offset);
n = HDwrite(fd, the_data, (size_t)(size[0] * size[1]));
@@ -246,7 +246,7 @@ main(void)
fprintf(stderr, HEADING, "out hdf5");
for (u = 0; u < nwrite; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
status = H5Dwrite(dset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, the_data);
assert(status >= 0);
}
@@ -270,7 +270,7 @@ main(void)
fprintf(stderr, HEADING, "in raw");
for (u = 0; u < nread; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
offset = HDlseek(fd, (off_t)0, SEEK_SET);
assert(0 == offset);
n = HDread(fd, the_data, (size_t)(size[0] * size[1]));
@@ -296,7 +296,7 @@ main(void)
fprintf(stderr, HEADING, "in hdf5");
for (u = 0; u < nread; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space, H5P_DEFAULT, the_data);
assert(status >= 0);
}
@@ -325,7 +325,7 @@ main(void)
fprintf(stderr, HEADING, "in hdf5 partial");
for (u = 0; u < nread; u++) {
HDputc(PROGRESS, stderr);
- HDfflush(stderr);
+ fflush(stderr);
status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space, H5P_DEFAULT, the_data);
assert(status >= 0);
}
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index a21bfd8..772badd 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -258,7 +258,7 @@ usage(void)
fprintf(stdout, "\n");
fprintf(stdout, " Example: 37M = 37 Megabytes = %d bytes\n", 37 * ONE_MB);
fprintf(stdout, "\n");
- HDfflush(stdout);
+ fflush(stdout);
}
/*