From bdca6affe8efdbf294e00aea5468ef066c1a031c Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 21 Jan 2010 06:34:49 -0800 Subject: * match.c (match_files): Reduce scope, and bogus use of, dataline variable. --- ChangeLog | 5 +++++ match.c | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cac2137..96c99930 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-21 Kaz Kylheku + + * match.c (match_files): Reduce scope, and bogus use of, dataline + variable. + 2010-01-19 Kaz Kylheku Version 030 diff --git a/match.c b/match.c index a160d04f..04554cff 100644 --- a/match.c +++ b/match.c @@ -914,7 +914,6 @@ static val match_files(val spec, val files, repeat_spec_same_data: { val specline = rest(first(spec)); - val dataline = first(data); val spec_linenum = first(first(spec)); val first_spec = first(specline); @@ -936,7 +935,7 @@ repeat_spec_same_data: { uw_block_begin(nil, result); - while (dataline && (!max || reps++ < cmax)) { + while (data && (!max || reps++ < cmax)) { result = match_files(spec, files, bindings, data, num(data_lineno)); @@ -950,7 +949,6 @@ repeat_spec_same_data: num(data_lineno), nao); data = rest(data); data_lineno++; - dataline = first(data); } uw_block_end; @@ -1706,10 +1704,8 @@ repeat_spec_same_data: } } - if (dataline == nil) - return nil; - { + val dataline = first(data); cons_bind (new_bindings, success, match_line(bindings, specline, dataline, zero, spec_linenum, num(data_lineno), first(files))); -- cgit v1.2.3