Renamed pass and total_passes to ui_pass and ui_total_passes in class Packer.

committer: mfx <mfx> 975421199 +0000

src/p_lx_elf.cpp

@@ -283,8 +283,8 @@ void PackLinuxI386elf::pack(OutputFile *fo)
     Extent x;
     unsigned k;
 
-    // count
-    total_passes = 0;
+    // count passes, set ptload vars
+    ui_total_passes = 0;
     off_t ptload0hi = 0, ptload1lo = 0;
     int nx = 0;
     for (k = 0; k < ehdri.e_phnum; ++k) {
@@ -292,19 +292,19 @@ void PackLinuxI386elf::pack(OutputFile *fo)
             x.offset = phdri[k].p_offset;
             x.size   = phdri[k].p_filesz;
             if (0 == ptload0hi) {
-                ptload0hi = x.size + x.offset;
+                ptload0hi = x.offset + x.size;
             }
             else if (0 == ptload1lo) {
                 ptload1lo = x.offset;
             }
-            total_passes++;
+            ui_total_passes++;
         } else {
             if (nx++ == 0)
-                total_passes++;
+                ui_total_passes++;
         }
     }
     if (ptload0hi < ptload1lo)
-        total_passes++;
+        ui_total_passes++;
 
     // compress extents
     unsigned total_in = 0;
@@ -312,9 +312,9 @@ void PackLinuxI386elf::pack(OutputFile *fo)
 
     x.offset = 0;
     x.size = sizeof(Elf_LE32_Ehdr) + sz_phdrs;
-    pass = -1;
+    ui_pass = -1;
     packExtent(x, fo, total_in, total_out);
-    pass = 0;
+    ui_pass = 0;
 
     nx = 0;
     for (k = 0; k < ehdri.e_phnum; ++k) if (PT_LOAD==phdri[k].p_type) {

src/p_unix.cpp

@@ -126,9 +126,9 @@ void PackUnix::pack(OutputFile *fo)
     // compress blocks
     unsigned total_in = 0;
     unsigned total_out = 0;
-    this->total_passes = (file_size + blocksize - 1) / blocksize;
-    if (this->total_passes == 1)
-        this->total_passes = 0;
+    ui_total_passes = (file_size + blocksize - 1) / blocksize;
+    if (ui_total_passes == 1)
+        ui_total_passes = 0;
     fi->seek(0, SEEK_SET);
     for (;;)
     {

src/packer.cpp

@@ -41,7 +41,7 @@
 
 Packer::Packer(InputFile *f) :
     fi(f), file_size(-1), ph_format(-1), ph_version(-1),
-    uip(NULL), pass(0), total_passes(0), linker(NULL),
+    uip(NULL), ui_pass(0), ui_total_passes(0), linker(NULL),
     last_patch(NULL), last_patch_offset(0)
 {
     file_size = f->st.st_size;
@@ -189,9 +189,9 @@ bool Packer::compress(upx_bytep in, upx_bytep out,
     if ((level >= 7) || (level >= 4 && ph.u_len >= 512*1024))
         step = 0;
 #endif
-    if (this->pass >= 0)
-        this->pass++;
-    uip->startCallback(ph.u_len, step, this->pass, this->total_passes);
+    if (ui_pass >= 0)
+        ui_pass++;
+    uip->startCallback(ph.u_len, step, ui_pass, ui_total_passes);
     uip->firstCallback();
 
     //OutputFile::dump("data.raw", in, ph.u_len);
@@ -754,7 +754,7 @@ upx_byte *Packer::optimizeReloc32(upx_byte *in, unsigned relocnum,
         oc = get_le32(in+jc*4) - pc;
         if (oc == 0)
             continue;
-        else if (oc < 4)
+        else if ((int)oc < 4)
             throwCantPack("overlapping fixups");
         else if (oc < 0xF0)
             *fix++ = (unsigned char) oc;
@@ -886,9 +886,9 @@ const upx_byte *Packer::getLoader() const
 
 int Packer::getLoaderSize() const
 {
-    int l;
-    (void) linker->getLoader(&l);
-    return l;
+    int size;
+    (void) linker->getLoader(&size);
+    return size;
 }
 
 
@@ -1051,12 +1051,12 @@ void Packer::compressWithFilters(Filter *parm_ft, unsigned *parm_overlapoh,
 
     // update total_passes
     if (strategy < 0)
-        this->total_passes += 1;
+        ui_total_passes += 1;
     else
     {
         if (strategy > nfilters)
             nfilters = strategy;
-        this->total_passes += nfilters;
+        ui_total_passes += nfilters;
     }
 
     // Working buffer for compressed data. Don't waste memory.
@@ -1090,7 +1090,7 @@ void Packer::compressWithFilters(Filter *parm_ft, unsigned *parm_overlapoh,
         {
             // filter failed or was usesless
             if (strategy >= 0)
-                this->total_passes -= 1;
+                ui_total_passes -= 1;
             continue;
         }
         // filter success
@@ -1200,8 +1200,8 @@ void Packer::scanFilters(Filter *ft, const upx_byte *buf, unsigned buf_len,
         if (*f == 0)        // skip no-filter
             continue;
         ft->init(*f, addvalue);
-        //static const int pc[] = { 0xff, 0xfe, 0x80, 0x22, -1 };
-        //ft->preferred_ctos = pc;
+        //static const int ctos[] = { 0xff, 0xfe, 0x80, 0x22, -1 };
+        //ft->preferred_ctos = ctos;
         if (ft->scan(buf, buf_len))
         {
             printf("scanFilters: id 0x%02x size: %6d: calls %5d/%5d/%3d, cto 0x%02x\n",

src/packer.h

@@ -236,8 +236,8 @@ protected:
 
     // UI handler
     UiPacker *uip;
-    int pass;
-    int total_passes;
+    int ui_pass;
+    int ui_total_passes;
 
     // linker
     Linker *linker;