aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel De Vittori <michel.devittori@gmail.com>2019-07-22 17:26:23 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-12-20 11:18:43 +0100
commit3b9939c2528502e78b8433a80e0fa0736e278569 (patch)
tree215d117b3ea676ad937846c384a77eb0aafa58f4
parent1043fd1d7d1f4f732d4c4bac5be1924692bf6f31 (diff)
downloaddabmux-3b9939c2528502e78b8433a80e0fa0736e278569.tar.gz
dabmux-3b9939c2528502e78b8433a80e0fa0736e278569.tar.bz2
dabmux-3b9939c2528502e78b8433a80e0fa0736e278569.zip
Update File.cpp
(cherry picked from commit 0993a6f886115d194466d1787b253e35921fd988)
-rw-r--r--src/input/File.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/input/File.cpp b/src/input/File.cpp
index 2528997..5d25f49 100644
--- a/src/input/File.cpp
+++ b/src/input/File.cpp
@@ -108,7 +108,8 @@ ssize_t FileBase::readFromFile(uint8_t* buffer, size_t size)
ssize_t ret = 0;
if (m_nonblock) {
if (size > m_nonblock_buffer.size()) {
- size_t required_len = size - m_nonblock_buffer.size();
+ size_t m_nonblock_buffer_len = m_nonblock_buffer.size();
+ size_t required_len = size - m_nonblock_buffer_len;
std::vector<uint8_t> buf(required_len);
ret = read(m_fd, buf.data(), required_len);
@@ -127,20 +128,15 @@ ssize_t FileBase::readFromFile(uint8_t* buffer, size_t size)
etiLog.level(alert) << "ERROR: Can't read file " << strerror(errno);
return -1;
}
-
- if (ret == size) {
- std::copy(m_nonblock_buffer.begin(), m_nonblock_buffer.end(),
- buffer);
- buffer += m_nonblock_buffer.size();
- m_nonblock_buffer.clear();
- std::copy(buf.begin(), buf.end(), buffer);
- return size;
- }
+
+ std::copy(m_nonblock_buffer.begin(), m_nonblock_buffer.end(), buffer);
+ buffer += m_nonblock_buffer_len;
+ m_nonblock_buffer.clear();
+ std::copy(buf.begin(), buf.end(), buffer);
+ return ret+m_nonblock_buffer_len;
}
else {
- std::copy(m_nonblock_buffer.begin(), m_nonblock_buffer.begin() + size,
- buffer);
-
+ std::copy(m_nonblock_buffer.begin(), m_nonblock_buffer.begin() + size, buffer);
std::vector<uint8_t> remaining_buf;
std::copy(m_nonblock_buffer.begin() + size, m_nonblock_buffer.end(),
std::back_inserter(remaining_buf));