X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fscratch-reader.c;h=3aa1768d562e1b7bac6441d86981c3b1bdbc1fdf;hb=refs%2Fbuilds%2F20110315030503%2Fpspp;hp=17c1aeaad0d4822d37f2aae0958b611750d0dd48;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp
diff --git a/src/data/scratch-reader.c b/src/data/scratch-reader.c
index 17c1aeaad0..3aa1768d56 100644
--- a/src/data/scratch-reader.c
+++ b/src/data/scratch-reader.c
@@ -1,32 +1,31 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 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 . */
#include
-#include "scratch-reader.h"
+#include
#include
-#include "dictionary.h"
-#include "file-handle-def.h"
-#include "scratch-handle.h"
#include
#include
+#include
+#include
+#include
+#include
#include
#include "xalloc.h"
@@ -42,12 +41,15 @@ struct casereader *
scratch_reader_open (struct file_handle *fh, struct dictionary **dict)
{
struct scratch_handle *sh;
-
- if (!fh_open (fh, FH_REF_SCRATCH, "scratch file", "rs"))
- return NULL;
-
+
+ /* We don't bother doing fh_lock or fh_ref on the file handle,
+ as there's no advantage in this case, and doing these would
+ require us to keep track of the "struct file_handle" and
+ "struct fh_lock" and undo our work later. */
+ assert (fh_get_referent (fh) == FH_REF_SCRATCH);
+
sh = fh_get_scratch_handle (fh);
- if (sh == NULL || sh->casereader == NULL)
+ if (sh == NULL || sh->casereader == NULL)
{
msg (SE, _("Scratch file handle %s has not yet been written, "
"using SAVE or another procedure, so it cannot yet "