diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2020-08-06 22:08:28 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2020-08-06 22:08:28 (GMT) |
commit | 7391f5f26c0893bb56e0d122c459e77796e2ed9b (patch) | |
tree | 792c5e4f5d3210dca491df119e99cc4d78f7dbd0 /test/h5test.c | |
parent | b2c90cc84ec84f51233d69f5eb951d48ba20d37e (diff) | |
parent | 482ade4657c34188532a5b19664f37dcd3319edd (diff) | |
download | hdf5-7391f5f26c0893bb56e0d122c459e77796e2ed9b.zip hdf5-7391f5f26c0893bb56e0d122c459e77796e2ed9b.tar.gz hdf5-7391f5f26c0893bb56e0d122c459e77796e2ed9b.tar.bz2 |
Merge branch 'develop' into file_locking_squash_2
Diffstat (limited to 'test/h5test.c')
-rw-r--r-- | test/h5test.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/test/h5test.c b/test/h5test.c index 858f30a..55141ea 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -2097,8 +2097,14 @@ h5_compare_file_bytes(char *f1name, char *f2name) HDrewind(f1ptr); HDrewind(f2ptr); for (ii = 0; ii < f1size; ii++) { - HDfread(&f1char, 1, 1, f1ptr); - HDfread(&f2char, 1, 1, f2ptr); + if(HDfread(&f1char, 1, 1, f1ptr) != 1) { + ret_value = -1; + goto done; + } + if(HDfread(&f2char, 1, 1, f2ptr) != 1) { + ret_value = -1; + goto done; + } if (f1char != f2char) { HDfprintf(stderr, "Mismatch @ 0x%llX: 0x%X != 0x%X\n", ii, f1char, f2char); ret_value = -1; @@ -2107,13 +2113,11 @@ h5_compare_file_bytes(char *f1name, char *f2name) } done: - if (f1ptr) { + if (f1ptr) HDfclose(f1ptr); - } - if (f2ptr) { + if (f2ptr) HDfclose(f2ptr); - } - return(ret_value); + return ret_value; } /* end h5_compare_file_bytes() */ /*------------------------------------------------------------------------- @@ -2220,7 +2224,10 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest) } while (read_size > 0) { - HDfread(dup_buf, read_size, 1, orig_ptr); /* warning: no error-check */ + if(HDfread(dup_buf, read_size, 1, orig_ptr) != 1) { + ret_value = -1; + goto done; + } HDfwrite(dup_buf, read_size, 1, dest_ptr); fsize -= read_size; read_size = MIN(fsize, max_buf); |