summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire.h3
-rw-r--r--apt-pkg/clean.h1
-rw-r--r--apt-pkg/contrib/hashes.cc4
-rw-r--r--apt-pkg/contrib/hashes.h4
-rw-r--r--apt-pkg/contrib/md5.cc4
-rw-r--r--apt-pkg/contrib/md5.h2
-rw-r--r--apt-pkg/contrib/sha1.cc2
-rw-r--r--apt-pkg/contrib/sha1.h2
-rw-r--r--apt-pkg/indexcopy.h1
-rw-r--r--apt-pkg/indexfile.h1
-rw-r--r--apt-pkg/pkgcachegen.cc18
11 files changed, 26 insertions, 16 deletions
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 3e338b220..27bb3d363 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -100,8 +100,7 @@ class pkgAcquire
enum RunResult {Continue,Failed,Cancelled};
- RunResult Run() { return Run(500000); }; // Binary compatibility
- RunResult Run(int PulseIntervall);
+ RunResult Run(int PulseIntervall=500000);
void Shutdown();
// Simple iteration mechanism
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index ee65fcb61..43164e250 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -25,6 +25,7 @@ class pkgArchiveCleaner
public:
bool Go(string Dir,pkgCache &Cache);
+ virtual ~pkgArchiveCleaner() {};
};
#endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index af741b672..b17b94319 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -30,8 +30,8 @@ bool Hashes::AddFD(int Fd,unsigned long Size)
int Res = 0;
while (Size != 0)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+ Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
+ if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
return false;
Size -= Res;
MD5.Add(Buf,Res);
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 481ea88f8..40bbe00a0 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -20,6 +20,10 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
+#include <algorithm>
+
+using std::min;
+
class Hashes
{
public:
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 2bd745153..fded5c864 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -299,8 +299,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size)
int Res = 0;
while (Size != 0)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+ Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
+ if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
return false;
Size -= Res;
Add(Buf,Res);
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 47c6a7cec..9e20f7cef 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -28,8 +28,10 @@
#endif
#include <string>
+#include <algorithm>
using std::string;
+using std::min;
class MD5Summation;
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index 9b402c523..72eafd4ca 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -347,7 +347,7 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
while (Size != 0 || ToEOF)
{
unsigned n = sizeof(Buf);
- if (!ToEOF) n = MIN(Size,n);
+ if (!ToEOF) n = min(Size,(unsigned long)n);
Res = read(Fd,Buf,n);
if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
return false;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 7d25ceb0d..db8ca7893 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -19,8 +19,10 @@
#endif
#include <string>
+#include <algorithm>
using std::string;
+using std::min;
class SHA1Summation;
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index fa8e9c156..4dcb2b46d 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -43,6 +43,7 @@ class IndexCopy
bool CopyPackages(string CDROM,string Name,vector<string> &List,
pkgCdromStatus *log);
+ virtual ~IndexCopy() {};
};
class PackageCopy : public IndexCopy
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index be02669fa..61049f4bd 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -55,6 +55,7 @@ class pkgIndexFile
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};
Type();
+ virtual ~Type() {};
};
virtual const Type *GetType() const = 0;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 075af3eec..2340f97fd 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -114,7 +114,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
pkgCache::PkgIterator Pkg;
if (NewPackage(Pkg,PackageName) == false)
- return _error->Error(_("Error occured while processing %s (NewPackage)"),PackageName.c_str());
+ return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());
Counter++;
if (Counter % 100 == 0 && Progress != 0)
Progress->Progress(List.Offset());
@@ -126,7 +126,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
if (Version.empty() == true)
{
if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
- return _error->Error(_("Error occured while processing %s (UsePackage1)"),
+ return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
PackageName.c_str());
continue;
}
@@ -147,11 +147,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
if (Res == 0 && Ver->Hash == Hash)
{
if (List.UsePackage(Pkg,Ver) == false)
- return _error->Error(_("Error occured while processing %s (UsePackage2)"),
+ return _error->Error(_("Error occurred while processing %s (UsePackage2)"),
PackageName.c_str());
if (NewFileVer(Ver,List) == false)
- return _error->Error(_("Error occured while processing %s (NewFileVer1)"),
+ return _error->Error(_("Error occurred while processing %s (NewFileVer1)"),
PackageName.c_str());
// Read only a single record and return
@@ -181,15 +181,15 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
Ver->ParentPkg = Pkg.Index();
Ver->Hash = Hash;
if (List.NewVersion(Ver) == false)
- return _error->Error(_("Error occured while processing %s (NewVersion1)"),
+ return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
PackageName.c_str());
if (List.UsePackage(Pkg,Ver) == false)
- return _error->Error(_("Error occured while processing %s (UsePackage3)"),
+ return _error->Error(_("Error occurred while processing %s (UsePackage3)"),
PackageName.c_str());
if (NewFileVer(Ver,List) == false)
- return _error->Error(_("Error occured while processing %s (NewVersion2)"),
+ return _error->Error(_("Error occurred while processing %s (NewVersion2)"),
PackageName.c_str());
// Read only a single record and return
@@ -238,7 +238,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
if (Pkg.end() == true)
- return _error->Error(_("Error occured while processing %s (FindPkg)"),
+ return _error->Error(_("Error occurred while processing %s (FindPkg)"),
PackageName.c_str());
Counter++;
if (Counter % 100 == 0 && Progress != 0)
@@ -251,7 +251,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
{
if (List.CollectFileProvides(Cache,Ver) == false)
- return _error->Error(_("Error occured while processing %s (CollectFileProvides)"),PackageName.c_str());
+ return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str());
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:41:44 +0000