Override

6 files changed, 51 insertions, 132 deletions

diff --git a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h
index 1795d69ae14..789f7074f51 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.h
@@ -1,27 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author          Markus Bjartveit Kr�ger
-* @date            Creation date: 2001-10-30
-* @version         $Id$
-*
-* @file
-*
-* Generic buffered output stream
-*
-* Copyright (c)  : 2001 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+
 #pragma once
 
 #include <vespa/fastlib/io/filteroutputstream.h>
 
-
-
-
-
 class Fast_BufferedOutputStream : public Fast_FilterOutputStream
 {
   private:
@@ -47,15 +29,10 @@ class Fast_BufferedOutputStream : public Fast_FilterOutputStream
     Fast_BufferedOutputStream(Fast_OutputStream &out, size_t bufferSize = 1024);
 
     // Destructor
-    virtual ~Fast_BufferedOutputStream(void);
+    ~Fast_BufferedOutputStream();
 
     // Methods
-    virtual bool     Close(void);
-    virtual ssize_t  Write(const void *sourceBuffer, size_t length);
-    virtual void     Flush(void);
-
+    bool     Close() override;
+    ssize_t  Write(const void *sourceBuffer, size_t length) override;
+    void     Flush() override;
 };
-
-
-
-
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h
index 2505ae42d4e..122d1bb1eca 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.h
@@ -1,29 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author          Markus Bjartveit Kr�ger
-* @date            Creation date: 2000-11-22
-* @version         $Id$
-*
-* @file
-*
-* HTTP chunked input stream.
-*
-* Copyright (c)  : 2001 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
-
 
 #pragma once
 
 #include <vespa/fastlib/io/filterinputstream.h>
 
-
-
-
-
 class Fast_HTTPChunkedInputStream : public Fast_FilterInputStream
 {
   private:
@@ -38,14 +18,14 @@ class Fast_HTTPChunkedInputStream : public Fast_FilterInputStream
     bool ReadChunkHeader(void);
   public:
     Fast_HTTPChunkedInputStream(Fast_InputStream &in);
-    virtual ~Fast_HTTPChunkedInputStream(void);
+    ~Fast_HTTPChunkedInputStream();
 
 
     // Methods
-    virtual ssize_t Available(void);
-    virtual bool    Close(void);
-    virtual ssize_t Read(void *targetBuffer, size_t length);
-    virtual ssize_t Skip(size_t skipNBytes);
+    ssize_t Available() override;
+    bool    Close() override;
+    ssize_t Read(void *targetBuffer, size_t length) override;
+    ssize_t Skip(size_t skipNBytes) override;
 };
 
 
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h
index b845f3402a7..bc34d6f4dc7 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.h
@@ -1,29 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author          Markus Bjartveit Kr�ger
-* @date            Creation date: 2000-11-21
-* @version         $Id$
-*
-* @file
-*
-* HTTP chunked output stream.
-*
-* Copyright (c)  : 2001 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
-
 
 #pragma once
 
 #include <vespa/fastlib/io/filteroutputstream.h>
 
-
-
-
-
 class Fast_HTTPChunkedOutputStream : public Fast_FilterOutputStream
 {
   private:
@@ -39,13 +19,13 @@ class Fast_HTTPChunkedOutputStream : public Fast_FilterOutputStream
     bool WriteChunk(void);
   public:
     Fast_HTTPChunkedOutputStream(Fast_OutputStream &out, size_t chunkSize = 1024);
-    virtual ~Fast_HTTPChunkedOutputStream(void);
+    ~Fast_HTTPChunkedOutputStream();
 
 
     // Methods
-    virtual bool    Close(void);
-    virtual ssize_t Write(const void *sourceBuffer, size_t length);
-    virtual void    Flush(void);
+    bool    Close() override;
+    ssize_t Write(const void *sourceBuffer, size_t length) override;
+    void    Flush() override;
 };
 
 
