projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into output
[pspp-builds.git]
/
src
/
language
/
data-io
/
print.c
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index 34042aa83022640997faf985d6e6b499bdca946a..9c8f56e84289196182fc10bb8599e26a35c8f3b3 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-32,6
+32,7
@@
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/assertion.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/assertion.h>
+#include <libpspp/i18n.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
@@
-83,7
+84,7
@@
struct print_trns
struct pool *pool; /* Stores related data. */
bool eject; /* Eject page before printing? */
bool include_prefix; /* Prefix lines with space? */
struct pool *pool; /* Stores related data. */
bool eject; /* Eject page before printing? */
bool include_prefix; /* Prefix lines with space? */
-
enum legacy_encoding encoding;
/* Encoding to use for output. */
+
const char *encoding;
/* Encoding to use for output. */
struct dfm_writer *writer; /* Output file, NULL=listing file. */
struct ll_list specs; /* List of struct prt_out_specs. */
size_t record_cnt; /* Number of records to write. */
struct dfm_writer *writer; /* Output file, NULL=listing file. */
struct ll_list specs; /* List of struct prt_out_specs. */
size_t record_cnt; /* Number of records to write. */
@@
-395,8
+396,8
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
int row;
spec_cnt = ll_count (&trns->specs);
int row;
spec_cnt = ll_count (&trns->specs);
- t = tab_create (4, spec_cnt + 1
, 0
);
- tab_columns (t, TAB_COL_DOWN
, 1
);
+ t = tab_create (4, spec_cnt + 1);
+ tab_columns (t, TAB_COL_DOWN);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
@@
-404,7
+405,7
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
- tab_dim (t, tab_natural_dimensions, NULL);
+ tab_dim (t, tab_natural_dimensions, NULL
, NULL
);
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
@@
-434,12
+435,12
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
}
if (fh != NULL)
}
if (fh != NULL)
- tab_title (t, ngettext ("Writing %
d
record to %s.",
- "Writing %
d
records to %s.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record to %s.",
+ "Writing %
zu
records to %s.", trns->record_cnt),
trns->record_cnt, fh_get_name (fh));
else
trns->record_cnt, fh_get_name (fh));
else
- tab_title (t, ngettext ("Writing %
d
record.",
- "Writing %
d
records.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record.",
+ "Writing %
zu
records.", trns->record_cnt),
trns->record_cnt);
tab_submit (t);
}
trns->record_cnt);
tab_submit (t);
}
@@
-480,12
+481,13
@@
print_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
else
{
ds_put_substring (&trns->line, ds_ss (&spec->string));
else
{
ds_put_substring (&trns->line, ds_ss (&spec->string));
- if (
trns->encoding != LEGACY_NATIVE
)
+ if (
0 != strcmp (trns->encoding, LEGACY_NATIVE)
)
{
size_t length = ds_length (&spec->string);
char *data = ss_data (ds_tail (&trns->line, length));
{
size_t length = ds_length (&spec->string);
char *data = ss_data (ds_tail (&trns->line, length));
- legacy_recode (LEGACY_NATIVE, data,
- trns->encoding, data, length);
+ char *s = recode_string (trns->encoding, LEGACY_NATIVE, data, length);
+ memcpy (data, s, length);
+ free (s);
}
}
}
}
}
}