d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gzip(1): Don't shadow global 'err'

Browse Source 
Unbreak work build on ppc due to -Werror=shadow.  Introduced in r336121.

X-MFC-With:		r336121
This commit is contained in:
Conrad Meyer 2018-07-09 08:37:55 +00:00
parent 8ff3cdd1b5
commit e76247cd60
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336127
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/gzip/gzip.c
View File

@ -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");