diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2018-07-09 08:37:55 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2018-07-09 08:37:55 +0000 |
| commit | e76247cd60e09e31cdf5b7b1d1a8a5edcd49aa53 (patch) | |
| tree | 0495d34f7ad14e7839ad95d4b485c2ed60d58577 /usr.bin/gzip | |
| parent | 8ff3cdd1b52f1a7baa92226eb73ab448afc974e8 (diff) | |
| download | src-test-e76247cd60e09e31cdf5b7b1d1a8a5edcd49aa53.tar.gz src-test-e76247cd60e09e31cdf5b7b1d1a8a5edcd49aa53.zip | |
gzip(1): Don't shadow global 'err'
Unbreak work build on ppc due to -Werror=shadow. Introduced in r336121.
X-MFC-With: r336121
Notes
Notes:
svn path=/head/; revision=336127
Diffstat (limited to 'usr.bin/gzip')
| -rw-r--r-- | usr.bin/gzip/gzip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c index 5658002f09e91..5155307d467d8 100644 --- a/usr.bin/gzip/gzip.c +++ b/usr.bin/gzip/gzip.c @@ -1429,7 +1429,7 @@ file_uncompress(char *file, char *outfile, size_t outsize) unsigned char header1[4]; enum filetype method; int fd, ofd, zfd = -1; - int err; + int error; size_t in_size; #ifndef SMALL ssize_t rv; @@ -1602,9 +1602,9 @@ file_uncompress(char *file, char *outfile, size_t outsize) size = zuncompress(in, out, NULL, 0, NULL); /* need to fclose() if ferror() is true... */ - err = ferror(in); - if (err | fclose(in)) { - if (err) + error = ferror(in); + if (error | fclose(in)) { + if (error) maybe_warn("failed infile"); else maybe_warn("failed infile fclose"); |