Cleanups.

committer: mfx <mfx> 978636047 +0000

src/main.cpp

@@ -957,9 +957,13 @@ void upx_sanity_check(void)
     COMPILE_TIME_ASSERT(sizeof(long) >= 4);
     COMPILE_TIME_ASSERT(sizeof(void *) >= 4);
     COMPILE_TIME_ASSERT(sizeof(long) >= sizeof(void *));
-    COMPILE_TIME_ASSERT(((size_t) -1) > 0);
-    COMPILE_TIME_ASSERT(((ptrdiff_t) -1) < 0);
+
+    COMPILE_TIME_ASSERT(sizeof(off_t) >= sizeof(long));
     COMPILE_TIME_ASSERT(((off_t) -1) < 0);
+    COMPILE_TIME_ASSERT(sizeof(ptrdiff_t) >= sizeof(int));
+    COMPILE_TIME_ASSERT(((ptrdiff_t) -1) < 0);
+    COMPILE_TIME_ASSERT(sizeof(size_t) >= sizeof(int));
+    COMPILE_TIME_ASSERT(((size_t) -1) > 0);
 
     COMPILE_TIME_ASSERT(sizeof(BE16) == 2);
     COMPILE_TIME_ASSERT(sizeof(BE32) == 4);

src/p_unix.cpp

@@ -67,7 +67,7 @@ bool PackUnix::canPack()
 
     // info: currently the header is 36 (32+4) bytes before EOF
     unsigned char buf[256];
-    fi->seek(-(long)sizeof(buf), SEEK_END);
+    fi->seek(-(off_t)sizeof(buf), SEEK_END);
     fi->readx(buf, sizeof(buf));
     checkAlreadyPacked(buf, sizeof(buf));
 

src/packer.cpp

@@ -497,7 +497,7 @@ void Packer::copyOverlay(OutputFile *fo, unsigned overlay,
     }
     info("Copying overlay: %d bytes", overlay);
     if (do_seek)
-        fi->seek(-(long)overlay, SEEK_END);
+        fi->seek(-(off_t)overlay, SEEK_END);
 
     // get buffer size, align to improve i/o speed
     unsigned buf_size = buf->getSize();