From e76247cd60e09e31cdf5b7b1d1a8a5edcd49aa53 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Mon, 9 Jul 2018 08:37:55 +0000 Subject: [PATCH] gzip(1): Don't shadow global 'err' Unbreak work build on ppc due to -Werror=shadow. Introduced in r336121. X-MFC-With: r336121 --- usr.bin/gzip/gzip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c index 5658002f09e9..5155307d467d 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");