data_out function to dynamically allocate return value.

[pspp-builds.git] / src / data / data-out.c

diff --git a/src/data/data-out.c b/src/data/data-out.c
index 86688a6774cd939facdb8453dbd7e9e2832934ec..7f15e5b24a8a42caafe8ad48d5dd809b467d1cd6 100644 (file)
--- a/src/data/data-out.c
+++ b/src/data/data-out.c
@@ -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, 2009 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
@@ -36,6 +36,7 @@
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
+#include <libpspp/pool.h>
 
 #include "minmax.h"
 
@@ -83,35 +84,56 @@ static void output_binary_integer (uint64_t, int bytes, enum integer_format,
                                    char *);
 static void output_hex (const void *, size_t bytes, char *);
 \f
-/* Converts the INPUT value into printable form in the exactly
-   FORMAT->W characters in OUTPUT according to format
-   specification FORMAT.  The output is recoded from native form
-   into the given legacy character ENCODING.  No null terminator
-   is appended to the buffer.  */
-void
-data_out_legacy (const union value *input, enum legacy_encoding encoding,
-                 const struct fmt_spec *format, char *output)
-{
-  static data_out_converter_func *const converters[FMT_NUMBER_OF_FORMATS] =
+
+static data_out_converter_func *const converters[FMT_NUMBER_OF_FORMATS] =
     {
 #define FMT(NAME, METHOD, IMIN, OMIN, IO, CATEGORY) output_##METHOD,
 #include "format.def"
     };
 
+/* Similar to data_out. Additionally recodes the output from
+   native form into the given legacy character ENCODING.
+   OUTPUT must be provided by the caller and must be at least
+   FORMAT->w long. No null terminator is appended to OUTPUT.
+*/
+void
+data_out_legacy (const union value *input, const char *encoding,
+                 const struct fmt_spec *format, char *output)
+{
   assert (fmt_check_output (format));
 
   converters[format->type] (input, format, output);
-  if (encoding != LEGACY_NATIVE
+  if (0 != strcmp (encoding, LEGACY_NATIVE)
       && fmt_get_category (format->type) != FMT_CAT_BINARY)
     legacy_recode (LEGACY_NATIVE, output, encoding, output, format->w);
 }
 
-/* Same as data_out_legacy with ENCODING set to LEGACY_NATIVE.  */
-void
-data_out (const union value *value, const struct fmt_spec *format,
-          char *output)
+/* Converts the INPUT value into printable form, according to format
+   specification FORMAT. 
+
+   VALUE must be the correct width for FORMAT, that is, its
+   width must be fmt_var_width(FORMAT).
+
+   The return value is dynamically allocated, and must be freed
+   by the caller.  If POOL is non-null, then the return value is
+   allocated on that pool.
+*/
+char *
+data_out_pool (const union value *input, const struct fmt_spec *format,
+         struct pool *pool)
+{
+  char *output = pool_malloc (pool, format->w + 1);
+  assert (fmt_check_output (format));
+
+  converters[format->type] (input, format, output);
+  output[format->w] = '\0';
+  return output;
+}
+
+char *
+data_out (const union value *input, const struct fmt_spec *format)
 {
-  return data_out_legacy (value, LEGACY_NATIVE, format, output);
+  return data_out_pool (input, format, NULL);
 }
 
 \f
@@ -415,7 +437,7 @@ output_date (const union value *input, const struct fmt_spec *format,
         }
     }
 
-  buf_copy_lpad (output, format->w, tmp, p - tmp);
+  buf_copy_lpad (output, format->w, tmp, p - tmp, ' ');
   return;
 
  overflow:
@@ -439,7 +461,7 @@ output_WKDAY (const union value *input, const struct fmt_spec *format,
     };
 
   if (input->f >= 1 && input->f < 8)
-    buf_copy_str_rpad (output, format->w, weekdays[(int) input->f - 1]);
+    buf_copy_str_rpad (output, format->w, weekdays[(int) input->f - 1], ' ');
   else
     {
       if (input->f != SYSMIS)
@@ -460,7 +482,7 @@ output_MONTH (const union value *input, const struct fmt_spec *format,
     };
 
   if (input->f >= 1 && input->f < 13)
-    buf_copy_str_rpad (output, format->w, months[(int) input->f - 1]);
+    buf_copy_str_rpad (output, format->w, months[(int) input->f - 1], ' ');
   else
     {
       if (input->f != SYSMIS)
@@ -474,7 +496,7 @@ static void
 output_A (const union value *input, const struct fmt_spec *format,
           char *output)
 {
-  memcpy (output, input->s, format->w);
+  memcpy (output, value_str (input, format->w), format->w);
 }
 
 /* Outputs AHEX format. */
@@ -482,7 +504,7 @@ static void
 output_AHEX (const union value *input, const struct fmt_spec *format,
              char *output)
 {
-  output_hex (input->s, format->w / 2, output);
+  output_hex (value_str (input, format->w), format->w / 2, output);
 }
 \f
 /* Decimal and scientific formatting. */
@@ -934,7 +956,7 @@ output_infinite (double number, const struct fmt_spec *format, char *output)
       else
         s = "Unknown";
 
-      buf_copy_str_lpad (output, format->w, s);
+      buf_copy_str_lpad (output, format->w, s, ' ');
     }
   else
     output_overflow (format, output);