* Fix compilation warnings:

    - apt-pkg/contrib/configuration.cc: wrong argument type;
    - apt-pkg/deb/dpkgpm.cc: wrong signess;
    - apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
    - methods/https.cc:
      - type conversion;
      - unused variable;
      - changed SetupProxy() method to void;

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1b91205..6d71b6e 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -271,7 +271,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
       if(found) 
       {
         // queue the diffs
-        int last_space = Description.rfind(" ");
+        unsigned int last_space = Description.rfind(" ");
         if(last_space != string::npos)
            Description.erase(last_space, Description.size()-last_space);
         new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
@@ -884,8 +884,8 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
                                 string SigFile,
                                 const vector<struct IndexTarget*>* IndexTargets,
                                 indexRecords* MetaIndexParser) :
-   Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
-   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)
+   Item(Owner), RealURI(URI), SigFile(SigFile), IndexTargets(IndexTargets),
+   MetaIndexParser(MetaIndexParser), AuthPass(false), IMSHit(false)
 {
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7914bd0..3109fd7 100644 (file)
--- 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 %lu)"), CurLine, sizeof(Buffer));
+         return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer));
 
       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e5506d3..a63c4e4 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -385,7 +385,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
    // 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;
 
    // init the PackageOps map, go over the list of packages that
    // that will be [installed|configured|removed|purged] and add

diff --git a/debian/changelog b/debian/changelog
index cb86ce5..a97018a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 apt (0.7.4) UNRELEASED; urgency=low
 
   * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
+  * Fix compilation warnings:
+    - apt-pkg/contrib/configuration.cc: wrong argument type;
+    - apt-pkg/deb/dpkgpm.cc: wrong signess;
+    - apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
+    - methods/https.cc:
+      - type conversion;
+      - unused variable;
+      - changed SetupProxy() method to void;
 
  -- Otavio Salvador <otavio@ossystems.com.br>  Mon, 02 Jul 2007 13:27:54 -0300
 

diff --git a/methods/https.cc b/methods/https.cc
index b758e4a..e62d51f 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -50,13 +50,13 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {
-      me->Res.Size = dltotal;
+      me->Res.Size = (unsigned long)dltotal;
       me->URIStart(me->Res);
    }
    return 0;
 }
 
-bool HttpsMethod::SetupProxy()
+void HttpsMethod::SetupProxy()
 {
    URI ServerName = Queue->Uri;
 
@@ -84,7 +84,6 @@ bool HttpsMethod::SetupProxy()
    }
    
    // Determine what host and port to use based on the proxy settings
-   int Port = 0;
    string Host;   
    if (Proxy.empty() == true || Proxy.Host.empty() == true)
    {

diff --git a/methods/https.h b/methods/https.h
index 6620a10..638c181 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -29,7 +29,7 @@ class HttpsMethod : public pkgAcqMethod
    static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
    static int progress_callback(void *clientp, double dltotal, double dlnow, 
                                double ultotal, double ulnow);
-   bool SetupProxy();
+   void SetupProxy();
    CURL *curl;
    FetchResult Res;