Add [[nodiscard]] to Write2 and CheckedWrite too

3 files changed, 6 insertions, 4 deletions

diff --git a/searchlib/src/apps/docstore/create-idx-from-dat.cpp b/searchlib/src/apps/docstore/create-idx-from-dat.cpp
index 477282fdbf4..30af02ddb92 100644
--- a/searchlib/src/apps/docstore/create-idx-from-dat.cpp
+++ b/searchlib/src/apps/docstore/create-idx-from-dat.cpp
@@ -79,7 +79,8 @@ generate(uint64_t serialNum, size_t chunks, FastOS_FileInterface & idxFile, size
             fprintf(stdout, "Failed with lengthError %ld due to '%s'\n", lengthError, e.what());
         }
     }
-    idxFile.Write2(os.data(), os.size());
+    ssize_t written = idxFile.Write2(os.data(), os.size());
+    assert(written == ssize_t(os.size()));
     return serialNum;
 }
 
diff --git a/searchlib/src/tests/util/rawbuf_test.cpp b/searchlib/src/tests/util/rawbuf_test.cpp
index 1963833947f..fd77b5b4ddb 100644
--- a/searchlib/src/tests/util/rawbuf_test.cpp
+++ b/searchlib/src/tests/util/rawbuf_test.cpp
@@ -118,8 +118,8 @@ TEST("require that prealloc makes enough room") {
 
 TEST("require that rawbuf can read from file") {
     FastOS_File file("mytemporaryfile");
-    file.OpenReadWrite();
-    file.Write2("barbaz", 6);
+    ASSERT_TRUE(file.OpenReadWrite());
+    ASSERT_EQUAL(6, file.Write2("barbaz", 6));
     file.SetPosition(0);
 
     RawBuf buf(10);
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
index 3a24d348676..eea9610c7ab 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
@@ -430,7 +430,8 @@ void
 DomainPart::write(FastOS_FileInterface &file, SerialNumRange range, vespalib::ConstBufferRef buf)
 {
     std::lock_guard guard(_writeLock);
-    if ( ! file.CheckedWrite(buf.data(), buf.size()) ) {
+    size_t written = file.Write2(buf.data(), buf.size());
+    if ( written != buf.size() ) {
         throw runtime_error(handleWriteError("Failed writing the entry.", file, byteSize(), range, buf.size()));
     }
     LOG(debug, "Wrote chunk with and %zu bytes, range[%" PRIu64 ", %" PRIu64 "]", buf.size(), range.from(), range.to());