gui: New "entry-dialog" module for prompting for a text string.

[pspp-builds.git] / src / data / scratch-reader.c

diff --git a/src/data/scratch-reader.c b/src/data/scratch-reader.c
index d82486fee8a78dfc282db4eb17320538229489ae..5def728ed84ea52c109a154246373c912db03c68 100644 (file)
--- a/src/data/scratch-reader.c
+++ b/src/data/scratch-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 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
@@ -16,18 +16,19 @@
 
 #include <config.h>
 
-#include "scratch-reader.h"
+#include "data/scratch-reader.h"
 
 #include <stdlib.h>
 
-#include "dictionary.h"
-#include "file-handle-def.h"
-#include "scratch-handle.h"
-#include <data/case.h>
-#include <data/casereader.h>
-#include <libpspp/message.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/scratch-handle.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -41,8 +42,11 @@ 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)