philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleans up POSIX/C bits in H5private.h (#804)

Browse Source 
test/ros3.c and test/s3comms.c each had a 'FUNC' that needed to be
'__func__', missed in a previous merge.

* Cleans up POSIX/C bits in H5private.h

* Assume difftime exists (C89)
* Reorg AC_CHECK_HEADERS so headers are in alphabetical order
* Split off networking-related AC_CHECK_HEADERS
* Remove unused UNAME_CYGWIN from configure.ac
* Remove checks for unused sys/timeb.h
* Tidying pass over H5private.h HD prefix macros
* Tidy H5win32defs.h
* Add HD prefix to various scanf calls

* Committing clang-format changes

* Fixes to the alarm(2) code used in the tests to make Windows happy

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Dana Robinson
2021-06-28 21:59:25 -07:00
committed by Larry Knox
parent 443187860a
commit 641e6f7b4e
17 changed files with 602 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hl/test/test_ds.c
View File

@@ -4959,12 +4959,12 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf)
}
for (i = 0, nelms = 1; i < ndims; i++) {
if (fscanf(f, "%s %u", str, &j) && HDferror(f)) {
if (HDfscanf(f, "%s %u", str, &j) && HDferror(f)) {
HDprintf("fscanf error in file %s\n", data_file);
HDfclose(f);
return -1;
} /* end if */
if (fscanf(f, "%d", &n) < 0 && HDferror(f)) {
if (HDfscanf(f, "%d", &n) < 0 && HDferror(f)) {
HDprintf("fscanf error in file %s\n", data_file);
HDfclose(f);
return -1;
@@ -4982,7 +4982,7 @@ read_data(const char *fname, int ndims, hsize_t *dims, float **buf)
}
for (j = 0; j < nelms; j++) {
if (fscanf(f, "%f", &val) < 0 && HDferror(f)) {
if (HDfscanf(f, "%f", &val) < 0 && HDferror(f)) {
HDprintf("fscanf error in file %s\n", data_file);
HDfclose(f);
return -1;