X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint-space.c;h=3f73ee25a8de16fb1f1883608e2c6fa8cf25fdba;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=da8537a1656e175dec4a4dd2c8225316fd5b4e4f;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git
diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c
index da8537a1..3f73ee25 100644
--- a/src/language/data-io/print-space.c
+++ b/src/language/data-io/print-space.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2006, 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 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 . */
#include
@@ -82,27 +80,29 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds)
if (handle != NULL)
{
writer = dfm_open_writer (handle);
- if (writer == NULL)
+ if (writer == NULL)
{
+ fh_unref (handle);
expr_free (expr);
return CMD_FAILURE;
- }
+ }
}
else
writer = NULL;
-
+
trns = xmalloc (sizeof *trns);
trns->writer = writer;
trns->expr = expr;
add_transformation (ds,
print_space_trns_proc, print_space_trns_free, trns);
+ fh_unref (handle);
return CMD_SUCCESS;
}
/* Executes a PRINT SPACE transformation. */
static int
-print_space_trns_proc (void *t_, struct ccase *c,
+print_space_trns_proc (void *t_, struct ccase **c,
casenumber case_num UNUSED)
{
struct print_space_trns *trns = t_;
@@ -111,8 +111,8 @@ print_space_trns_proc (void *t_, struct ccase *c,
n = 1;
if (trns->expr)
{
- double f = expr_evaluate_num (trns->expr, c, case_num);
- if (f == SYSMIS)
+ double f = expr_evaluate_num (trns->expr, *c, case_num);
+ if (f == SYSMIS)
msg (SW, _("The expression on PRINT SPACE evaluated to the "
"system-missing value."));
else if (f < 0 || f > INT_MAX)