X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fany-writer.c;h=61d6ffc8a26ec5c53501f0dc38aa20078cad8280;hb=5f9212b9af772575bd3026ca9643684ce6493b3c;hp=195292afb70beceee17c82cbebbb47e1a1fde794;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp

diff --git a/src/data/any-writer.c b/src/data/any-writer.c
index 195292afb7..61d6ffc8a2 100644
--- a/src/data/any-writer.c
+++ b/src/data/any-writer.c
@@ -1,37 +1,39 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2006, 2010, 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 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "any-writer.h"
+
+#include "data/any-writer.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include "file-handle-def.h"
-#include "file-name.h"
-#include "por-file-writer.h"
-#include "sys-file-writer.h"
-#include <libpspp/str.h>
-#include "scratch-writer.h"
-#include "xalloc.h"
+
+#include "data/dataset-writer.h"
+#include "data/file-handle-def.h"
+#include "data/file-name.h"
+#include "data/por-file-writer.h"
+#include "data/sys-file-writer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -40,7 +42,7 @@
 struct casewriter *
 any_writer_open (struct file_handle *handle, struct dictionary *dict)
 {
-  switch (fh_get_referent (handle)) 
+  switch (fh_get_referent (handle))
     {
     case FH_REF_FILE:
       {
@@ -65,8 +67,8 @@ any_writer_open (struct file_handle *handle, struct dictionary *dict)
       msg (ME, _("The inline file is not allowed here."));
       return NULL;
 
-    case FH_REF_SCRATCH:
-      return scratch_writer_open (handle, dict);
+    case FH_REF_DATASET:
+      return dataset_writer_open (handle, dict);
     }
 
   NOT_REACHED ();