X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable.c;h=7460fce373186151a1d5e3aaff380426674593b7;hb=2764b3157e26955a31af5f4aa7d14e27098ddf19;hp=9e925a44df12300bb35446ae700bef29ace5083c;hpb=c6fe58a22249f4f486b42f35fd8bd537c91e8e6e;p=pspp-builds.git

diff --git a/src/output/table.c b/src/output/table.c
index 9e925a44..7460fce3 100644
--- a/src/output/table.c
+++ b/src/output/table.c
@@ -29,6 +29,7 @@
 #include <data/data-out.h>
 #include <data/format.h>
 #include <data/value.h>
+#include <data/dictionary.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/misc.h>
@@ -518,7 +519,8 @@ tab_natural_dimensions (struct tab_table *t, struct outp_driver *d,
    from V, displayed with format spec F. */
 void
 tab_value (struct tab_table *table, int c, int r, unsigned char opt,
-	   const union value *v, const struct fmt_spec *f)
+	   const union value *v, const struct dictionary *dict, 
+	   const struct fmt_spec *f)
 {
   char *contents;
 
@@ -537,11 +539,10 @@ tab_value (struct tab_table *table, int c, int r, unsigned char opt,
     }
 #endif
 
-  contents = pool_alloc (table->container, f->w);
-  table->cc[c + r * table->cf] = ss_buffer (contents, f->w);
-  table->ct[c + r * table->cf] = opt;
+  contents = data_out_pool (v, dict_get_encoding (dict), f, table->container);
 
-  data_out (v, f, contents);
+  table->cc[c + r * table->cf] = ss_cstr (contents);
+  table->ct[c + r * table->cf] = opt;
 }
 
 /* Sets cell (C,R) in TABLE, with options OPT, to have value VAL
@@ -550,8 +551,7 @@ void
 tab_fixed (struct tab_table *table, int c, int r, unsigned char opt,
 	   double val, int w, int d)
 {
-  char *contents;
-  char buf[40], *cp;
+  char *s, *cp;
 
   struct fmt_spec f;
   union value double_value;
@@ -580,17 +580,15 @@ tab_fixed (struct tab_table *table, int c, int r, unsigned char opt,
 #endif
 
   double_value.f = val;
-  data_out (&double_value, &f, buf);
+  s = data_out_pool (&double_value, LEGACY_NATIVE, &f, table->container);
 
-  cp = buf;
-  while (isspace ((unsigned char) *cp) && cp < &buf[w])
+  cp = s;
+  while (isspace ((unsigned char) *cp) && cp < &s[w])
     cp++;
-  f.w = w - (cp - buf);
+  f.w = w - (cp - s);
 
-  contents = pool_alloc (table->container, f.w);
-  table->cc[c + r * table->cf] = ss_buffer (contents, f.w);
+  table->cc[c + r * table->cf] = ss_buffer (cp, f.w);
   table->ct[c + r * table->cf] = opt;
-  memcpy (contents, cp, f.w);
 }
 
 /* Sets cell (C,R) in TABLE, with options OPT, to have value VAL as
@@ -602,10 +600,9 @@ tab_double (struct tab_table *table, int c, int r, unsigned char opt,
 	   double val, const struct fmt_spec *fmt)
 {
   int w;
-  char *contents;
-  char buf[40], *cp;
+  char *s, *cp;
 
-  union value double_value;
+  union value double_value ;
 
   assert (table != NULL);
 
@@ -634,17 +631,17 @@ tab_double (struct tab_table *table, int c, int r, unsigned char opt,
 #endif
 
   double_value.f = val;
-  data_out (&double_value, fmt, buf);
+  s = data_out_pool (&double_value, LEGACY_NATIVE, fmt, table->container);
 
-  cp = buf;
-  while (isspace ((unsigned char) *cp) && cp < &buf[fmt->w])
-    cp++;
-  w = fmt->w - (cp - buf);
-
-  contents = pool_alloc (table->container, w);
-  table->cc[c + r * table->cf] = ss_buffer (contents, w);
+  cp = s;
+  while (isspace ((unsigned char) *cp) && cp < s + fmt->w)
+    {
+      cp++;
+    }
+  w = fmt->w - (cp - s);
+  
+  table->cc[c + r * table->cf] = ss_buffer (cp, w);
   table->ct[c + r * table->cf] = opt;
-  memcpy (contents, cp, w);
 }