X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpostscript.c;h=a84d14eebce232128809dc63772b8b5c628ef8e0;hb=c246143823df29e9ce4c5115c647a47954dea883;hp=d65162dad4c3e1bd8fd0cb2b687b4fef0276f283;hpb=b74d09af5e07f954c18e7cdb8aca3af47fa10208;p=pspp

diff --git a/src/output/postscript.c b/src/output/postscript.c
index d65162dad4..a84d14eebc 100644
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000, 2006 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
@@ -27,6 +26,7 @@
 #include <unistd.h>
 
 #include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
 #include <libpspp/freaderror.h>
@@ -46,7 +46,6 @@
 #include "minmax.h"
 #include "output.h"
 #include "size_max.h"
-#include "strsep.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -108,8 +107,7 @@ struct ps_driver_ext
 
     struct font *fonts[OUTP_FONT_CNT];
     int last_font;              /* Index of last font set with setfont. */
-  }
-ps_driver_ext;
+  };
 
 /* Transform logical y-ordinate Y into a page ordinate. */
 #define YT(Y) (this->length - (Y))
@@ -270,7 +268,7 @@ enum
 };
 
 /* All the options that the PostScript driver supports. */
-static struct outp_option option_tab[] =
+static const struct outp_option option_tab[] =
 {
   {"output-file",		output_file_arg,0},
   {"paper-size",		paper_size_arg, 0},
@@ -374,7 +372,7 @@ handle_option (struct outp_driver *this, const char *key,
 	    this->font_height = arg;
 	    break;
 	  default:
-	    abort ();
+	    NOT_REACHED ();
 	  }
       }
       break;
@@ -400,7 +398,7 @@ handle_option (struct outp_driver *this, const char *key,
 	    x->line_width = dimension;
 	    break;
 	  default:
-	    abort ();
+	    NOT_REACHED ();
 	  }
       }
       break;
@@ -417,7 +415,7 @@ handle_option (struct outp_driver *this, const char *key,
       }
       break;
     default:
-      abort ();
+      NOT_REACHED ();
     }
 
   return true;
@@ -434,7 +432,7 @@ find_ps_file (const char *name)
   else
     {
       char *base_name = xasprintf ("psfonts/%s", name);
-      char *file_name = fn_search_path (base_name, config_path, NULL);
+      char *file_name = fn_search_path (base_name, config_path);
       free (base_name);
       return file_name;
     }
@@ -608,8 +606,7 @@ ps_submit (struct outp_driver *this UNUSED, struct som_entity *s)
     case SOM_CHART:
       break;
     default:
-      abort ();
-      break;
+      NOT_REACHED ();
     }
 }
 
@@ -1427,7 +1424,7 @@ reencode_font (struct outp_driver *this, struct font *font)
 }
 
 /* PostScript driver class. */
-struct outp_class postscript_class =
+const struct outp_class postscript_class =
 {
   "postscript",
   0,