X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint-space.c;h=25bcc750516964264f5bf99e9fd15fed251ed405;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=39773ec0843d98588dd8c11401201e21a2f3983c;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c index 39773ec0..25bcc750 100644 --- a/src/language/data-io/print-space.c +++ b/src/language/data-io/print-space.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + 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 @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include #include "xalloc.h" @@ -82,6 +82,7 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds) writer = dfm_open_writer (handle); if (writer == NULL) { + fh_unref (handle); expr_free (expr); return CMD_FAILURE; } @@ -95,12 +96,13 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds) 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_; @@ -109,7 +111,7 @@ print_space_trns_proc (void *t_, struct ccase *c, n = 1; if (trns->expr) { - double f = expr_evaluate_num (trns->expr, c, case_num); + 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.")); @@ -121,7 +123,7 @@ print_space_trns_proc (void *t_, struct ccase *c, while (n--) if (trns->writer == NULL) - som_blank_line (); + text_item_submit (text_item_create (TEXT_ITEM_BLANK_LINE, "")); else dfm_put_record (trns->writer, " ", 1);