X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=x86_64%2Fgzip.c;h=13d15cc512b9430af4a4ec03e590981645ebfea3;hb=refs%2Fheads%2Fmaster;hp=fdac155221959ba1628e26bad2d77d0c78b3367e;hpb=d38858b0a1d960e82104939c810e6d4f30cbe6b0;p=debian%2Felilo diff --git a/x86_64/gzip.c b/x86_64/gzip.c index fdac155..13d15cc 100644 --- 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; @@ -165,7 +165,9 @@ fill_inbuf(void) if (EFI_ERROR(status)) { error("elilo: Read failed"); } +#ifdef DEBUG_GZIP DBG_PRT((L"%s : read %d bytes of %d bytes\n", LD_NAME, nread, expected)); +#endif insize = nread; inptr = 1; @@ -280,7 +282,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,12 +435,13 @@ 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; - +#ifdef DEBUG_GZIP DBG_PRT((L"%s : flush_window outnct=%d file_offset=%ld\n", LD_NAME, outcnt, file_offset)); +#endif Print(L"%c\b",helicopter[heli_count++%4]); @@ -471,7 +474,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 +488,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();