projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements and cleanups
[pspp]
/
src
/
output
/
ascii.c
diff --git
a/src/output/ascii.c
b/src/output/ascii.c
index cd5fcec64b06ab8c704f4b2fa9b3157089e59450..6535121d8c0418bcc17686a3985fd00643a7a605 100644
(file)
--- a/
src/output/ascii.c
+++ b/
src/output/ascii.c
@@
-310,8
+310,8
@@
struct ascii_driver
bool error; /* Output error? */
struct u8_line *lines; /* Page content. */
int allocated_lines; /* Number of lines allocated. */
bool error; /* Output error? */
struct u8_line *lines; /* Page content. */
int allocated_lines; /* Number of lines allocated. */
- int
chart_cnt;
/* Number of charts so far. */
- int
object_cnt;
/* Number of objects so far. */
+ int
n_charts;
/* Number of charts so far. */
+ int
n_objects;
/* Number of objects so far. */
const struct pivot_table *pt;
struct render_params params;
};
const struct pivot_table *pt;
struct render_params params;
};
@@
-370,9
+370,7
@@
ascii_create (struct file_handle *fh, enum settings_output_devices device_type,
{
enum { BOX_ASCII, BOX_UNICODE } box;
struct output_driver *d;
{
enum { BOX_ASCII, BOX_UNICODE } box;
struct output_driver *d;
- struct ascii_driver *a;
-
- a = xzalloc (sizeof *a);
+ struct ascii_driver *a = XZALLOC (struct ascii_driver);
d = &a->driver;
output_driver_init (&a->driver, &ascii_driver_class, fh_get_file_name (fh), device_type);
a->append = parse_boolean (opt (d, o, "append", "false"));
d = &a->driver;
output_driver_init (&a->driver, &ascii_driver_class, fh_get_file_name (fh), device_type);
a->append = parse_boolean (opt (d, o, "append", "false"));
@@
-405,8
+403,8
@@
ascii_create (struct file_handle *fh, enum settings_output_devices device_type,
a->error = false;
a->lines = NULL;
a->allocated_lines = 0;
a->error = false;
a->lines = NULL;
a->allocated_lines = 0;
- a->
chart_cnt
= 0;
- a->
object_cnt
= 0;
+ a->
n_charts
= 0;
+ a->
n_objects
= 0;
static const struct render_ops ascii_render_ops = {
.draw_line = ascii_draw_line,
static const struct render_ops ascii_render_ops = {
.draw_line = ascii_draw_line,
@@
-561,7
+559,7
@@
ascii_output_table_item (struct ascii_driver *a,
layer_indexes);
for (int i = 0; render_pager_has_next (p); i++)
{
layer_indexes);
for (int i = 0; render_pager_has_next (p); i++)
{
- if (a->
object_cnt
++)
+ if (a->
n_objects
++)
putc ('\n', a->file);
ascii_output_lines (a, render_pager_draw_next (p, INT_MAX));
putc ('\n', a->file);
ascii_output_lines (a, render_pager_draw_next (p, INT_MAX));
@@
-597,7
+595,7
@@
ascii_submit (struct output_driver *driver, const struct output_item *item)
if (a->chart_file_name != NULL)
{
char *file_name = xr_write_png_image (
if (a->chart_file_name != NULL)
{
char *file_name = xr_write_png_image (
- item->image, a->chart_file_name, ++a->
chart_cnt
);
+ item->image, a->chart_file_name, ++a->
n_charts
);
if (file_name != NULL)
{
struct output_item *text_item = text_item_create_nocopy (
if (file_name != NULL)
{
struct output_item *text_item = text_item_create_nocopy (
@@
-616,7
+614,7
@@
ascii_submit (struct output_driver *driver, const struct output_item *item)
if (a->chart_file_name != NULL)
{
char *file_name = xr_draw_png_chart (
if (a->chart_file_name != NULL)
{
char *file_name = xr_draw_png_chart (
- item->chart, a->chart_file_name, ++a->
chart_cnt
, &a->fg, &a->bg);
+ item->chart, a->chart_file_name, ++a->
n_charts
, &a->fg, &a->bg);
if (file_name != NULL)
{
struct output_item *text_item = text_item_create_nocopy (
if (file_name != NULL)
{
struct output_item *text_item = text_item_create_nocopy (
@@
-645,7
+643,7
@@
ascii_submit (struct output_driver *driver, const struct output_item *item)
break;
case OUTPUT_ITEM_GROUP:
break;
case OUTPUT_ITEM_GROUP:
-
NOT_REACHED ()
;
+
break
;
case OUTPUT_ITEM_PAGE_BREAK:
break;
case OUTPUT_ITEM_PAGE_BREAK:
break;
@@
-1033,8
+1031,8
@@
ascii_test_write (struct output_driver *driver,
.underline = underline,
};
const struct pivot_value value = {
.underline = underline,
};
const struct pivot_value value = {
- .type = PIVOT_VALUE_TEXT,
.text = {
.text = {
+ .type = PIVOT_VALUE_TEXT,
.local = CONST_CAST (char *, s),
.c = CONST_CAST (char *, s),
.id = CONST_CAST (char *, s),
.local = CONST_CAST (char *, s),
.c = CONST_CAST (char *, s),
.id = CONST_CAST (char *, s),