diff options
| author | Martin Ridgers <[email protected]> | 2021-10-15 16:04:56 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-15 16:04:56 +0200 |
| commit | 402dfddf62d979319038801a926809e33839e096 (patch) | |
| tree | e8a8e99c7f4718a5fcc363245cc19e16a41bea25 /zenstore | |
| parent | If/def around Windows-only headers (diff) | |
| parent | httpasio: Implemented support for specifying accept type via url suffix (diff) | |
| download | zen-402dfddf62d979319038801a926809e33839e096.tar.xz zen-402dfddf62d979319038801a926809e33839e096.zip | |
Merged main
Diffstat (limited to 'zenstore')
| -rw-r--r-- | zenstore/basicfile.cpp | 2 | ||||
| -rw-r--r-- | zenstore/filecas.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp index 7c4c4f99d..dd3598319 100644 --- a/zenstore/basicfile.cpp +++ b/zenstore/basicfile.cpp @@ -176,7 +176,7 @@ BasicFile::StreamByteRange(uint64_t FileOffset, uint64_t Size, std::function<voi } } -void +void BasicFile::Write(MemoryView Data, uint64_t FileOffset, std::error_code& Ec) { Write(Data.GetData(), Data.GetSize(), FileOffset, Ec); diff --git a/zenstore/filecas.cpp b/zenstore/filecas.cpp index b63cd4ba7..ebab7338e 100644 --- a/zenstore/filecas.cpp +++ b/zenstore/filecas.cpp @@ -139,10 +139,10 @@ FileCasStrategy::InsertChunk(IoBuffer Chunk, const IoHash& ChunkHash) } else if (hRes == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION)) { - // Sharing violation, likely because we are trying to open a file - // which has been renamed on another thread, and the file handle - // used to rename it is still open. We handle this case below - // instead of here + // Sharing violation, likely because we are trying to open a file + // which has been renamed on another thread, and the file handle + // used to rename it is still open. We handle this case below + // instead of here } else { |