Date: Mon, 9 Jul 2018 08:37:55 +0000 (UTC) From: Conrad Meyer <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336127 - head/usr.bin/gzip Message-ID: <201807090837.w698btiS062177@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Mon Jul 9 08:37:55 2018 New Revision: 336127 URL: https://svnweb.freebsd.org/changeset/base/336127 Log: gzip(1): Don't shadow global 'err' Unbreak work build on ppc due to -Werror=shadow. Introduced in r336121. X-MFC-With: r336121 Modified: head/usr.bin/gzip/gzip.c Modified: head/usr.bin/gzip/gzip.c ============================================================================== --- head/usr.bin/gzip/gzip.c Mon Jul 9 08:19:04 2018 (r336126) +++ head/usr.bin/gzip/gzip.c Mon Jul 9 08:37:55 2018 (r336127) @@ -1429,7 +1429,7 @@ file_uncompress(char *file, char *outfile, size_t outs 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 outs 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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807090837.w698btiS062177>