gzip: Avoid use of u64

The gzip API uses the u64 type in it, which is not available in the host
build. This makes it impossible to include the header file.

We could make this type available, but it seems unnecessary. Limiting the
compression size to that of the 'unsigned long' type seems good enough. On
32-bit machines the limit then becomes 4GB, which likely exceeds available
RAM anyway, therefore it should be sufficient. On 64-bit machines this is
effectively u64 anyway.

Update the header file and implementation to use 'ulong' instead of 'u64'.

Add a definition of u32 for the cases that seem to need exactly that
length. This should be safe enough.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/compiler.h b/include/compiler.h
index 67e5205..6b0d3bf 100644 (file)
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -68,6 +68,9 @@ typedef uint32_t __u32;
 typedef unsigned int uint;
 typedef unsigned long ulong;
 
+/* Define these on the host so we can build some target code */
+typedef __u32 u32;
+
 #define uswap_16(x) \
        ((((x) & 0xff00) >> 8) | \
         (((x) & 0x00ff) << 8))

diff --git a/include/gzip.h b/include/gzip.h
index 783acbb..cb4db3d 100644 (file)
--- a/include/gzip.h
+++ b/include/gzip.h
@@ -54,11 +54,11 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
  *     gzwrite_progress_finish called at end of loop to
  *             indicate success (retcode=0) or failure
  */
-void gzwrite_progress_init(u64 expected_size);
+void gzwrite_progress_init(ulong expected_size);
 
-void gzwrite_progress(int iteration, u64 bytes_written, u64 total_bytes);
+void gzwrite_progress(int iteration, ulong bytes_written, ulong total_bytes);
 
-void gzwrite_progress_finish(int retcode, u64 totalwritten, u64 totalsize,
+void gzwrite_progress_finish(int retcode, ulong totalwritten, ulong totalsize,
                             u32 expected_crc, u32 calculated_crc);
 
 /**
@@ -74,7 +74,7 @@ void gzwrite_progress_finish(int retcode, u64 totalwritten, u64 totalsize,
  * @return 0 if OK, -1 on error
  */
 int gzwrite(unsigned char *src, int len, struct blk_desc *dev, ulong szwritebuf,
-           u64 startoffs, u64 szexpected);
+           ulong startoffs, ulong szexpected);
 
 /**
  * gzip()- Compress data into a buffer using the gzip algorithm

diff --git a/lib/gunzip.c b/lib/gunzip.c
index bee3b92..a8e498d 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -84,32 +84,32 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
 
 #ifdef CONFIG_CMD_UNZIP
 __weak
-void gzwrite_progress_init(u64 expectedsize)
+void gzwrite_progress_init(ulong expectedsize)
 {
        putc('\n');
 }
 
 __weak
 void gzwrite_progress(int iteration,
-                    u64 bytes_written,
-                    u64 total_bytes)
+                    ulong bytes_written,
+                    ulong total_bytes)
 {
        if (0 == (iteration & 3))
-               printf("%llu/%llu\r", bytes_written, total_bytes);
+               printf("%lu/%lu\r", bytes_written, total_bytes);
 }
 
 __weak
 void gzwrite_progress_finish(int returnval,
-                            u64 bytes_written,
-                            u64 total_bytes,
+                            ulong bytes_written,
+                            ulong total_bytes,
                             u32 expected_crc,
                             u32 calculated_crc)
 {
        if (0 == returnval) {
-               printf("\n\t%llu bytes, crc 0x%08x\n",
+               printf("\n\t%lu bytes, crc 0x%08x\n",
                       total_bytes, calculated_crc);
        } else {
-               printf("\n\tuncompressed %llu of %llu\n"
+               printf("\n\tuncompressed %lu of %lu\n"
                       "\tcrcs == 0x%08x/0x%08x\n",
                       bytes_written, total_bytes,
                       expected_crc, calculated_crc);
@@ -119,15 +119,15 @@ void gzwrite_progress_finish(int returnval,
 int gzwrite(unsigned char *src, int len,
            struct blk_desc *dev,
            unsigned long szwritebuf,
-           u64 startoffs,
-           u64 szexpected)
+           ulong startoffs,
+           ulong szexpected)
 {
        int i, flags;
        z_stream s;
        int r = 0;
        unsigned char *writebuf;
        unsigned crc = 0;
-       u64 totalfilled = 0;
+       ulong totalfilled = 0;
        lbaint_t blksperbuf, outblock;
        u32 expected_crc;
        u32 payload_size;
@@ -142,7 +142,7 @@ int gzwrite(unsigned char *src, int len,
        }
 
        if (startoffs & (dev->blksz-1)) {
-               printf("%s: start offset %llu not a multiple of %lu\n",
+               printf("%s: start offset %lu not a multiple of %lu\n",
                       __func__, startoffs, dev->blksz);
                return -1;
        }
@@ -182,12 +182,12 @@ int gzwrite(unsigned char *src, int len,
        if (szexpected == 0) {
                szexpected = le32_to_cpu(szuncompressed);
        } else if (szuncompressed != (u32)szexpected) {
-               printf("size of %llx doesn't match trailer low bits %x\n",
+               printf("size of %lx doesn't match trailer low bits %x\n",
                       szexpected, szuncompressed);
                return -1;
        }
        if (lldiv(szexpected, dev->blksz) > (dev->lba - outblock)) {
-               printf("%s: uncompressed size %llu exceeds device size\n",
+               printf("%s: uncompressed size %lu exceeds device size\n",
                       __func__, szexpected);
                return -1;
        }