hack around test-apt-update-unauth failure

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index ab0dd34076a75174a1a7d6569e0b35f37076efdc..45d1f7f63a94858731e3659fa0742e8fc0ec3622 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -11,37 +11,42 @@
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 

-#include <iostream>
+#include <apt-pkg/acquire-method.h>
+

 #include <curl/curl.h>
 #include <curl/curl.h>

+#include <iostream>
+#include <stddef.h>
+#include <string>

 
 #include "server.h"
 
 using std::cout;
 using std::endl;
 
 
 #include "server.h"
 
 using std::cout;
 using std::endl;
 

+class Hashes;

 class HttpsMethod;
 class FileFd;
 
 class HttpsServerState : public ServerState
 {
    protected:
 class HttpsMethod;
 class FileFd;
 
 class HttpsServerState : public ServerState
 {
    protected:

-   virtual bool ReadHeaderLines(std::string &Data) { return false; }
-   virtual bool LoadNextResponse(bool const ToFile, FileFd * const File) { return false; }
+   virtual bool ReadHeaderLines(std::string &/*Data*/) { return false; }
+   virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) { return false; }

 
    public:
 
    public:

-   virtual bool WriteResponse(std::string const &Data) { return false; }
+   virtual bool WriteResponse(std::string const &/*Data*/) { return false; }

 
    /** \brief Transfer the data from the socket */
 
    /** \brief Transfer the data from the socket */

-   virtual bool RunData(FileFd * const File) { return false; }
+   virtual bool RunData(FileFd * const /*File*/) { return false; }

 
    virtual bool Open() { return false; }
    virtual bool IsOpen() { return false; }
    virtual bool Close() { return false; }
 
    virtual bool Open() { return false; }
    virtual bool IsOpen() { return false; }
    virtual bool Close() { return false; }

-   virtual bool InitHashes(FileFd &File) { return false; }
+   virtual bool InitHashes(FileFd &/*File*/) { return false; }

    virtual Hashes * GetHashes() { return NULL; }
    virtual Hashes * GetHashes() { return NULL; }

-   virtual bool Die(FileFd &File) { return false; }
-   virtual bool Flush(FileFd * const File) { return false; }
-   virtual bool Go(bool ToFile, FileFd * const File) { return false; }
+   virtual bool Die(FileFd &/*File*/) { return false; }
+   virtual bool Flush(FileFd * const /*File*/) { return false; }
+   virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) { return false; }

 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};
 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};


@@ -64,10 +69,9 @@ class HttpsMethod : public pkgAcqMethod
 
    public:
    FileFd *File;
 
    public:
    FileFd *File;

-      
-   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), File(NULL)
+
+   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), Server(NULL), File(NULL)

    {
    {

-      File = 0;

       curl = curl_easy_init();
    };
 
       curl = curl_easy_init();
    };