X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fmanager.c;h=6e76605d6663540f1cbbbd15967b5c5c235ce9aa;hb=bea461dcf5d18e97e76facc5b1faf9ca86be7646;hp=3647abb01fc610683512e71fbbe82218e5a3af3b;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/output/manager.c b/src/output/manager.c
index 3647abb0..6e76605d 100644
--- 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.
-   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
@@ -19,11 +18,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;
@@ -63,10 +61,10 @@ som_blank_line (void)
 }
 
 /* Driver. */
-static struct outp_driver *d=0;
+static struct outp_driver *d = 0;
 
 /* Table. */
-static struct som_entity *t=0;
+static struct som_entity *t = 0;
 
 /* Flags. */
 static unsigned flags;
@@ -93,7 +91,7 @@ static void output_entity (struct outp_driver *, struct som_entity *);
 void
 som_submit (struct som_entity *t)
 {
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   static int entry;
   
   assert (entry++ == 0);
@@ -107,12 +105,12 @@ som_submit (struct som_entity *t)
       t->class->headers (&hl, &hr, &ht, &hb);
 
 
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
       if (hl + hr > nc || ht + hb > 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);
@@ -135,7 +133,7 @@ som_submit (struct som_entity *t)
 
   }
   
-#if GLOBAL_DEBUGGING
+#if DEBUGGING
   assert (--entry == 0);
 #endif
 }
@@ -147,13 +145,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 +206,9 @@ render_columns (void)
 	{
 	  assert (d->cp_y);
 	  outp_eject_page (d);
-	} else {
+	}
+      else
+        {
 	  if (len > max_len)
 	    max_len = len;
 
@@ -285,7 +279,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);