value: Get rid of value_str(), value_str_rw(), value_num().

[pspp] / src / ui / syntax-gen.c

diff --git a/src/ui/syntax-gen.c b/src/ui/syntax-gen.c
index e2795d7b3a2b5aa5c11ad654334b264766481a41..27e61e4253b476607f37ef4f3ddecfb005db9e19 100644 (file)
--- 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
@@ -32,6 +32,7 @@
 #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. */
@@ -195,10 +196,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 +296,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;
           }