X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-out.h;h=7dff441289c76e6b155719d230f1e776762499e0;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=85831b30b9ccff31d705ea6d7084932dc861c3b0;hpb=d0371553a98cd169353bf6d211e375e5ffc3a3bd;p=pspp-builds.git

diff --git a/src/data/data-out.h b/src/data/data-out.h
index 85831b30..7dff4412 100644
--- a/src/data/data-out.h
+++ b/src/data/data-out.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, 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
@@ -18,22 +18,19 @@
 #define DATA_OUT_H 1
 
 #include <stdbool.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/legacy-encoding.h>
+#include "libpspp/float-format.h"
+#include "libpspp/integer-format.h"
 
 struct fmt_spec;
+struct string;
 union value;
 
-void data_out (const union value *, const struct fmt_spec *, char *);
+char * data_out (const union value *, const char *encoding, const struct fmt_spec *);
 
-void data_out_legacy (const union value *, enum legacy_encoding,
-                      const struct fmt_spec *, char *);
+char * data_out_pool (const union value *, const char *encoding, const struct fmt_spec *, struct pool *pool);
 
-enum integer_format data_out_get_integer_format (void);
-void data_out_set_integer_format (enum integer_format);
-
-enum float_format data_out_get_float_format (void);
-void data_out_set_float_format (enum float_format);
+void data_out_recode (const union value *input, const char *input_encoding,
+                      const struct fmt_spec *,
+                      struct string *output, const char *output_encoding);
 
 #endif /* data-out.h */