diff options
| author | B. Stack <bgstack15@gmail.com> | 2023-02-21 12:13:36 -0500 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2023-02-21 12:13:36 -0500 |
| commit | 5a6ed4e8eadf3af3d141b246f124d67b62a1357c (patch) | |
| tree | 4e49ae80efbe181c46110867fe7cf703efd3fcf5 /zen/zlib_wrap.cpp | |
| parent | argon2 copyright notice updated (diff) | |
| download | FreeFileSync-5a6ed4e8eadf3af3d141b246f124d67b62a1357c.tar.gz FreeFileSync-5a6ed4e8eadf3af3d141b246f124d67b62a1357c.tar.bz2 FreeFileSync-5a6ed4e8eadf3af3d141b246f124d67b62a1357c.zip | |
add upstream 12.112.1
Diffstat (limited to 'zen/zlib_wrap.cpp')
| -rw-r--r-- | zen/zlib_wrap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/zlib_wrap.cpp b/zen/zlib_wrap.cpp index 28b85c5c..7e680131 100644 --- a/zen/zlib_wrap.cpp +++ b/zen/zlib_wrap.cpp @@ -6,7 +6,7 @@ #include "zlib_wrap.h" //Windows: use the SAME zlib version that wxWidgets is linking against! //C:\Data\Projects\wxWidgets\Source\src\zlib\zlib.h -//Linux/macOS: use zlib system header for both wxWidgets and libcurl (zlib is required for HTTP, SFTP) +//Linux/macOS: use zlib system header for wxWidgets, libcurl (HTTP), libssh2 (SFTP) // => don't compile wxWidgets with: --with-zlib=builtin #include <zlib.h> #include "scope_guard.h" @@ -178,7 +178,7 @@ public: size_t read(void* buffer, size_t bytesToRead) //throw SysError, X; return "bytesToRead" bytes unless end of stream! { if (bytesToRead == 0) //"read() with a count of 0 returns zero" => indistinguishable from end of file! => check! - throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__)); + throw std::logic_error(std::string(__FILE__) + '[' + numberTo<std::string>(__LINE__) + "] Contract violation!"); gzipStream_.next_out = static_cast<Bytef*>(buffer); gzipStream_.avail_out = static_cast<uInt>(bytesToRead); |