-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <data/casewriter.h>
#include <data/casewriter-provider.h>
#include <data/settings.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <math/merge.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
struct casewriter *
sort_create_writer (struct case_ordering *ordering)
{
+ size_t value_cnt = case_ordering_get_value_cnt (ordering);
struct sort_writer *sort;
sort = xmalloc (sizeof *sort);
case_ordering_destroy (ordering);
- return casewriter_create (&sort_casewriter_class, sort);
+ return casewriter_create (value_cnt, &sort_casewriter_class, sort);
}
static void
pq = xmalloc (sizeof *pq);
pq->ordering = case_ordering_clone (ordering);
pq->record_cap
- = get_workspace_cases (case_ordering_get_value_cnt (ordering));
+ = settings_get_workspace_cases (case_ordering_get_value_cnt (ordering));
if (pq->record_cap > max_buffers)
pq->record_cap = max_buffers;
else if (pq->record_cap < min_buffers)