|
|
@ -469,7 +469,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
|
|
|
|
for (f = 0; f < 2; f++)
|
|
|
|
for (f = 0; f < 2; f++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
lin end = filevec[f].buffered_lines;
|
|
|
|
lin end = filevec[f].buffered_lines;
|
|
|
|
register char *discards = discarded[f];
|
|
|
|
char *discards = discarded[f];
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < end; i++)
|
|
|
|
for (i = 0; i < end; i++)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -479,7 +479,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
|
|
|
|
else if (discards[i] != 0)
|
|
|
|
else if (discards[i] != 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/* We have found a nonprovisional discard. */
|
|
|
|
/* We have found a nonprovisional discard. */
|
|
|
|
register lin j;
|
|
|
|
lin j;
|
|
|
|
lin length;
|
|
|
|
lin length;
|
|
|
|
lin provisional = 0;
|
|
|
|
lin provisional = 0;
|
|
|
|
|
|
|
|
|
|
|
@ -511,7 +511,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
register lin consec;
|
|
|
|
lin consec;
|
|
|
|
lin minimum = 1;
|
|
|
|
lin minimum = 1;
|
|
|
|
lin tem = length >> 2;
|
|
|
|
lin tem = length >> 2;
|
|
|
|
|
|
|
|
|
|
|
|