accept only the expected UTC timezones in date parsing

[apt.git] / apt-inst / contrib / extracttar.cc

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index c21a336f0e1e4bd6cfdf2fa43ede8cd994416373..60360053ed394364fda36b074a8355405423e6da 100644 (file)
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -73,18 +73,18 @@ ExtractTar::ExtractTar(FileFd &Fd,unsigned long long Max,string DecompressionPro
 ExtractTar::~ExtractTar()
 {
    // Error close
 ExtractTar::~ExtractTar()
 {
    // Error close

-   Done(true);
+   Done();

 }
                                                                        /*}}}*/
 // ExtractTar::Done - Reap the gzip sub process                                /*{{{*/
 }
                                                                        /*}}}*/
 // ExtractTar::Done - Reap the gzip sub process                                /*{{{*/

-// ---------------------------------------------------------------------
-/* If the force flag is given then error messages are suppressed - this
-   means we hit the end of the tar file but there was still gzip data. */
-bool ExtractTar::Done(bool Force)
+bool ExtractTar::Done(bool)
+{
+   return Done();
+}
+bool ExtractTar::Done()

 {
    return InFd.Close();
 }
 {
    return InFd.Close();
 }

-

                                                                        /*}}}*/
 // ExtractTar::StartGzip - Startup gzip                                        /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ExtractTar::StartGzip - Startup gzip                                        /*{{{*/
 // ---------------------------------------------------------------------


@@ -101,7 +101,7 @@ bool ExtractTar::StartGzip()
 
    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
 
    std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
    std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();

-   for (; compressor != compressors.end(); compressor++) {
+   for (; compressor != compressors.end(); ++compressor) {

       if (compressor->Name == DecompressProg) {
         return InFd.OpenDescriptor(File.Fd(), FileFd::ReadOnly, *compressor, false);
       }
       if (compressor->Name == DecompressProg) {
         return InFd.OpenDescriptor(File.Fd(), FileFd::ReadOnly, *compressor, false);
       }


@@ -151,7 +151,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       /* Check for a block of nulls - in this case we kill gzip, GNU tar
                 does this.. */
       if (NewSum == ' '*sizeof(Tar->Checksum))
       /* Check for a block of nulls - in this case we kill gzip, GNU tar
                 does this.. */
       if (NewSum == ' '*sizeof(Tar->Checksum))

-        return Done(true);
+        return Done();

       
       if (NewSum != CheckSum)
         return _error->Error(_("Tar checksum failed, archive corrupted"));
       
       if (NewSum != CheckSum)
         return _error->Error(_("Tar checksum failed, archive corrupted"));


@@ -306,6 +306,6 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       LastLongLink.erase();
    }
    
       LastLongLink.erase();
    }
    

-   return Done(false);
+   return Done();

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/