diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-04 16:06:38 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-04 16:06:38 (GMT) |
| commit | 57da3b7db60ab6dd29edfef4116b58dfc6f66b08 (patch) | |
| tree | 777a15e1d20826121f431efd0c6a519a6d7a7f31 | |
| parent | c746447b0dccc66e89038e2eae93cc88db67f825 (diff) | |
| download | hdf5-57da3b7db60ab6dd29edfef4116b58dfc6f66b08.zip hdf5-57da3b7db60ab6dd29edfef4116b58dfc6f66b08.tar.gz hdf5-57da3b7db60ab6dd29edfef4116b58dfc6f66b08.tar.bz2 | |
[svn-r29043] Fixes to make relative external storage work on Windows. Part of HDFFV-8740.
- Fixed typo in Wsetenv().
- Changed HDoff_t back to off_t in test/external.c. The function signature is off_t so the types must match or you can get conversion errors.
Tested on 64-bit Windows 10 w/ VS 2015
| -rw-r--r-- | src/H5system.c | 4 | ||||
| -rw-r--r-- | test/external.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/H5system.c b/src/H5system.c index 420ec85..eb09b15 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -813,8 +813,8 @@ Wsetenv(const char *name, const char *value, int overwrite) */ if(!overwrite) { err = getenv_s(&bufsize, NULL, 0, name); - if(err || bufsize) - return (int)err + if (err || bufsize) + return (int)err; } /* end if */ return (int)_putenv_s(name, value); diff --git a/test/external.c b/test/external.c index 3bf62c4..67fa2ec 100644 --- a/test/external.c +++ b/test/external.c @@ -222,7 +222,7 @@ test_non_extendible(hid_t file) hsize_t max_size[1]; /* data space maximum size */ int n; /* number of external files */ char name[256]; /* external file name */ - HDoff_t file_offset; /* external file offset */ + off_t file_offset; /* external file offset */ hsize_t file_size; /* sizeof external file segment */ haddr_t dset_addr; /* address of dataset */ @@ -494,7 +494,7 @@ test_unlimited(hid_t file) hsize_t max_size[1]; /* data space maximum size */ int n; /* number of external files */ char name[256]; /* external file name */ - HDoff_t file_offset; /* external file offset */ + off_t file_offset; /* external file offset */ hsize_t file_size; /* sizeof external file segment */ TESTING("unlimited dataspace, unlimited external storage"); @@ -810,7 +810,7 @@ test_read_file_set(hid_t fapl) FAIL_STACK_ERROR /* Verify data */ - for(i = hs_start; i < hs_start + hs_count; i++) { + for(i = (size_t)hs_start; i < (size_t)(hs_start + hs_count); i++) { if(whole[i] != (signed)i) FAIL_PUTS_ERROR("Incorrect value(s) read (hyperslab)."); } /* end for */ |