X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-out.h;h=f0bc9b24c871e445424461d14bf0739176478866;hb=06b59daf76fdd55f29302f02ea66e06b35043e5b;hp=3921773912f6185ece47973f6bb2d1c85bc7efa8;hpb=bdebbd4db2d6c539eadb145f726382fe338e4219;p=pspp

diff --git a/src/data/data-out.h b/src/data/data-out.h
index 3921773912..f0bc9b24c8 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, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2011, 2013 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,17 +18,27 @@
 #define DATA_OUT_H 1
 
 #include <stdbool.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
+#include "libpspp/float-format.h"
+#include "libpspp/integer-format.h"
 
+struct fmt_settings;
 struct fmt_spec;
+struct string;
 union value;
 
-char * data_out (const union value *, const char *encoding, const struct fmt_spec *);
+char *data_out (const union value *input, const char *input_encoding,
+                const struct fmt_spec *, const struct fmt_settings *);
 
-char * data_out_pool (const union value *, const char *encoding, const struct fmt_spec *, struct pool *pool);
+char *data_out_pool (const union value *input, const char *input_encoding,
+                     const struct fmt_spec *, const struct fmt_settings *,
+                     struct pool *pool);
 
-void data_out_legacy (const union value *input, const char *encoding,
-		      const struct fmt_spec *format, char *output);
+char *data_out_stretchy (const union value *input, const char *input_encoding,
+                         const struct fmt_spec *, const struct fmt_settings *,
+                         struct pool *);
+
+void data_out_recode (const union value *input, const char *input_encoding,
+                      const struct fmt_spec *, const struct fmt_settings *,
+                      struct string *output, const char *output_encoding);
 
 #endif /* data-out.h */