X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fmanager.c;h=0d82867ae0f08b83f9448e570de3673d0933ab67;hb=02c64395051af942e9aeff20de6685c706ef1023;hp=3b60220b3df8d08ed8b31a502f6e8f5add5a34bf;hpb=52b9fca3a729eaef7d13469029e4391aa033a659;p=pspp

diff --git a/src/output/manager.c b/src/output/manager.c
index 3b60220b3d..0d82867ae0 100644
--- a/src/output/manager.c
+++ b/src/output/manager.c
@@ -21,6 +21,7 @@
 #include "manager.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <libpspp/assertion.h>
 #include "output.h"
 
 /* Table. */
@@ -61,10 +62,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;
@@ -110,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);
@@ -206,7 +207,9 @@ render_columns (void)
 	{
 	  assert (d->cp_y);
 	  outp_eject_page (d);
-	} else {
+	}
+      else
+        {
 	  if (len > max_len)
 	    max_len = len;
 
@@ -277,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);