From 78c6be05a84f854074a4df2e10c15a56444e4015 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 11 Aug 2020 17:46:54 -0700 Subject: Fixes the splitter VFD test on Windows. --- test/h5test.c | 10 +++++----- test/vfd.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/h5test.c b/test/h5test.c index 255932a..817e98c 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -2067,13 +2067,13 @@ h5_compare_file_bytes(char *f1name, char *f2name) int ret_value = 0; /* for error handling */ /* Open files for reading */ - f1ptr = HDfopen(f1name, "r"); + f1ptr = HDfopen(f1name, "rb"); if (f1ptr == NULL) { HDfprintf(stderr, "Unable to fopen() %s\n", f1name); ret_value = -1; goto done; } - f2ptr = HDfopen(f2name, "r"); + f2ptr = HDfopen(f2name, "rb"); if (f2ptr == NULL) { HDfprintf(stderr, "Unable to fopen() %s\n", f2name); ret_value = -1; @@ -2200,7 +2200,7 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest) max_buf = 4096 * sizeof(char); - orig_ptr = HDfopen(orig, "r"); + orig_ptr = HDfopen(orig, "rb"); if (NULL == orig_ptr) { ret_value = -1; goto done; @@ -2210,7 +2210,7 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest) fsize = (hsize_t)HDftell(orig_ptr); HDrewind(orig_ptr); - dest_ptr = HDfopen(dest, "w"); + dest_ptr = HDfopen(dest, "wb"); if (NULL == dest_ptr) { ret_value = -1; goto done; @@ -2224,7 +2224,7 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest) } while (read_size > 0) { - if(HDfread(dup_buf, read_size, 1, orig_ptr) != 1) { + if (HDfread(dup_buf, read_size, 1, orig_ptr) != 1) { ret_value = -1; goto done; } diff --git a/test/vfd.c b/test/vfd.c index f1443c5..d849d96 100644 --- a/test/vfd.c +++ b/test/vfd.c @@ -2453,7 +2453,7 @@ run_splitter_test(const struct splitter_dataset_def *data, SPLITTER_TEST_FAULT("files are not byte-for-byte equivalent\n"); } - /* Verify existence of logfile iff appropriate */ + /* Verify existence of logfile if appropriate */ logfile = fopen(vfd_config->log_file_path, "r"); if ( (TRUE == provide_logfile_path && NULL == logfile) || (FALSE == provide_logfile_path && NULL != logfile) ) -- cgit v0.12