X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fany-writer.c;h=ba4149d78bab2e711b3ae8f7e0c8ec5210eebd28;hb=15e323443edce619168aede1421aa195e7f7ecc2;hp=94dff952f1ea6a42dbd8a154d62e4c39c4a48f72;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp
diff --git a/src/data/any-writer.c b/src/data/any-writer.c
index 94dff952f1..ba4149d78b 100644
--- a/src/data/any-writer.c
+++ b/src/data/any-writer.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ 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
@@ -15,26 +15,30 @@
along with this program. If not, see . */
#include
-#include "any-writer.h"
-#include
+
+#include "data/any-writer.h"
+
#include
#include
#include
#include
-#include
-#include
-#include "file-handle-def.h"
-#include "file-name.h"
-#include "por-file-writer.h"
-#include "sys-file-writer.h"
-#include
-#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)
-/* Creates and returns a writer for HANDLE with the given DICT. */
+/* Creates and returns a writer for HANDLE with the given DICT. The caller
+ retains ownership of DICT, which might get modified to assign short names. */
struct casewriter *
any_writer_open (struct file_handle *handle, struct dictionary *dict)
{
@@ -45,7 +49,7 @@ any_writer_open (struct file_handle *handle, struct dictionary *dict)
struct casewriter *writer;
char *extension;
- extension = fn_extension (fh_get_file_name (handle));
+ extension = fn_extension (handle);
str_lowercase (extension);
if (!strcmp (extension, ".por"))
@@ -63,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 ();