Patch #5244.

[pspp-builds.git] / src / output / manager.c

diff --git a/src/output/manager.c b/src/output/manager.c
index 404c3bf2dbc5ae3eff2f4e8bf6299814d6944098..468b2c23e5d93b8c1945a2e71bc5458108249c84 100644 (file)
--- a/src/output/manager.c
+++ b/src/output/manager.c
@@ -19,11 +19,10 @@
 
 #include <config.h>
 #include "manager.h"
-#include "message.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <libpspp/assertion.h>
 #include "output.h"
-#include "debug-print.h"
 
 /* Table. */
 int table_num = 1;
@@ -112,7 +111,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);
-         abort ();
+         NOT_REACHED ();
        }
       else if (hl + hr == nc)
        printf ("warning: headers (l,r)=(%d,%d) in table width %d\n", hl, hr, nc);
@@ -147,13 +146,7 @@ output_entity (struct outp_driver *driver, struct som_entity *entity)
   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);
@@ -214,7 +207,9 @@ render_columns (void)
        {
          assert (d->cp_y);
          outp_eject_page (d);
-       } else {
+       }
+      else
+        {
          if (len > max_len)
            max_len = len;
 
@@ -285,7 +280,9 @@ render_segments (void)
            {
              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);