projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix uninitialized variable
[pspp-builds.git]
/
src
/
math
/
merge.c
diff --git
a/src/math/merge.c
b/src/math/merge.c
index d56a78c3ed4c08601e89644b2d754d5cc0ca5eb3..af44855ce1cbb7718dd18d48d459fc5cfe15fa8a 100644
(file)
--- a/
src/math/merge.c
+++ b/
src/math/merge.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
, 2009
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
@@
-21,10
+21,10
@@
#include <math/merge.h>
#include <math/merge.h>
-#include <data/case-ordering.h>
#include <data/case.h>
#include <data/casereader.h>
#include <data/casewriter.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>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <libpspp/taint.h>
@@
-36,24
+36,26
@@
struct merge_input
{
struct casereader *reader;
struct merge_input
{
struct casereader *reader;
- struct ccase c;
+ struct ccase
*
c;
};
struct merge
{
};
struct merge
{
- struct
case_ordering *
ordering;
+ struct
subcase
ordering;
struct merge_input inputs[MAX_MERGE_ORDER];
size_t input_cnt;
struct merge_input inputs[MAX_MERGE_ORDER];
size_t input_cnt;
+ struct caseproto *proto;
};
static void do_merge (struct merge *m);
struct merge *
};
static void do_merge (struct merge *m);
struct merge *
-merge_create (const struct
case_ordering *ordering
)
+merge_create (const struct
subcase *ordering, const struct caseproto *proto
)
{
struct merge *m = xmalloc (sizeof *m);
{
struct merge *m = xmalloc (sizeof *m);
-
m->ordering = case_ordering_clone (
ordering);
+
subcase_clone (&m->ordering,
ordering);
m->input_cnt = 0;
m->input_cnt = 0;
+ m->proto = caseproto_ref (proto);
return m;
}
return m;
}
@@
-64,9
+66,10
@@
merge_destroy (struct merge *m)
{
size_t i;
{
size_t i;
-
case_ordering_destroy (
m->ordering);
+
subcase_destroy (&
m->ordering);
for (i = 0; i < m->input_cnt; i++)
casereader_destroy (m->inputs[i].reader);
for (i = 0; i < m->input_cnt; i++)
casereader_destroy (m->inputs[i].reader);
+ caseproto_unref (m->proto);
free (m);
}
}
free (m);
}
}
@@
-95,8
+98,7
@@
merge_make_reader (struct merge *m)
}
else if (m->input_cnt == 0)
{
}
else if (m->input_cnt == 0)
{
- size_t value_cnt = case_ordering_get_value_cnt (m->ordering);
- struct casewriter *writer = mem_writer_create (value_cnt);
+ struct casewriter *writer = mem_writer_create (m->proto);
r = casewriter_make_reader (writer);
}
else
r = casewriter_make_reader (writer);
}
else
@@
-110,7
+112,8
@@
read_input_case (struct merge *m, size_t idx)
{
struct merge_input *i = &m->inputs[idx];
{
struct merge_input *i = &m->inputs[idx];
- if (casereader_read (i->reader, &i->c))
+ i->c = casereader_read (i->reader);
+ if (i->c)
return true;
else
{
return true;
else
{
@@
-129,7
+132,7
@@
do_merge (struct merge *m)
assert (m->input_cnt > 1);
assert (m->input_cnt > 1);
- w = tmpfile_writer_create (
case_ordering_get_value_cnt (m->ordering)
);
+ w = tmpfile_writer_create (
m->proto
);
for (i = 0; i < m->input_cnt; i++)
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
for (i = 0; i < m->input_cnt; i++)
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
@@
-143,11
+146,11
@@
do_merge (struct merge *m)
min = 0;
for (i = 1; i < m->input_cnt; i++)
min = 0;
for (i = 1; i < m->input_cnt; i++)
- if (
case_ordering_compare_cases (&m->inputs[i].c, &m->inputs[min
].c,
-
m->ordering
) < 0)
+ if (
subcase_compare_3way (&m->ordering, m->inputs[i
].c,
+
&m->ordering, m->inputs[min].c
) < 0)
min = i;
min = i;
- casewriter_write (w,
&
m->inputs[min].c);
+ casewriter_write (w, m->inputs[min].c);
read_input_case (m, min);
}
read_input_case (m, min);
}