summaryrefslogtreecommitdiffstats
path: root/fastos
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-09-15 11:32:00 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-09-15 11:32:00 +0000
commit0ff79dbd558f4495b13ffbfdeb9dec0612435154 (patch)
tree3c634fe14c3dce75e803f2ee6654a1e5f9728c2a /fastos
parent34457de36ea84b1ffc4fc286050ef05e96a0adff (diff)
Follow up from @toregge's comments.
Diffstat (limited to 'fastos')
-rw-r--r--fastos/src/vespa/fastos/linux_file.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/fastos/src/vespa/fastos/linux_file.cpp b/fastos/src/vespa/fastos/linux_file.cpp
index b34e54c27b8..9b4a77e1520 100644
--- a/fastos/src/vespa/fastos/linux_file.cpp
+++ b/fastos/src/vespa/fastos/linux_file.cpp
@@ -192,12 +192,12 @@ FastOS_Linux_File::Write2(const void *buffer, size_t length)
const char * data = static_cast<const char *>(buffer);
ssize_t written(0);
while (written < ssize_t(length)) {
- size_t len = std::min(getWriteChunkSize(), length - written);
- ssize_t writtenNow = internalWrite2(data + written, len);
+ size_t lenNow = std::min(getWriteChunkSize(), length - written);
+ ssize_t writtenNow = internalWrite2(data + written, lenNow);
if (writtenNow > 0) {
written += writtenNow;
} else {
- return written;
+ return (written > 0) ? written : writtenNow;;
}
}
return written;