gzip(1): Don't shadow global 'err'
Unbreak work build on ppc due to -Werror=shadow. Introduced in r336121. X-MFC-With: r336121
This commit is contained in:
parent
8ff3cdd1b5
commit
e76247cd60
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336127
@ -1429,7 +1429,7 @@ file_uncompress(char *file, char *outfile, size_t outsize)
|
|||||||
unsigned char header1[4];
|
unsigned char header1[4];
|
||||||
enum filetype method;
|
enum filetype method;
|
||||||
int fd, ofd, zfd = -1;
|
int fd, ofd, zfd = -1;
|
||||||
int err;
|
int error;
|
||||||
size_t in_size;
|
size_t in_size;
|
||||||
#ifndef SMALL
|
#ifndef SMALL
|
||||||
ssize_t rv;
|
ssize_t rv;
|
||||||
@ -1602,9 +1602,9 @@ file_uncompress(char *file, char *outfile, size_t outsize)
|
|||||||
|
|
||||||
size = zuncompress(in, out, NULL, 0, NULL);
|
size = zuncompress(in, out, NULL, 0, NULL);
|
||||||
/* need to fclose() if ferror() is true... */
|
/* need to fclose() if ferror() is true... */
|
||||||
err = ferror(in);
|
error = ferror(in);
|
||||||
if (err | fclose(in)) {
|
if (error | fclose(in)) {
|
||||||
if (err)
|
if (error)
|
||||||
maybe_warn("failed infile");
|
maybe_warn("failed infile");
|
||||||
else
|
else
|
||||||
maybe_warn("failed infile fclose");
|
maybe_warn("failed infile fclose");
|
||||||
|
Loading…
Reference in New Issue
Block a user