commit - 755142eaf116858c71b8f3838057537739289e5a
commit + f5d549b5bd0aea272b9ba11172ab2a1c7e09c3b6
blob - 157aa9576a89e6901e92e364843261452ef73b6b
blob + 37e980d7221af377e329bdaac4bb55eced6d8906
--- lib/diffreg.c
+++ lib/diffreg.c
static int
ignoreline(char *line)
{
+ free(line);
return 0; /* do not ignore any lines */
}
if (args->diff_format != D_IFDEF && a > b && c > d)
return (0);
if (args->ignore_pats != NULL) {
+ char *line;
/*
* All lines in the change, insert, or delete must
* match an ignore pattern for the change to be
*/
if (a <= b) { /* Changes and deletes. */
for (i = a; i <= b; i++) {
- char *line = preadline(fileno(f1),
+ line = preadline(fileno(f1),
ds->ixold[i] - ds->ixold[i - 1],
ds->ixold[i - 1]);
if (line == NULL)
return (-1);
- if (!ignoreline(line)) {
- free(line);
+ if (!ignoreline(line))
goto proceed;
- }
- free(line);
}
}
if (a > b || c <= d) { /* Changes and inserts. */
for (i = c; i <= d; i++) {
- char *line = preadline(fileno(f2),
+ line = preadline(fileno(f2),
ds->ixnew[i] - ds->ixnew[i - 1],
ds->ixnew[i - 1]);
if (line == NULL)
return (-1);
- if (!ignoreline(line)) {
- free(line);
+ if (!ignoreline(line))
goto proceed;
- }
- free(line);
}
}
return (0);