@@ -325,7 +325,7 @@ static int MainHeadSize;

 static long CurBlockPos,NextBlockPos;

-static unsigned long CurUnpRead, CurUnpWrite;

+static unsigned long CurUnpRead;

 static long UnpPackedSize;

 static long DestUnpSize;

@@ -535,7 +535,7 @@ int urarlib_list(int desc, ArchiveList_struct *list)

 #endif

   (*(DWORD*)list) = (DWORD)NULL;            /* init file list               */

   /* do while file is not extracted and there's no error                    */

-  while (TRUE)

+  for(;;)

   {

     int ReadBlockResult;

     if ((ReadBlockResult = ReadBlock(FILE_HEAD | READSUBBLOCK)) <= 0) /* read name of the next  */

@@ -1037,7 +1037,7 @@ BOOL ExtrFile(int desc)

         break;                              /* error, can't extract file!   */

       }

-      CurUnpRead=CurUnpWrite=0;

+      CurUnpRead=0;

       if ((*Password!=0) && (NewLhd.Flags & LHD_PASSWORD))

         Encryption=NewLhd.UnpVer;

       else

@@ -73,7 +73,7 @@

 int pefromupx (char *src, char *dst, int *dsize, uint32_t ep, uint32_t upx0, uint32_t upx1, uint32_t magic)

 {

   char *imports, *sections, *pehdr, *newbuf;

-  int sectcnt, upd=1, realstuffsz, align;

+  int sectcnt, upd=1, realstuffsz;

   int foffset=0xd0+0xf8;

   imports = dst + cli_readint32(src + ep - upx1 + magic);

@@ -108,7 +108,7 @@ int pefromupx (char *src, char *dst, int *dsize, uint32_t ep, uint32_t upx0, uin

     return 0;

   }

-  if (! (align = cli_readint32(pehdr+0x38))) {

+  if (! cli_readint32(pehdr+0x38)) {

     cli_dbgmsg("UPX: Cant align to a NULL bound - giving up rebuild\n");

     return 0;

   }

@@ -397,7 +397,7 @@ int upx_inflate2e(char *src, int ssize, char *dst, int *dsize, uint32_t upx0, ui

   int32_t backbytes, unp_offset = -1, myebx = 0;

   int scur=0, dcur=0, i, backsize, oob;

-  while (1) {

+  for(;;) {

     while ( (oob = doubleebx(src, &myebx, &scur, ssize)) ) {

       if (oob == -1)

         return -1;

@@ -408,7 +408,7 @@ int upx_inflate2e(char *src, int ssize, char *dst, int *dsize, uint32_t upx0, ui

     backbytes = 1;

-    while (1) {

+    for(;;) {

       if ( (oob = doubleebx(src, &myebx, &scur, ssize)) == -1 )

         return -1;

       backbytes = backbytes*2+oob;