merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back

[apt.git] / ftparchive / multicompress.cc

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 2fc8efcbfe142e3882480d79b9b249be219e1aa3..bb4beedf9c8b994ec9f92bf4d6dccdf88ae5419e 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -40,14 +40,14 @@ const MultiCompress::CompType MultiCompress::Compressors[] =
 // MultiCompress::MultiCompress - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* Setup the file outputs, compression modes and fork the writer child */
 // MultiCompress::MultiCompress - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* Setup the file outputs, compression modes and fork the writer child */

-MultiCompress::MultiCompress(string Output,string Compress,
-                            mode_t Permissions,bool Write)
+MultiCompress::MultiCompress(string const &Output,string const &Compress,
+                            mode_t const &Permissions,bool const &Write) :
+                       Permissions(Permissions)

 {
    Outputs = 0;
    Outputter = -1;
    Input = 0;
    UpdateMTime = 0;
 {
    Outputs = 0;
    Outputter = -1;
    Input = 0;
    UpdateMTime = 0;

-   this->Permissions = Permissions;

    
    /* Parse the compression string, a space separated lists of compresison
       types */
    
    /* Parse the compression string, a space separated lists of compresison
       types */


@@ -126,7 +126,7 @@ MultiCompress::~MultiCompress()
 /* This checks each compressed file to make sure it exists and returns
    stat information for a random file from the collection. False means
    one or more of the files is missing. */
 /* This checks each compressed file to make sure it exists and returns
    stat information for a random file from the collection. False means
    one or more of the files is missing. */

-bool MultiCompress::GetStat(string Output,string Compress,struct stat &St)
+bool MultiCompress::GetStat(string const &Output,string const &Compress,struct stat &St)

 {
    /* Parse the compression string, a space separated lists of compresison
       types */
 {
    /* Parse the compression string, a space separated lists of compresison
       types */


@@ -268,8 +268,8 @@ bool MultiCompress::Finalize(unsigned long &OutSize)
 /* This opens the compressor, either in compress mode or decompress 
    mode. FileFd is always the compressor input/output file, 
    OutFd is the created pipe, Input for Compress, Output for Decompress. */
 /* This opens the compressor, either in compress mode or decompress 
    mode. FileFd is always the compressor input/output file, 
    OutFd is the created pipe, Input for Compress, Output for Decompress. */

-bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd,
-                                int &OutFd,bool Comp)
+bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int const &FileFd,
+                                int &OutFd,bool const &Comp)

 {
    Pid = -1;
    
 {
    Pid = -1;
    


@@ -365,11 +365,11 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc)
 // MultiCompress::Child - The writer child                             /*{{{*/
 // ---------------------------------------------------------------------
 /* The child process forks a bunch of compression children and takes 
 // MultiCompress::Child - The writer child                             /*{{{*/
 // ---------------------------------------------------------------------
 /* The child process forks a bunch of compression children and takes 

-   input on FD and passes it to all the compressor childer. On the way it
+   input on FD and passes it to all the compressor child. On the way it

    computes the MD5 of the raw data. After this the raw data in the 
    original files is compared to see if this data is new. If the data
    is new then the temp files are renamed, otherwise they are erased. */
    computes the MD5 of the raw data. After this the raw data in the 
    original files is compared to see if this data is new. If the data
    is new then the temp files are renamed, otherwise they are erased. */

-bool MultiCompress::Child(int FD)
+bool MultiCompress::Child(int const &FD)

 {
    // Start the compression children.
    for (Files *I = Outputs; I != 0; I = I->Next)
 {
    // Start the compression children.
    for (Files *I = Outputs; I != 0; I = I->Next)