X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fmanager.c;h=468b2c23e5d93b8c1945a2e71bc5458108249c84;hb=8e018d25310cb53e5339b46e95f0abe02db83782;hp=8fd90a5e26bbcfa774b5534b9a6e7e96ee49c601;hpb=8444d8d47de5e5f8d076b6f43f73c2c29494031e;p=pspp-builds.git

diff --git a/src/output/manager.c b/src/output/manager.c
index 8fd90a5e..468b2c23 100644
--- a/src/output/manager.c
+++ b/src/output/manager.c
@@ -19,11 +19,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;
@@ -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);
@@ -208,7 +207,9 @@ render_columns (void)
 	{
 	  assert (d->cp_y);
 	  outp_eject_page (d);
-	} else {
+	}
+      else
+        {
 	  if (len > max_len)
 	    max_len = len;
 
@@ -279,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);