- assert result of Close() in destructor of FastOS_File and FastOS_BufferedFile.

- Check result of Close()
- Check result of Sync()
- Scope FastOS_File to avoid explicit Close().
- NULL -> nullptr

1 files changed, 2 insertions, 7 deletions

diff --git a/searchcommon/src/vespa/searchcommon/common/schema.cpp b/searchcommon/src/vespa/searchcommon/common/schema.cpp
index af730f38018..0127f727069 100644
--- a/searchcommon/src/vespa/searchcommon/common/schema.cpp
+++ b/searchcommon/src/vespa/searchcommon/common/schema.cpp
@@ -290,18 +290,13 @@ Schema::saveToFile(const vespalib::string & fileName) const
     FastOS_File s;
     s.OpenReadWrite(fileName.c_str());
     if (!s.IsOpened()) {
-        LOG(warning,
-            "Could not open schema file '%s' for fsync",
-            fileName.c_str());
+        LOG(warning, "Could not open schema file '%s' for fsync", fileName.c_str());
         return false;
     } else {
         if (!s.Sync()) {
-            LOG(warning,
-                "Could not fsync schema file '%s'",
-                fileName.c_str());
+            LOG(warning, "Could not fsync schema file '%s'", fileName.c_str());
             return false;
         }
-        s.Close();
     }
     return true;
 }