mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-12 11:10:07 +00:00
shut up gcc!
This commit is contained in:
parent
85b8545edb
commit
3ca675a579
4 changed files with 9 additions and 9 deletions
|
@ -189,7 +189,7 @@ gunzip(int ofd, char *ofile, Biobuf *bin)
|
|||
if(!table && verbose)
|
||||
fprint(2, "extracting %s to %s\n", h.file, ofile);
|
||||
|
||||
err = inflate((void*)ofd, crcwrite, bin, (int(*)(void*))Bgetc);
|
||||
err = inflate((void*)(uintptr)ofd, crcwrite, bin, (int(*)(void*))Bgetc);
|
||||
if(err != FlateOk)
|
||||
error("inflate failed: %s", flateerr(err));
|
||||
|
||||
|
@ -324,7 +324,7 @@ crcwrite(void *out, void *buf, int n)
|
|||
|
||||
wlen += n;
|
||||
crc = blockcrc(crctab, crc, buf, n);
|
||||
fd = (int)out;
|
||||
fd = (int)(uintptr)out;
|
||||
if(fd < 0)
|
||||
return n;
|
||||
nw = write(fd, buf, n);
|
||||
|
|
|
@ -180,7 +180,7 @@ gzip(char *file, long mtime, int ifd, Biobuf *bout)
|
|||
crc = 0;
|
||||
eof = 0;
|
||||
totr = 0;
|
||||
err = deflate(bout, gzwrite, (void*)ifd, crcread, level, debug);
|
||||
err = deflate(bout, gzwrite, (void*)(uintptr)ifd, crcread, level, debug);
|
||||
if(err != FlateOk){
|
||||
fprint(2, "gzip: deflate failed: %s\n", flateerr(err));
|
||||
return 0;
|
||||
|
@ -206,7 +206,7 @@ crcread(void *fd, void *buf, int n)
|
|||
|
||||
nr = 0;
|
||||
for(; !eof && n > 0; n -= m){
|
||||
m = read((int)fd, (char*)buf+nr, n);
|
||||
m = read((int)(uintptr)fd, (char*)buf+nr, n);
|
||||
if(m <= 0){
|
||||
eof = 1;
|
||||
if(m < 0)
|
||||
|
|
|
@ -441,7 +441,7 @@ unzipEntry(Biobuf *bin, ZipHead *czh)
|
|||
error("copying data for %s failed: %r", zh.file);
|
||||
}else if(zh.meth == 8){
|
||||
off = Boffset(bin);
|
||||
err = inflate((void*)fd, crcwrite, bin, (int(*)(void*))Bgetc);
|
||||
err = inflate((void*)(uintptr)fd, crcwrite, bin, (int(*)(void*))Bgetc);
|
||||
if(err != FlateOk)
|
||||
error("inflate failed: %s", flateerr(err));
|
||||
rlen = Boffset(bin) - off;
|
||||
|
@ -650,7 +650,7 @@ crcwrite(void *out, void *buf, int n)
|
|||
|
||||
wlen += n;
|
||||
crc = blockcrc(crctab, crc, buf, n);
|
||||
fd = (int)out;
|
||||
fd = (int)(uintptr)out;
|
||||
if(fd < 0)
|
||||
return n;
|
||||
nw = write(fd, buf, n);
|
||||
|
@ -673,7 +673,7 @@ copyout(int ofd, Biobuf *bin, long len)
|
|||
if(n <= 0)
|
||||
return 0;
|
||||
rlen += n;
|
||||
if(crcwrite((void*)ofd, buf, n) != n)
|
||||
if(crcwrite((void*)(uintptr)ofd, buf, n) != n)
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
|
|
|
@ -169,7 +169,7 @@ zip(Biobuf *bout, char *file, int stdout)
|
|||
eof = 0;
|
||||
totr = 0;
|
||||
totw = 0;
|
||||
err = deflate(bout, zwrite, (void*)fd, crcread, level, debug);
|
||||
err = deflate(bout, zwrite, (void*)(uintptr)fd, crcread, level, debug);
|
||||
if(err != FlateOk)
|
||||
error("deflate failed: %s: %r", flateerr(err));
|
||||
|
||||
|
@ -324,7 +324,7 @@ crcread(void *fd, void *buf, int n)
|
|||
|
||||
nr = 0;
|
||||
for(; !eof && n > 0; n -= m){
|
||||
m = read((int)fd, (char*)buf+nr, n);
|
||||
m = read((int)(uintptr)fd, (char*)buf+nr, n);
|
||||
if(m <= 0){
|
||||
eof = 1;
|
||||
if(m < 0)
|
||||
|
|
Loading…
Reference in a new issue