X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fsyntax-gen.c;h=b338bdf9c4c742dc07dc81d393a37accdc9281ec;hb=2c4b104df57f2e8b5ed2afa50819294aaac4aa6c;hp=e2795d7b3a2b5aa5c11ad654334b264766481a41;hpb=1133aae2eb44a012939a95613bf5cd1698f5b5e9;p=pspp

diff --git a/src/ui/syntax-gen.c b/src/ui/syntax-gen.c
index e2795d7b3a..b338bdf9c4 100644
--- a/src/ui/syntax-gen.c
+++ b/src/ui/syntax-gen.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010, 2011, 2014 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
@@ -29,9 +29,11 @@
 #include "libpspp/cast.h"
 #include "libpspp/i18n.h"
 #include "libpspp/message.h"
+#include "data/settings.h"
 #include "libpspp/str.h"
 #include "libpspp/misc.h"
 
+#include "gl/c-ctype.h"
 #include "gl/ftoastr.h"
 
 /* Appends to OUTPUT a pair of hex digits for each byte in IN. */
@@ -155,10 +157,11 @@ syntax_gen_number (struct string *output,
       bool ok;
 
       v_in.f = number;
-      s = data_out (&v_in, "FIXME",  format);
+      s = data_out (&v_in, "FIXME", format, settings_get_fmt_settings ());
 
       /* FIXME: UTF8 encoded strings will fail here */
-      error = data_in (ss_cstr (s), C_ENCODING, format->type, &v_out, 0, NULL);
+      error = data_in (ss_cstr (s), C_ENCODING, format->type,
+                       settings_get_fmt_settings (), &v_out, 0, NULL);
       ok = error == NULL;
       free (error);
 
@@ -195,10 +198,8 @@ syntax_gen_value (struct string *output, const union value *value, int width,
   if (width == 0)
     syntax_gen_number (output, value->f, format);
   else
-    {
-      char *s = CHAR_CAST_BUG (char *, value_str (value, width));
-      syntax_gen_string (output, ss_buffer (s, width));
-    }
+    syntax_gen_string (output,
+                       ss_buffer (CHAR_CAST (const char *, value->s), width));
 }
 
 /* Appends <low> THRU <high> to OUTPUT.  If LOW is LOWEST, then
@@ -297,7 +298,7 @@ syntax_gen_pspp_valist (struct string *output, const char *format,
               }
 	    conv[x++] = directive;
 	    conv[x++] = '\0';
-            
+
             ds_put_c_format (output, conv, d);
             break;
           }