X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget.c;h=b73a2bda6fdc076e243ca171ecb69412d4e33a74;hb=c646c399bf8c942a5e33abaa6c12336429c09f24;hp=c6ae3ed3090f6e3f2a0aa5a8edd11e63b89173cb;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index c6ae3ed309..b73a2bda6f 100644
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -18,32 +18,36 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+
 #include <stdlib.h>
-#include "alloc.h"
-#include "any-reader.h"
-#include "any-writer.h"
-#include "case.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle.h"
-#include "hash.h"
-#include "lexer.h"
-#include "misc.h"
-#include "por-file-writer.h"
-#include "settings.h"
-#include "sys-file-writer.h"
-#include "str.h"
-#include "value-labels.h"
-#include "variable.h"
-#include "procedure.h"
+
+#include <data/any-reader.h>
+#include <data/any-writer.h>
+#include <data/case-sink.h>
+#include <data/case-source.h>
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <data/por-file-writer.h>
+#include <data/settings.h>
+#include <data/storage-stream.h>
+#include <data/sys-file-writer.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <procedure.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
-
 /* Rearranging and reducing a dictionary. */
 static void start_case_map (struct dictionary *);
 static struct case_map *finish_case_map (struct dictionary *);
@@ -734,8 +738,6 @@ keep_variables (struct dictionary *dict)
 
 /* MATCH FILES. */
 
-#include "debug-print.h"
-
 /* File types. */
 enum
   {
@@ -885,8 +887,7 @@ cmd_match_files (void)
             }
           used_active_file = true;
 
-          assert (pgm_state != STATE_INPUT);
-          if (pgm_state == STATE_INIT)
+          if (vfm_source == NULL)
             {
               msg (SE, _("Cannot specify the active file since no active "
                          "file has been defined."));