Fix the following warning from gcc 4.2 in usr.bin/diff:
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:
parent
eb23aa8008
commit
7ef35d05aa
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=317381
@ -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;
|
static size_t max_context = 64;
|
||||||
long curpos;
|
long curpos;
|
||||||
int i, nc;
|
int i, nc, f;
|
||||||
const char *walk;
|
const char *walk;
|
||||||
|
|
||||||
restart:
|
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)
|
if (a <= b && c <= d && diff_format == D_NORMAL)
|
||||||
diff_output("---\n");
|
diff_output("---\n");
|
||||||
}
|
}
|
||||||
|
f = 0;
|
||||||
if (diff_format != D_GFORMAT)
|
if (diff_format != D_GFORMAT)
|
||||||
i = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
|
f = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
|
||||||
if (i != 0 && diff_format == D_EDIT) {
|
if (f != 0 && diff_format == D_EDIT) {
|
||||||
/*
|
/*
|
||||||
* A non-zero return value for D_EDIT indicates that the
|
* A non-zero return value for D_EDIT indicates that the
|
||||||
* last line printed was a bare dot (".") that has been
|
* 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.
|
* back and restart where we left off.
|
||||||
*/
|
*/
|
||||||
diff_output(".\n");
|
diff_output(".\n");
|
||||||
diff_output("%ds/.//\n", a + i - 1);
|
diff_output("%ds/.//\n", a + f - 1);
|
||||||
b = a + i - 1;
|
b = a + f - 1;
|
||||||
a = b + 1;
|
a = b + 1;
|
||||||
c += i;
|
c += f;
|
||||||
goto restart;
|
goto restart;
|
||||||
}
|
}
|
||||||
if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d)
|
if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d)
|
||||||
|
Loading…
Reference in New Issue
Block a user