projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug 19581
[pspp-builds.git]
/
src
/
output
/
manager.c
diff --git
a/src/output/manager.c
b/src/output/manager.c
index f7d0b5eb749483a30ef7530fa89394b07e098c38..6e76605d6663540f1cbbbd15967b5c5c235ce9aa 100644
(file)
--- a/
src/output/manager.c
+++ b/
src/output/manager.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-19,11
+18,10
@@
#include <config.h>
#include "manager.h"
#include <config.h>
#include "manager.h"
-#include <libpspp/message.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <libpspp/assertion.h>
#include "output.h"
#include "output.h"
-#include <libpspp/debug-print.h>
/* Table. */
int table_num = 1;
/* Table. */
int table_num = 1;
@@
-63,10
+61,10
@@
som_blank_line (void)
}
\f
/* Driver. */
}
\f
/* Driver. */
-static struct outp_driver *d
=
0;
+static struct outp_driver *d
=
0;
/* Table. */
/* Table. */
-static struct som_entity *t
=
0;
+static struct som_entity *t
=
0;
/* Flags. */
static unsigned flags;
/* Flags. */
static unsigned flags;
@@
-112,7
+110,7
@@
som_submit (struct som_entity *t)
{
printf ("headers: (l,r)=(%d,%d), (t,b)=(%d,%d) in table size (%d,%d)\n",
hl, hr, ht, hb, nc, nr);
{
printf ("headers: (l,r)=(%d,%d), (t,b)=(%d,%d) in table size (%d,%d)\n",
hl, hr, ht, hb, nc, nr);
-
abort
();
+
NOT_REACHED
();
}
else if (hl + hr == nc)
printf ("warning: headers (l,r)=(%d,%d) in table width %d\n", hl, hr, nc);
}
else if (hl + hr == nc)
printf ("warning: headers (l,r)=(%d,%d) in table width %d\n", hl, hr, nc);
@@
-147,13
+145,7
@@
output_entity (struct outp_driver *driver, struct som_entity *entity)
bool fits_width, fits_length;
d = driver;
bool fits_width, fits_length;
d = driver;
- assert (d->driver_open);
- if (!d->page_open && !d->class->open_page (d))
- {
- d->device = OUTP_DEV_DISABLED;
- return;
- }
-
+ outp_open_page (d);
if (d->class->special || entity->type == SOM_CHART)
{
driver->class->submit (d, entity);
if (d->class->special || entity->type == SOM_CHART)
{
driver->class->submit (d, entity);
@@
-214,7
+206,9
@@
render_columns (void)
{
assert (d->cp_y);
outp_eject_page (d);
{
assert (d->cp_y);
outp_eject_page (d);
- } else {
+ }
+ else
+ {
if (len > max_len)
max_len = len;
if (len > max_len)
max_len = len;
@@
-285,7
+279,9
@@
render_segments (void)
{
assert (d->cp_y);
outp_eject_page (d);
{
assert (d->cp_y);
outp_eject_page (d);
- } else {
+ }
+ else
+ {
t->class->title (x_index ? x_index : y_index,
x_index ? y_index : 0);
t->class->render (x0, y0, x1, y1);
t->class->title (x_index ? x_index : y_index,
x_index ? y_index : 0);
t->class->render (x0, y0, x1, y1);