X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fscratch-reader.c;h=3aa1768d562e1b7bac6441d86981c3b1bdbc1fdf;hb=707848060e414fe93458834446dd7cdbf800667f;hp=d82486fee8a78dfc282db4eb17320538229489ae;hpb=a5a1e8c05118edd5d9fd0dfd1a6f421632779292;p=pspp-builds.git

diff --git a/src/data/scratch-reader.c b/src/data/scratch-reader.c
index d82486fe..3aa1768d 100644
--- a/src/data/scratch-reader.c
+++ b/src/data/scratch-reader.c
@@ -16,15 +16,16 @@
 
 #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 <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"
@@ -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)