nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-22 02:09:36 +01:00
Code Activity

libstore/filetransfer: Rename writeException -> callbackException

Browse source
This commit is contained in:
Sergei Zimmerman 2025-11-19 01:31:41 +03:00
parent 6d65f8eea2
commit e704b8eeed
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/filetransfer.cc
View file

@ -168,7 +168,7 @@ struct curlFileTransfer : public FileTransfer
std::shared_ptr<FinishSink> decompressionSink; std::shared_ptr<FinishSink> decompressionSink;
std::optional<StringSink> errorSink; std::optional<StringSink> errorSink;
std::exception_ptr writeException; std::exception_ptr callbackException;
size_t writeCallback(void * contents, size_t size, size_t nmemb) noexcept size_t writeCallback(void * contents, size_t size, size_t nmemb) noexcept
try { try {
@ -190,7 +190,7 @@ struct curlFileTransfer : public FileTransfer
return realSize; return realSize;
} catch (...) { } catch (...) {
writeException = std::current_exception(); callbackException = std::current_exception();
return 0; return 0;
} }
@ -474,7 +474,7 @@ struct curlFileTransfer : public FileTransfer
try { try {
decompressionSink->finish(); decompressionSink->finish();
} catch (...) { } catch (...) {
writeException = std::current_exception(); callbackException = std::current_exception();
} }
} }
@ -483,8 +483,8 @@ struct curlFileTransfer : public FileTransfer
httpStatus = 304; httpStatus = 304;
} }
if (writeException) if (callbackException)
failEx(writeException); failEx(callbackException);
else if (code == CURLE_OK && successfulStatuses.count(httpStatus)) { else if (code == CURLE_OK && successfulStatuses.count(httpStatus)) {
result.cached = httpStatus == 304; result.cached = httpStatus == 304;