X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-in.h;h=dbf2fa7caa82f5bf9d5c841db9e590bbeeacb973;hb=38993354cabb6fc37bb882be92f9a49e9aeb4c88;hp=2a8eedc1aebfe7980c4f747574cbe8cfd1ac63ef;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/data/data-in.h b/src/data/data-in.h
index 2a8eedc1ae..dbf2fa7caa 100644
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -1,39 +1,35 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2006, 2010 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 . */
-#if !data_in_h
-#define data_in_h 1
+#ifndef DATA_DATA_IN_H
+#define DATA_DATA_IN_H 1
-#include
#include
-#include
-#include
-#include
-#include "format.h"
+#include "data/format.h"
+#include "libpspp/legacy-encoding.h"
+#include "libpspp/str.h"
-enum integer_format data_in_get_integer_format (void);
-void data_in_set_integer_format (enum integer_format);
+union value;
+struct dictionary;
-enum float_format data_in_get_float_format (void);
-void data_in_set_float_format (enum float_format);
+bool data_in (struct substring input, const char *input_encoding,
+ enum fmt_type, int first_column, int last_column,
+ union value *output, int width, const char *output_encoding);
-bool data_in (struct substring input,
- enum fmt_type, int implied_decimals, int first_column,
- union value *output, int width);
+void data_in_imply_decimals (struct substring input, const char *encoding,
+ enum fmt_type format, int d, union value *output);
-#endif /* data-in.h */
+#endif /* data/data-in.h */