Imported Upstream version 3.10

[debian/elilo] / x86_64 / gzip.c

diff --git a/x86_64/gzip.c b/x86_64/gzip.c
index fdac155221959ba1628e26bad2d77d0c78b3367e..c683c503bb59917b51b786a93261ec30bbe3be1e 100644 (file)
--- a/x86_64/gzip.c
+++ b/x86_64/gzip.c
@@ -156,7 +156,7 @@ gzip_free(void *where)
 int
 fill_inbuf(void)
 {
-       INTN expected, nread;
+       UINTN expected, nread;
        EFI_STATUS status;
 
        expected = nread = INBUFSIZE;
@@ -280,7 +280,7 @@ analyze_chunks(void)
  * the relevant header information.
  */
 int
-first_block (const char *buf, long blocksize)
+first_block (const unsigned char *buf, long blocksize)
 {
        Elf64_Ehdr *elf;
        Elf64_Phdr *phdrs;
@@ -433,7 +433,7 @@ flush_window(void)
        static const CHAR8 helicopter[4] = { '|' , '/' , '-' , '\\' };
        static UINTN heli_count;
        struct segment *cp;
-       char    *src, *dst;
+       unsigned char   *src, *dst;
        long    cnt;
 
        if (!outcnt) return;
@@ -471,7 +471,7 @@ tail:
                file_offset += skip;
                outcnt      -= skip;
        }
-       dst = (char *)cp->addr + (file_offset - cp->offset);
+       dst = (unsigned char *)cp->addr + (file_offset - cp->offset);
        cnt = cp->offset + cp->size - file_offset;
        if (cnt > outcnt) 
                cnt = outcnt;
@@ -485,7 +485,7 @@ tail:
        /* See if we are at the end of this chunk */
        if (file_offset == cp->offset + cp->size) {
                if (cp->bss_sz) {
-                       dst = (char *)cp->addr + cp->size;
+                       dst = (unsigned char *)cp->addr + cp->size;
                        Memset(dst, 0, cp->bss_sz);
                }
                nextchunk();