data-in: Make data_in() parameters more uniform.

[pspp] / src / data / data-in.h

diff --git a/src/data/data-in.h b/src/data/data-in.h
index 52301c8cefe2a622092154ed5a7a09ef8b3ecd50..dbf2fa7caa82f5bf9d5c841db9e590bbeeacb973 100644 (file)
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+   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
@@ -18,16 +18,18 @@
 #define DATA_DATA_IN_H 1
 
 #include <stdbool.h>
-#include <data/format.h>
-#include <libpspp/legacy-encoding.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/str.h>
-
+#include "data/format.h"
+#include "libpspp/legacy-encoding.h"
+#include "libpspp/str.h"
 
 union value;
-bool data_in (struct substring input, enum legacy_encoding,
-              enum fmt_type, int implied_decimals, int first_column,
-              union value *output, int width);
+struct dictionary;
+
+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);
+
+void data_in_imply_decimals (struct substring input, const char *encoding,
+                             enum fmt_type format, int d, union value *output);
 
 #endif /* data/data-in.h */