projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace legacy_recode with recode_string.
[pspp-builds.git]
/
src
/
output
/
table.c
diff --git
a/src/output/table.c
b/src/output/table.c
index 97d16117324b3a91a7152728203b4e12dc20273e..7460fce373186151a1d5e3aaff380426674593b7 100644
(file)
--- 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/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>
#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,
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;
{
char *contents;
@@
-537,7
+539,7
@@
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
}
#endif
}
#endif
- contents = data_out_pool (v,
"FIXME"
, f, table->container);
+ contents = data_out_pool (v,
dict_get_encoding (dict)
, f, table->container);
table->cc[c + r * table->cf] = ss_cstr (contents);
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = ss_cstr (contents);
table->ct[c + r * table->cf] = opt;
@@
-578,7
+580,7
@@
tab_fixed (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- s = data_out_pool (&double_value,
"FIXME"
, &f, table->container);
+ s = data_out_pool (&double_value,
LEGACY_NATIVE
, &f, table->container);
cp = s;
while (isspace ((unsigned char) *cp) && cp < &s[w])
cp = s;
while (isspace ((unsigned char) *cp) && cp < &s[w])
@@
-629,7
+631,7
@@
tab_double (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- s = data_out_pool (&double_value,
"FIXME"
, fmt, table->container);
+ s = data_out_pool (&double_value,
LEGACY_NATIVE
, fmt, table->container);
cp = s;
while (isspace ((unsigned char) *cp) && cp < s + fmt->w)
cp = s;
while (isspace ((unsigned char) *cp) && cp < s + fmt->w)