Add [[nodiscard]] to Write2 and CheckedWrite too

3 files changed, 8 insertions, 7 deletions

diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.cpp b/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
index cbe95e286b7..d93dbd74ee1 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.cpp
@@ -238,7 +238,8 @@ Fast_BufferedFile::ReadLine(char *line, size_t buflen)
     }
 }
 
-ssize_t Fast_BufferedFile::Write2(const void * src, size_t srclen)
+ssize_t
+Fast_BufferedFile::Write2(const void * src, size_t srclen)
 {
     const char *p, *pe;
     p = static_cast<const char *>(src);
diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.h b/fastlib/src/vespa/fastlib/io/bufferedfile.h
index cdeb817b0de..ab01919d91a 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.h
@@ -107,7 +107,7 @@ public:
      * @param src The source buffer.
      * @param srclen The length of the source buffer.
      */
-    ssize_t Write2(const void*, size_t) override;
+    [[nodiscard]] ssize_t Write2(const void*, size_t) override;
     /**
      * Write a string to a buffered file, flushing to file
      * as necessary.
diff --git a/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp b/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp
index 0e27cb525af..8aa9b943419 100644
--- a/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp
+++ b/fastlib/src/vespa/fastlib/io/tests/bufferedfiletest.cpp
@@ -19,7 +19,7 @@ TEST("main") {
     printf ("testing 11 byte long file\n");
     bufFile.WriteOpen("testfile1");
     bufFile.addNum(1,10,' ');
-    bufFile.CheckedWrite("\n",1);
+    ASSERT_TRUE(bufFile.CheckedWrite("\n",1));
     ASSERT_TRUE(bufFile.Close());
     FastOS_File::Stat("testfile1", &statInfo);
     if (statInfo._size != 11) {
@@ -33,7 +33,7 @@ TEST("main") {
     bufFile.WriteOpen("testfile2");
     char buf[8192]; // allocate 8K buffer
     memset(buf,0xff,8192);
-    bufFile.CheckedWrite(buf,4095); // write almost 4K
+    ASSERT_TRUE(bufFile.CheckedWrite(buf,4095)); // write almost 4K
     ASSERT_TRUE(bufFile.Close());
     FastOS_File::Stat("testfile2", &statInfo);
     if (statInfo._size != 4095) {
@@ -45,7 +45,7 @@ TEST("main") {
     // test 3
     printf ("testing 4096 byte long file\n");
     bufFile.WriteOpen("testfile3");
-    bufFile.CheckedWrite(buf,4096);  // write exactly 4K
+    ASSERT_TRUE(bufFile.CheckedWrite(buf,4096));  // write exactly 4K
     ASSERT_TRUE(bufFile.Close());
     FastOS_File::Stat("testfile3", &statInfo);
     if (statInfo._size != 4096) {
@@ -57,7 +57,7 @@ TEST("main") {
     // test 4
     printf ("testing 4097 byte long file\n");
     bufFile.WriteOpen("testfile4");
-    bufFile.CheckedWrite(buf,4097);   // write a bit over 4K
+    ASSERT_TRUE(bufFile.CheckedWrite(buf,4097));   // write a bit over 4K
     ASSERT_TRUE(bufFile.Close());
     FastOS_File::Stat("testfile4", &statInfo);
     if (statInfo._size != 4097) {
@@ -74,7 +74,7 @@ TEST("main") {
             bufFile.addNum(value,6,' ');
             value++;
         }
-        bufFile.CheckedWrite("\n",1);
+        ASSERT_TRUE(bufFile.CheckedWrite("\n",1));
     }
     ASSERT_TRUE(bufFile.Close());
     FastOS_File::Stat("testfile5", &statInfo);