summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-08-03 18:59:39 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-08-03 18:59:39 +0200
commit4b7c5a3fe8e3dfc439fdad88f30e28964059a5e4 (patch)
treedd1a6b69ebe429fd76d089438622073887cf1898
parentb7f9f8fc3c7dc452e457bfd8ba51b198b6c29960 (diff)
* make apt -Wall clean
-rw-r--r--apt-pkg/cdrom.cc4
-rw-r--r--apt-pkg/contrib/configuration.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.cc5
-rw-r--r--apt-pkg/deb/dpkgpm.h6
-rwxr-xr-xtest/pre-upload-check.py1
5 files changed, 8 insertions, 10 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 4a688a5e1..96106c7a9 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -668,8 +668,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
DropRepeats(TransList,"");
if(log) {
msg.str("");
- ioprintf(msg, _("Found %i package indexes, %i source indexes, "
- "%i translation indexes and %i signatures\n"),
+ ioprintf(msg, _("Found %lu package indexes, %lu source indexes, "
+ "%lu translation indexes and %lu signatures\n"),
List.size(), SourceList.size(), TransList.size(),
SigList.size());
log->Update(msg.str(), STEP_SCAN);
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 3109fd7a5..7914bd07b 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -507,7 +507,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
CurLine++;
// This should be made to work instead, but this is better than looping
if (F.fail() && !F.eof())
- return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer));
+ return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer));
_strtabexpand(Buffer,sizeof(Buffer));
_strstrip(Buffer);
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 94215197c..168c31483 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -43,7 +43,7 @@ using namespace std;
// ---------------------------------------------------------------------
/* */
pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
- : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), PackagesDone(0)
+ : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), PackagesTotal(0)
{
}
/*}}}*/
@@ -770,9 +770,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
int _dpkgin = fd[0];
close(fd[1]); // close the write end of the pipe
- // the read buffers for the communication with dpkg
- char buf[2] = {0,0};
-
// the result of the waitpid call
int res;
close(slave);
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index c552b20c9..065c6c917 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -43,10 +43,10 @@ class pkgDPkgPM : public pkgPackageManager
// the dpkg states that are already done; the string is the package
// the int is the state that is already done (e.g. a package that is
// going to be install is already in state "half-installed")
- map<string,int> PackageOpsDone;
+ map<string,unsigned int> PackageOpsDone;
// progress reporting
- int PackagesDone;
- int PackagesTotal;
+ unsigned int PackagesDone;
+ unsigned int PackagesTotal;
struct Item
{
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 271d54f22..837a25023 100755
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -110,6 +110,7 @@ class testAptInstall(unittest.TestCase):
"installing %s failed (got %s)" % (self.pkg, res))
if __name__ == "__main__":
+ print "Runing simple testsuit on current apt-get and libapt"
if len(sys.argv) > 1 and sys.argv[1] == "-v":
stdout = sys.stdout
stderr = sys.stderr