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

Fix the following warning from gcc 4.2 in usr.bin/diff:

Browse Source 
usr.bin/diff/diffreg.c: In function 'change':
usr.bin/diff/diffreg.c:1085: warning: 'i' may be used uninitialized in this function

This version of gcc is not smart enough to see that 'i' cannot actually
be used unitialized.  However, the variable is confusingly re-used, so
it is better to give it another name, and clearly initialize it before
attempting to use it.

Reviewed by:	bapt
Differential Revision: https://reviews.freebsd.org/D10484
This commit is contained in:
dim 2017-04-24 20:34:56 +00:00
parent f20e16ee8c
commit 146ce2e05b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/diff/diffreg.c
View File

@ -1082,7 +1082,7 @@ change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d,
{
static size_t max_context = 64;
long curpos;
int i, nc;
int i, nc, f;
const char *walk;
restart:
@ -1214,9 +1214,10 @@ change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d,
if (a <= b && c <= d && diff_format == D_NORMAL)
diff_output("---\n");
}
f = 0;
if (diff_format != D_GFORMAT)
i = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
if (i != 0 && diff_format == D_EDIT) {
f = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
if (f != 0 && diff_format == D_EDIT) {
/*
* A non-zero return value for D_EDIT indicates that the
* last line printed was a bare dot (".") that has been
@ -1225,10 +1226,10 @@ change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d,
* back and restart where we left off.
*/
diff_output(".\n");
diff_output("%ds/.//\n", a + i - 1);
b = a + i - 1;
diff_output("%ds/.//\n", a + f - 1);
b = a + f - 1;
a = b + 1;
c += i;
c += f;
goto restart;
}
if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d)