diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-11-23 16:18:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 16:18:26 (GMT) |
| commit | 5ff09ae971cdb8a85c596520666c8dc178541e4a (patch) | |
| tree | 56cd3f440387a7bd29938a8fc150a2073bc50e19 /src/H5FDsec2.c | |
| parent | d4a3097ec5d9e44d377c4b91a05b3e0c5f9f1e2c (diff) | |
| download | hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.zip hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.tar.gz hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.tar.bz2 | |
Basic alignment with async branch (#115)
* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.
* Update minor error code to reflect change within library
* Update the error output to match library
Diffstat (limited to 'src/H5FDsec2.c')
| -rw-r--r-- | src/H5FDsec2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 7789d39..02323c6 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -377,7 +377,7 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr file->nFileIndexHigh = fileinfo.nFileIndexHigh; file->nFileIndexLow = fileinfo.nFileIndexLow; file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber; -#else /* H5_HAVE_WIN32_API */ +#else /* H5_HAVE_WIN32_API */ file->device = sb.st_dev; file->inode = sb.st_ino; #endif /* H5_HAVE_WIN32_API */ @@ -507,7 +507,7 @@ H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2) HGOTO_DONE(-1) if (f1->device > f2->device) HGOTO_DONE(1) -#else /* H5_DEV_T_IS_SCALAR */ +#else /* H5_DEV_T_IS_SCALAR */ /* If dev_t isn't a scalar value on this system, just use memcmp to * determine if the values are the same or not. The actual return value * shouldn't really matter... @@ -742,7 +742,7 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU if (bytes_read > 0) offset += bytes_read; #else - bytes_read = HDread(file->fd, buf, bytes_in); + bytes_read = HDread(file->fd, buf, bytes_in); #endif /* H5_HAVE_PREADWRITE */ } while (-1 == bytes_read && EINTR == errno); @@ -945,7 +945,7 @@ H5FD__sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR bError = SetEndOfFile(file->hFile); if (0 == bError) HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly") -#else /* H5_HAVE_WIN32_API */ +#else /* H5_HAVE_WIN32_API */ if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa)) HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly") #endif /* H5_HAVE_WIN32_API */ |