diff options
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/cdrom.cc | 3 | ||||
| -rw-r--r-- | methods/ftp.cc | 3 | ||||
| -rw-r--r-- | methods/http.h | 14 | ||||
| -rw-r--r-- | methods/mirror.cc | 2 | ||||
| -rw-r--r-- | methods/rred.cc | 7 | ||||
| -rw-r--r-- | methods/rsh.h | 2 |
6 files changed, 18 insertions, 13 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc index b25fdf5a8..ae699dfc3 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -54,7 +54,8 @@ class CDROMMethod : public pkgAcqMethod CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | SendConfig | NeedsCleanup | Removable), - DatabaseLoaded(false), + DatabaseLoaded(false), + Debug(false), MountedByApt(false) { UdevCdroms.Dlopen(); diff --git a/methods/ftp.cc b/methods/ftp.cc index c2c485769..eb7fedd85 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -69,7 +69,8 @@ time_t FtpMethod::FailTime = 0; // --------------------------------------------------------------------- /* */ FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1), - DataListenFd(-1), ServerName(Srv) + DataListenFd(-1), ServerName(Srv), + ForceExtended(false), TryPassive(true) { Debug = _config->FindB("Debug::Acquire::Ftp",false); PasvAddr = 0; diff --git a/methods/http.h b/methods/http.h index aa96c6810..6302807c5 100644 --- a/methods/http.h +++ b/methods/http.h @@ -36,14 +36,14 @@ class CircleBuf static struct timeval BwReadTick; static const unsigned int BW_HZ; - unsigned long LeftRead() + unsigned long LeftRead() const { unsigned long Sz = Size - (InP - OutP); if (Sz > Size - (InP%Size)) Sz = Size - (InP%Size); return Sz; } - unsigned long LeftWrite() + unsigned long LeftWrite() const { unsigned long Sz = InP - OutP; if (InP > MaxGet) @@ -68,12 +68,12 @@ class CircleBuf // Control the write limit void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;} - bool IsLimit() {return MaxGet == OutP;}; - void Print() {cout << MaxGet << ',' << OutP << endl;}; + bool IsLimit() const {return MaxGet == OutP;}; + void Print() const {cout << MaxGet << ',' << OutP << endl;}; // Test for free space in the buffer - bool ReadSpace() {return Size - (InP - OutP) > 0;}; - bool WriteSpace() {return InP - OutP > 0;}; + bool ReadSpace() const {return Size - (InP - OutP) > 0;}; + bool WriteSpace() const {return InP - OutP > 0;}; // Dump everything void Reset(); @@ -113,7 +113,7 @@ struct ServerState URI ServerName; bool HeaderLine(string Line); - bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; + bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0; Encoding = Closes; time(&Date); ServerFd = -1; Pipeline = true;}; diff --git a/methods/mirror.cc b/methods/mirror.cc index 565df5327..cb24a06cf 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -54,7 +54,7 @@ using namespace std; */ MirrorMethod::MirrorMethod() - : HttpMethod(), DownloadedMirrorFile(false) + : HttpMethod(), DownloadedMirrorFile(false), Debug(false) { }; diff --git a/methods/rred.cc b/methods/rred.cc index 849973e1a..6c55880ca 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -51,7 +51,7 @@ protected: virtual bool Fetch(FetchItem *Itm); public: - RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig), Debug(false) {}; }; /*}}}*/ /** \brief applyFile - in reverse order with a tail recursion {{{ @@ -239,7 +239,9 @@ RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ return result; } /*}}}*/ -struct EdCommand { /*{{{*/ +/* struct EdCommand {{{*/ +#ifdef _POSIX_MAPPED_FILES +struct EdCommand { size_t data_start; size_t data_end; size_t data_lines; @@ -248,6 +250,7 @@ struct EdCommand { /*{{{*/ char type; }; #define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */ +#endif /*}}}*/ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ FileFd &out_file, Hashes *hash) const { diff --git a/methods/rsh.h b/methods/rsh.h index b06d5a94e..98ca6a88c 100644 --- a/methods/rsh.h +++ b/methods/rsh.h @@ -34,7 +34,7 @@ class RSHConn // Raw connection IO bool WriteMsg(string &Text,bool Sync,const char *Fmt,...); bool Connect(string Host, string User); - bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; + bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; // Connection control bool Open(); |