Deprecate SPtrArray<T> and convert everyone to unique_ptr<T[]>

[apt.git] / methods / ftp.h

diff --git a/methods/ftp.h b/methods/ftp.h
index 119d0c7e8872bd51fb1f7437b4561da4ec1970eb..2c4e9f57ad7d0563eccaf32d2c3065ef2898228c 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,8 +10,10 @@
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
 #ifndef APT_FTP_H
 #define APT_FTP_H
 

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

 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/strutl.h>
 

+#include <sys/socket.h>

 #include <sys/types.h>
 #include <time.h>
 #include <string>
 #include <sys/types.h>
 #include <time.h>
 #include <string>


@@ -62,7 +64,8 @@ class FTPConn
    bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
    bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,

-           Hashes &MD5,bool &Missing);
+           Hashes &MD5,bool &Missing, unsigned long long MaximumSize,
+            pkgAcqMethod *Owner);

    
    FTPConn(URI Srv);
    ~FTPConn();
    
    FTPConn(URI Srv);
    ~FTPConn();


@@ -70,15 +73,15 @@ class FTPConn
 
 class FtpMethod : public pkgAcqMethod
 {
 
 class FtpMethod : public pkgAcqMethod
 {

-   virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(std::string Message);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;

    
    FTPConn *Server;
    
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
    
    FTPConn *Server;
    
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;

-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);

    
    public:
    
    
    public: