fix gcc warnings

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d36c47a49c2d84b65caf9a74efc3841a6c6df6b4..1fa7971c54cba862d32de53e23c39fc2a848aff4 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -850,7 +850,7 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
    instantiated to fetch the revision file */   
 pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
                         string URI,string URIDesc,string ShortDesc,
    instantiated to fetch the revision file */   
 pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
                         string URI,string URIDesc,string ShortDesc,

-                        HashStringList const  &ExpectedHash, string comprExt)
+                        HashStringList const  &ExpectedHash)

    : pkgAcqBaseIndex(Owner, 0, NULL, ExpectedHash, NULL), RealURI(URI)
 {
    AutoSelectCompression();
    : pkgAcqBaseIndex(Owner, 0, NULL, ExpectedHash, NULL), RealURI(URI)
 {
    AutoSelectCompression();


@@ -1035,7 +1035,7 @@ std::string pkgAcqIndex::GetFinalFilename(std::string const &URI,
 // AcqIndex::ReverifyAfterIMS - Reverify index after an ims-hit        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // AcqIndex::ReverifyAfterIMS - Reverify index after an ims-hit        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void pkgAcqIndex::ReverifyAfterIMS(std::string const &FileName)
+void pkgAcqIndex::ReverifyAfterIMS()

 {
    std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
    if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
 {
    std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
    if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")


@@ -1132,7 +1132,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList con
       // The files timestamp matches
       if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
       {
       // The files timestamp matches
       if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
       {

-         ReverifyAfterIMS(FileName);
+         ReverifyAfterIMS();

         return;
       }
       Decompression = true;
         return;
       }
       Decompression = true;


@@ -1154,7 +1154,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList con
    // The files timestamp matches
    if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
    {
    // The files timestamp matches
    if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
    {

-      ReverifyAfterIMS(FileName);
+      ReverifyAfterIMS();

       return;
     }
 
       return;
     }
 


@@ -1197,7 +1197,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList con
 /* The Translation file is added to the queue */
 pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
                            string URI,string URIDesc,string ShortDesc) 
 /* The Translation file is added to the queue */
 pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
                            string URI,string URIDesc,string ShortDesc) 

-  : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashStringList(), "")
+  : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashStringList())

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 6223243475575c3d907e12907de4b2f6e4151538..0741ae60d3d8cae61a1a74e4d857aa87323f4d75 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -353,7 +353,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item
    // transaction code
    void Add(Item *I);
    void AbortTransaction();
    // transaction code
    void Add(Item *I);
    void AbortTransaction();

-   bool TransactionHasError();
+   bool TransactionHasError() APT_PURE;

    void CommitTransaction();
 
    // helper for the signature warning
    void CommitTransaction();
 
    // helper for the signature warning


@@ -885,7 +885,7 @@ class pkgAcqIndex : public pkgAcqBaseIndex
                                 std::string const &compExt);
 
    /** \brief Schedule file for verification after a IMS hit */
                                 std::string const &compExt);
 
    /** \brief Schedule file for verification after a IMS hit */

-   void ReverifyAfterIMS(std::string const &FileName);
+   void ReverifyAfterIMS();

 
    public:
    
 
    public:
    


@@ -916,8 +916,7 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     *  fallback is ".gz" or none.
     */
    pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
     *  fallback is ".gz" or none.
     */
    pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,

-              std::string ShortDesc, HashStringList const &ExpectedHashes,
-              std::string compressExt="");
+              std::string ShortDesc, HashStringList const &ExpectedHashes);

    pkgAcqIndex(pkgAcquire *Owner, pkgAcqMetaBase *TransactionManager,
                IndexTarget const * const Target,
                HashStringList const &ExpectedHash,
    pkgAcqIndex(pkgAcquire *Owner, pkgAcqMetaBase *TransactionManager,
                IndexTarget const * const Target,
                HashStringList const &ExpectedHash,