projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "work on adding empty categories"
[pspp]
/
src
/
ui
/
syntax-gen.c
diff --git
a/src/ui/syntax-gen.c
b/src/ui/syntax-gen.c
index 93d52c79c05b0fcbf26a940142654ddd1173eb94..b338bdf9c4c742dc07dc81d393a37accdc9281ec 100644
(file)
--- a/
src/ui/syntax-gen.c
+++ b/
src/ui/syntax-gen.c
@@
-29,6
+29,7
@@
#include "libpspp/cast.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#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 "libpspp/str.h"
#include "libpspp/misc.h"
@@
-156,10
+157,11
@@
syntax_gen_number (struct string *output,
bool ok;
v_in.f = number;
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 */
/* 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);
ok = error == NULL;
free (error);
@@
-196,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
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
}
/* Appends <low> THRU <high> to OUTPUT. If LOW is LOWEST, then