X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fmanager.c;h=6e76605d6663540f1cbbbd15967b5c5c235ce9aa;hb=470affdb48180aebfa764941bbdb353062978444;hp=8fd90a5e26bbcfa774b5534b9a6e7e96ee49c601;hpb=8444d8d47de5e5f8d076b6f43f73c2c29494031e;p=pspp

diff --git a/src/output/manager.c b/src/output/manager.c
index 8fd90a5e26..6e76605d66 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 <libpspp/message.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <libpspp/assertion.h>
 #include "output.h"
-#include <libpspp/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;
@@ -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);
-	  abort ();
+	  NOT_REACHED ();
 	}
       else if (hl + hr == nc)
 	printf ("warning: headers (l,r)=(%d,%d) in table width %d\n", hl, hr, nc);
@@ -208,7 +206,9 @@ render_columns (void)
 	{
 	  assert (d->cp_y);
 	  outp_eject_page (d);
-	} else {
+	}
+      else
+        {
 	  if (len > max_len)
 	    max_len = len;
 
@@ -279,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);