projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate table functions that format their arguments from those that don't.
[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 ab25ec758d784128a09e15c1ebc336f8d7e24ce8..f7a3d152c58bf513081f38a9809b97afa2537a90 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-396,7
+396,7
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
spec_cnt = ll_count (&trns->specs);
t = tab_create (4, spec_cnt + 1, 0);
spec_cnt = ll_count (&trns->specs);
t = tab_create (4, spec_cnt + 1, 0);
- tab_columns (t, TAB_COL_DOWN
, 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
+404,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);
+ 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)
{
@@
-413,8
+413,9
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
switch (spec->type)
{
case PRT_LITERAL:
switch (spec->type)
{
case PRT_LITERAL:
- tab_text (t, 0, row, TAB_LEFT | TAB_FIX | TAT_PRINTF, "\"%.*s\"",
- (int) ds_length (&spec->string), ds_data (&spec->string));
+ tab_text_format (t, 0, row, TAB_LEFT | TAB_FIX, "\"%.*s\"",
+ (int) ds_length (&spec->string),
+ ds_data (&spec->string));
width = ds_length (&spec->string);
break;
case PRT_VAR:
width = ds_length (&spec->string);
break;
case PRT_VAR:
@@
-426,9
+427,9
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
default:
NOT_REACHED ();
}
default:
NOT_REACHED ();
}
- tab_text
(t, 1, row, TAT_PRINTF
, "%d", spec->record);
- tab_text
(t, 2, row, TAT_PRINTF
, "%3d-%3d",
- spec->first_column, spec->first_column + width - 1);
+ tab_text
_format (t, 1, row, 0
, "%d", spec->record);
+ tab_text
_format (t, 2, row, 0
, "%3d-%3d",
+
spec->first_column, spec->first_column + width - 1);
row++;
}
row++;
}