diff --git a/fastlib/src/vespa/fastlib/net/httpserver.cpp b/fastlib/src/vespa/fastlib/net/httpserver.cpp
index 44e4dc6a8bc..92e95cede03 100644
--- a/fastlib/src/vespa/fastlib/net/httpserver.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpserver.cpp
@@ -1,30 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author          Stein Hardy Danielsen
-* @date            Creation date: 2000-1-7
-* @version         $Id$
-*
-* @file
-*
-* Generic http server and connection classes implementation
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
-
-#include <vespa/fastos/fastos.h>
+
+#include "url.h"
+#include "httpchunkedinputstream.h"
+#include "httpchunkedoutputstream.h"
+#include "httpheaderparser.h"
+#include "httpserver.h"
 #include <vespa/fastlib/io/bufferedinputstream.h>
 #include <vespa/fastlib/io/bufferedoutputstream.h>
-#include <vespa/fastlib/net/url.h>
-#include <vespa/fastlib/net/httpchunkedinputstream.h>
-#include <vespa/fastlib/net/httpchunkedoutputstream.h>
-#include <vespa/fastlib/net/httpheaderparser.h>
-#include <vespa/fastlib/net/httpserver.h>
 #include <vespa/fastlib/util/base64.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/fastos/file.h>
 
 /**
  * Helper class for hiding the details of HTTP entity encodings and
@@ -58,24 +43,22 @@ class Fast_HTTPPersistentInputFilter : public Fast_FilterInputStream
         _remainingBytes(0)
     { }
 
-    virtual ~Fast_HTTPPersistentInputFilter(void) {
+    ~Fast_HTTPPersistentInputFilter() {
       delete _chunkedInput;
     }
 
     // Methods
-    virtual ssize_t Available(void);
-    virtual bool    Close(void);
-    virtual ssize_t Read(void *sourceBuffer, size_t length);
-    virtual ssize_t Skip(size_t skipNBytes);
+    ssize_t Available() override;
+    bool    Close() override;
+    ssize_t Read(void *sourceBuffer, size_t length) override;
+    ssize_t Skip(size_t skipNBytes) override;
 
     void SetEntityLength(size_t entityLength);
-    void SetChunkedEncoding(void);
+    void SetChunkedEncoding();
 };
 
 
-
-
-ssize_t Fast_HTTPPersistentInputFilter::Available(void)
+ssize_t Fast_HTTPPersistentInputFilter::Available()
 {
   if (_useChunkedInput) {
     return _chunkedInput->Available();
@@ -92,7 +75,7 @@ ssize_t Fast_HTTPPersistentInputFilter::Available(void)
 
 
 
-bool Fast_HTTPPersistentInputFilter::Close(void)
+bool Fast_HTTPPersistentInputFilter::Close()
 {
   // Do nothing.
   return true;
@@ -143,7 +126,7 @@ void Fast_HTTPPersistentInputFilter::SetEntityLength(size_t entityLength)
 
 
 
-void Fast_HTTPPersistentInputFilter::SetChunkedEncoding(void)
+void Fast_HTTPPersistentInputFilter::SetChunkedEncoding()
 {
   _useChunkedInput = true;
   // TODO: If input stream interface is expanded to enable resetting
@@ -190,19 +173,19 @@ class Fast_HTTPPersistentOutputFilter : public Fast_FilterOutputStream
       _linePos(0)
     { }
 
-    virtual ~Fast_HTTPPersistentOutputFilter(void) {
+    ~Fast_HTTPPersistentOutputFilter() {
       delete _chunkedOutput;
     }
 
     // Methods
-    virtual bool     Close(void);
-    virtual ssize_t  Write(const void *sourceBuffer, size_t length);
-    virtual void     Flush(void);
+    bool     Close() override;
+    ssize_t  Write(const void *sourceBuffer, size_t length) override;
+    void     Flush() override;
 };
 
 
 
-bool Fast_HTTPPersistentOutputFilter::FlushHeader(void)
+bool Fast_HTTPPersistentOutputFilter::FlushHeader()
 {
   assert(_inHeaderRegion);
   size_t i = 0;
@@ -220,7 +203,7 @@ bool Fast_HTTPPersistentOutputFilter::FlushHeader(void)
 
 
 
-bool Fast_HTTPPersistentOutputFilter::Close(void)
+bool Fast_HTTPPersistentOutputFilter::Close()
 {
   bool retVal = true;
   if (_inHeaderRegion) {
diff --git a/fastlib/src/vespa/fastlib/net/httpserver.h b/fastlib/src/vespa/fastlib/net/httpserver.h
index c644f5ef57c..f23650d434f 100644
--- a/fastlib/src/vespa/fastlib/net/httpserver.h
+++ b/fastlib/src/vespa/fastlib/net/httpserver.h
@@ -92,7 +92,7 @@ private:
 
     virtual ~Fast_HTTPConnection(void);
 
-    void Run (FastOS_ThreadInterface *thisThread, void *params);
+    void Run (FastOS_ThreadInterface *thisThread, void *params) override;
     void Output(const char *outputString);
     void OutputData(const void *data, size_t len);
     void OutputFile(FastOS_FileInterface *file);
@@ -132,8 +132,7 @@ class Fast_HTTPServerSocketFactory : public FastOS_SocketFactory
     /**
     * Create a streaming socket object
     */
