X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/dcd5856b11c685ca6d4629212d2978ce196ea65c..258b9e512c4001e806c5c0966acecd3d742ec6e9:/methods/http.h

diff --git a/methods/http.h b/methods/http.h
index c98fe8e5f..9e2b1da5c 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -87,7 +87,7 @@ class CircleBuf
    // Dump everything
    void Stats();
 
-   CircleBuf(unsigned long long Size);
+   explicit CircleBuf(unsigned long long Size);
    ~CircleBuf();
 };
 
@@ -99,23 +99,23 @@ struct HttpServerState: public ServerState
    int ServerFd;
 
    protected:
-   virtual bool ReadHeaderLines(std::string &Data);
-   virtual bool LoadNextResponse(bool const ToFile, FileFd * const File);
-   virtual bool WriteResponse(std::string const &Data);
+   virtual bool ReadHeaderLines(std::string &Data) APT_OVERRIDE;
+   virtual bool LoadNextResponse(bool const ToFile, FileFd * const File) APT_OVERRIDE;
+   virtual bool WriteResponse(std::string const &Data) APT_OVERRIDE;
 
    public:
-   virtual void Reset() { ServerState::Reset(); ServerFd = -1; };
+   virtual void Reset() APT_OVERRIDE { ServerState::Reset(); ServerFd = -1; };
 
-   virtual bool RunData(FileFd * const File);
+   virtual bool RunData(FileFd * const File) APT_OVERRIDE;
 
-   virtual bool Open();
-   virtual bool IsOpen();
-   virtual bool Close();
-   virtual bool InitHashes(FileFd &File);
-   virtual Hashes * GetHashes();
-   virtual bool Die(FileFd &File);
-   virtual bool Flush(FileFd * const File);
-   virtual bool Go(bool ToFile, FileFd * const File);
+   virtual bool Open() APT_OVERRIDE;
+   virtual bool IsOpen() APT_OVERRIDE;
+   virtual bool Close() APT_OVERRIDE;
+   virtual bool InitHashes(HashStringList const &ExpectedHashes) APT_OVERRIDE;
+   virtual Hashes * GetHashes() APT_OVERRIDE;
+   virtual bool Die(FileFd &File) APT_OVERRIDE;
+   virtual bool Flush(FileFd * const File) APT_OVERRIDE;
+   virtual bool Go(bool ToFile, FileFd * const File) APT_OVERRIDE;
 
    HttpServerState(URI Srv, HttpMethod *Owner);
    virtual ~HttpServerState() {Close();};
@@ -124,15 +124,12 @@ struct HttpServerState: public ServerState
 class HttpMethod : public ServerMethod
 {
    public:
-   virtual void SendReq(FetchItem *Itm);
+   virtual void SendReq(FetchItem *Itm) APT_OVERRIDE;
 
-   /** \brief Try to AutoDetect the proxy */
-   bool AutoDetectProxy();
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;
 
-   virtual bool Configuration(std::string Message);
-
-   virtual ServerState * CreateServerState(URI uri);
-   virtual void RotateDNS();
+   virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
+   virtual void RotateDNS() APT_OVERRIDE;
 
    protected:
    std::string AutoDetectProxyCmd;
@@ -140,7 +137,7 @@ class HttpMethod : public ServerMethod
    public:
    friend struct HttpServerState;
 
-   HttpMethod() : ServerMethod("1.2",Pipeline | SendConfig)
+   HttpMethod() : ServerMethod("http", "1.2",Pipeline | SendConfig)
    {
       File = 0;
       Server = 0;