Unify code, no sematic changes.

2 files changed, 27 insertions, 87 deletions

diff --git a/searchlib/src/vespa/searchlib/util/fileutil.cpp b/searchlib/src/vespa/searchlib/util/fileutil.cpp
index d3407ba030b..f69654cf3d4 100644
--- a/searchlib/src/vespa/searchlib/util/fileutil.cpp
+++ b/searchlib/src/vespa/searchlib/util/fileutil.cpp
@@ -32,53 +32,37 @@ FileUtil::LoadedMmap::LoadedMmap(const vespalib::string &fileName)
         if (res == 0) {
             size_t sz = stbuf.st_size;
             if (sz) {
-                void *tmpBuffer = mmap(NULL, sz,
-                                       PROT_READ, MAP_PRIVATE,
-                                       fd.fd(), 0);
+                void *tmpBuffer = mmap(NULL, sz, PROT_READ, MAP_PRIVATE, fd.fd(), 0);
                 if (tmpBuffer != MAP_FAILED) {
                     _mapSize = sz;
                     _mapBuffer = tmpBuffer;
                     uint32_t hl = GenericHeader::getMinSize();
                     bool badHeader = true;
                     if (sz >= hl) {
-                        GenericHeader::MMapReader rd(static_cast<const char *>
-                                                     (tmpBuffer), sz);
+                        GenericHeader::MMapReader rd(static_cast<const char *>(tmpBuffer), sz);
                         _header = std::make_unique<GenericHeader>();
                         size_t headerLen =  _header->read(rd);
                         if ((headerLen <= _mapSize) &&
-                            FileSizeCalculator::extractFileSize(*_header,
-                                                                headerLen,
-                                                                fileName,
-                                                                sz)) {
+                            FileSizeCalculator::extractFileSize(*_header, headerLen, fileName, sz)) {
                             _size = sz - headerLen;
-                            _buffer = static_cast<char *>
-                                      (_mapBuffer) + headerLen;
+                            _buffer = static_cast<char *>(_mapBuffer) + headerLen;
                             badHeader = false;
                         }
                     }
                     if (badHeader) {
-                        throw IllegalStateException(
-                                make_string("bad file header: %s",
-                                        fileName.c_str()));
+                        throw IllegalStateException(make_string("bad file header: %s", fileName.c_str()));
                     }
                 } else {
-                    throw IllegalStateException(
-                            make_string("Failed mmaping '%s'"
-                                        " of size %" PRIu64 " errno(%d)",
-                                        fileName.c_str(),
-                                        static_cast<uint64_t>(sz),
-                                        errno));
+                    throw IllegalStateException(make_string("Failed mmaping '%s' of size %" PRIu64 " errno(%d)",
+                                                            fileName.c_str(), static_cast<uint64_t>(sz), errno));
                 }
             }
         } else {
-            throw IllegalStateException(
-                    make_string("Failed fstat '%s' of fd %d with result = %d",
-                                fileName.c_str(), fd.fd(), res));
+            throw IllegalStateException(make_string("Failed fstat '%s' of fd %d with result = %d",
+                                                    fileName.c_str(), fd.fd(), res));
         }
     } else {
-        throw IllegalStateException(
-                make_string("Failed opening '%s' for reading errno(%d)",
-                            fileName.c_str(), errno));
+        throw IllegalStateException(make_string("Failed opening '%s' for reading errno(%d)", fileName.c_str(), errno));
     }
 }
 
@@ -97,12 +81,9 @@ FileUtil::openFile(const vespalib::string &fileName)
     std::unique_ptr<Fast_BufferedFile> file(new Fast_BufferedFile());
     file->EnableDirectIO();
     if (!file->OpenReadOnly(fileName.c_str())) {
-        LOG(error, "could not open %s: %s",
-            file->GetFileName(), getLastErrorString().c_str());
+        LOG(error, "could not open %s: %s", file->GetFileName(), getLastErrorString().c_str());
         file->Close();
-        throw IllegalStateException(
-                make_string("Failed opening '%s' for direct IO reading.",
-                            file->GetFileName()));
+        throw IllegalStateException(make_string("Failed opening '%s' for direct IO reading.", file->GetFileName()));
     }
     return file;
 }
@@ -114,8 +95,7 @@ FileUtil::loadFile(const vespalib::string &fileName)
     LoadedBuffer::UP data(new LoadedMmap(fileName));
     FastOS_File file(fileName.c_str());
     if (!file.OpenReadOnly()) {
-        LOG(error, "could not open %s: %s",
-            file.GetFileName(), getLastErrorString().c_str());
+        LOG(error, "could not open %s: %s", file.GetFileName(), getLastErrorString().c_str());
     }
     file.Close();
     return data;
diff --git a/searchlib/src/vespa/searchlib/util/fileutil.h b/searchlib/src/vespa/searchlib/util/fileutil.h
index f809da8da5c..69d2cc557a6 100644
--- a/searchlib/src/vespa/searchlib/util/fileutil.h
+++ b/searchlib/src/vespa/searchlib/util/fileutil.h
@@ -23,65 +23,28 @@ public:
      **/
     class LoadedBuffer
     {
-    private:
-        LoadedBuffer(const LoadedBuffer & rhs);
-
-        LoadedBuffer &
-        operator =(const LoadedBuffer & rhs);
     protected:
         void * _buffer;
         size_t _size;
         std::unique_ptr<GenericHeader> _header;
     public:
+        LoadedBuffer(const LoadedBuffer & rhs) = delete;
+        LoadedBuffer & operator =(const LoadedBuffer & rhs) = delete;
         typedef std::unique_ptr<LoadedBuffer> UP;
 
         LoadedBuffer(void * buf, size_t sz)
             : _buffer(buf),
               _size(sz),
               _header(nullptr)
-        {
-        }
-
-        virtual
-        ~LoadedBuffer()
-        {
-        }
-
-        const void *
-        buffer() const
-        {
-            return _buffer;
-        }
-
-        const char *
-        c_str() const
-        {
-            return static_cast<const char *>(_buffer);
-        }
-
-        size_t
-        size() const
-        {
-            return _size;
-        }
-
-        bool
-        empty() const
-        {
-            return _size == 0;
-        }
-
-        size_t
-        size(size_t elemSize) const
-        {
-            return  _size/elemSize;
-        }
-
-        const GenericHeader &
-        getHeader() const
-        {
-            return *_header;
-        }
+        { }
+
+        virtual ~LoadedBuffer() { }
+        const void * buffer() const { return _buffer; }
+        const char *  c_str() const { return static_cast<const char *>(_buffer); }
+        size_t size() const { return _size; }
+        bool  empty() const { return _size == 0; }
+        size_t size(size_t elemSize) const { return  _size/elemSize; }
+        const GenericHeader &getHeader() const { return *_header; }
     };
 
     /**
@@ -94,23 +57,20 @@ public:
     public:
         LoadedMmap(const vespalib::string &fileName);
 
-        virtual
-        ~LoadedMmap();
+        virtual ~LoadedMmap();
     };
 
     /**
      * Opens and returns the file with the given name for reading.
      * Enables direct IO on the file.
      **/
-    static std::unique_ptr<Fast_BufferedFile>
-    openFile(const vespalib::string &fileName);
+    static std::unique_ptr<Fast_BufferedFile> openFile(const vespalib::string &fileName);
 
     /**
      * Loads and returns the file with the given name.
      * Mmaps the file into the returned buffer.
      **/
-    static LoadedBuffer::UP
-    loadFile(const vespalib::string &fileName);
+    static LoadedBuffer::UP loadFile(const vespalib::string &fileName);
 };
 
 class FileReaderBase