-    virtual FastOS_SocketInterface *CreateSocket()
-    {
+    FastOS_SocketInterface *CreateSocket() override {
       return new Fast_Socket(_readTimeout);
     }
 };
@@ -239,7 +238,7 @@ protected:
     void SetKeepAlive(bool keepAlive = true) { _keepAlive = keepAlive; }
     bool GetKeepAlive() { return _keepAlive; }
 
-    virtual void Run (FastOS_ThreadInterface *thisThread, void *params);
+    void Run (FastOS_ThreadInterface *thisThread, void *params) override;
 
     virtual int  Start(void);
     virtual void Stop(void);
diff --git a/fastlib/src/vespa/fastlib/net/socket.h b/fastlib/src/vespa/fastlib/net/socket.h
index ccd3a0dff23..f7fa9c9457c 100644
--- a/fastlib/src/vespa/fastlib/net/socket.h
+++ b/fastlib/src/vespa/fastlib/net/socket.h
@@ -27,31 +27,31 @@ private:
      *                          before timeout. -1 means wait forever.
      */
     Fast_Socket(int msReadTimeout = -1 /* no timeout */)
-      : _event(),
-	_readTimeout(msReadTimeout),
-	_lastReadTimedOut(false),
-	_eof(false)
+        : _event(),
+          _readTimeout(msReadTimeout),
+          _lastReadTimedOut(false),
+          _eof(false)
     {
     }
 
     ~Fast_Socket();
 
-    ssize_t Write(const void *sourceBuffer, size_t bufferSize);
-    ssize_t Read(void *targetBuffer, size_t bufferSize);
-    bool Close(void);
+    ssize_t Write(const void *sourceBuffer, size_t bufferSize) override;
+    ssize_t Read(void *targetBuffer, size_t bufferSize) override;
+    bool Close() override;
 
     bool LastReadTimedOut()          { return _lastReadTimedOut; }
     bool SeenEOF()                   { return _eof; }
 
-    Fast_InputStream  &GetInputStream(void)  { return *this; }
-    Fast_OutputStream &GetOutputStream(void) { return *this; }
+    Fast_InputStream  &GetInputStream()  { return *this; }
+    Fast_OutputStream &GetOutputStream() { return *this; }
 
 
     // Implementation of Fast_InputStream and Fast_OutputStream interfaces
 
-    void    Flush(void)              {                                           }
-    ssize_t Available (void)         { return 0;                                 }
-    ssize_t Skip (size_t skipNBytes) { (void) skipNBytes; return -1;             }
+    void    Flush()                  override {                                           }
+    ssize_t Available ()             override { return 0;                                 }
+    ssize_t Skip (size_t skipNBytes) override { (void) skipNBytes; return -1;             }
 
     void Interrupt();
 };