- Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/subcase.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/taint.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/subcase.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/taint.h"
{
struct merge *m = xmalloc (sizeof *m);
subcase_clone (&m->ordering, ordering);
{
struct merge *m = xmalloc (sizeof *m);
subcase_clone (&m->ordering, ordering);
merge_append (struct merge *m, struct casereader *r)
{
r = casereader_rename (r);
merge_append (struct merge *m, struct casereader *r)
{
r = casereader_rename (r);
- remove_element (m->inputs, m->input_cnt, sizeof *m->inputs, idx);
- m->input_cnt--;
+ remove_element (m->inputs, m->n_inputs, sizeof *m->inputs, idx);
+ m->n_inputs--;
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
if (subcase_compare_3way (&m->ordering, m->inputs[i].c,
&m->ordering, m->inputs[min].c) < 0)
min = i;
if (subcase_compare_3way (&m->ordering, m->inputs[i].c,
&m->ordering, m->inputs[min].c) < 0)
min = i;