diff options
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 2 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 4 | ||||
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 4 | ||||
| -rw-r--r-- | apt-inst/dirstream.cc | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 2585986d7..d6da802fe 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -309,7 +309,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) while (Size != 0) { unsigned char Junk[32*1024]; - unsigned long Read = MIN(Size,sizeof(Junk)); + unsigned long Read = min(Size,(unsigned long)sizeof(Junk)); if (InFd.Read(Junk,((Read+511)/512)*512) == false) return false; diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index ec930ca22..6daf00a27 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -21,6 +21,10 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/dirstream.h> +#include <algorithm> + +using std::min; + class ExtractTar { protected: diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index de781f44c..c6a0e80e6 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -67,7 +67,7 @@ static bool EraseDir(const char *Dir) if (Pid == 0) { execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(), - "rm","-rf","--",Dir,0); + "rm","-rf","--",Dir,(char *)NULL); _exit(100); } return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str()); @@ -380,7 +380,7 @@ bool debDpkgDB::ReadDiversions() bool debDpkgDB::ReadyFileList(OpProgress &Progress) { if (Cache == 0) - return _error->Error(_("The pkg cache must be initialize first")); + return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { Progress.OverallProgress(1,1,1,_("Reading file list")); diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index a8a4d9c0d..7ae93c9b0 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -42,15 +42,15 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd) int iFd = open(Itm.Name,O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, Itm.Mode); if (iFd < 0) - return _error->Errno("open",_("Failed write file %s"), + return _error->Errno("open",_("Failed to write file %s"), Itm.Name); // fchmod deals with umask and fchown sets the ownership if (fchmod(iFd,Itm.Mode) != 0) - return _error->Errno("fchmod",_("Failed write file %s"), + return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name); if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM) - return _error->Errno("fchown",_("Failed write file %s"), + return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name); Fd = iFd; return true; |