From 5f39e40328c6bd75d6bb86f7fdcde6aa70db7611 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Sun, 25 Jul 2021 16:20:21 +0200 Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20use=20ssize=5Ft?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It’s not portable to Windows. --- src/Result.cpp | 2 +- src/Util.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Result.cpp b/src/Result.cpp index 99bf34feb..202ce820c 100644 --- a/src/Result.cpp +++ b/src/Result.cpp @@ -424,7 +424,7 @@ Result::Writer::write_embedded_file_entry(CacheEntryWriter& writer, while (remain > 0) { uint8_t buf[CCACHE_READ_BUFFER_SIZE]; size_t n = std::min(remain, static_cast(sizeof(buf))); - ssize_t bytes_read = read(*file, buf, n); + auto bytes_read = read(*file, buf, n); if (bytes_read == -1) { if (errno == EINTR) { continue; diff --git a/src/Util.cpp b/src/Util.cpp index d8b856572..24ce1bbd9 100644 --- a/src/Util.cpp +++ b/src/Util.cpp @@ -1014,7 +1014,7 @@ parse_size(const std::string& value) bool read_fd(int fd, DataReceiver data_receiver) { - ssize_t n; + int64_t n; char buffer[CCACHE_READ_BUFFER_SIZE]; while ((n = read(fd, buffer, sizeof(buffer))) != 0) { if (n == -1 && errno != EINTR) { @@ -1046,7 +1046,7 @@ read_file(const std::string& path, size_t size_hint) throw core::Error(strerror(errno)); } - ssize_t ret = 0; + int64_t ret = 0; size_t pos = 0; std::string result; result.resize(size_hint); @@ -1083,7 +1083,7 @@ read_link(const std::string& path) { size_t buffer_size = path_max(path); std::unique_ptr buffer(new char[buffer_size]); - ssize_t len = readlink(path.c_str(), buffer.get(), buffer_size - 1); + const auto len = readlink(path.c_str(), buffer.get(), buffer_size - 1); if (len == -1) { return ""; } @@ -1440,9 +1440,9 @@ wipe_path(const std::string& path) void write_fd(int fd, const void* data, size_t size) { - ssize_t written = 0; + int64_t written = 0; do { - ssize_t count = + const auto count = write(fd, static_cast(data) + written, size - written); if (count == -1) { if (errno != EAGAIN && errno != EINTR) { -- 2.47.2