X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fmerge.c;h=b5745ceeea062f21ad061882814101df8d497ab8;hb=9aa6503e5f9407f221999e19901d5f437bcd2981;hp=5b0704d9c26850518041ad52f6457b23344b1952;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp diff --git a/src/math/merge.c b/src/math/merge.c index 5b0704d9c2..b5745ceeea 100644 --- a/src/math/merge.c +++ b/src/math/merge.c @@ -86,7 +86,7 @@ merge_append (struct merge *m, struct casereader *r) struct casereader * merge_make_reader (struct merge *m) { - struct casereader *r; + struct casereader *r = NULL; if (m->input_cnt > 1) do_merge (m); @@ -137,7 +137,7 @@ do_merge (struct merge *m) taint_propagate (casereader_get_taint (m->inputs[i].reader), casewriter_get_taint (w)); - for (i = 0; i < m->input_cnt; ) + for (i = 0; i < m->input_cnt;) if (read_input_case (m, i)) i++; while (m->input_cnt > 0)