X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput.c;h=b804978d6d1d4567be2f56b4938ea1a94e8951f7;hb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;hp=86e8534cedad1efcc659f7cc81346406a707887d;hpb=c663f9861a1425f0858f3f5849a19bdc46c868b7;p=pspp

diff --git a/src/output.c b/src/output.c
index 86e8534ced..b804978d6d 100644
--- a/src/output.c
+++ b/src/output.c
@@ -18,6 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
+#include "output.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -25,11 +26,12 @@
 #include <ctype.h>
 #include "alloc.h"
 #include "approx.h"
+#include "devind.h"
 #include "error.h"
 #include "filename.h"
+#include "htmlP.h"
 #include "lexer.h"
 #include "misc.h"
-#include "output.h"
 #include "settings.h"
 #include "str.h"
 
@@ -194,7 +196,7 @@ expand_name (char *bp, char *ep)
 
 /* Looks for a macro with key KEY, and returns the corresponding value
    if found, or NULL if not. */
-const char *
+static const char *
 find_defn_value (const char *key)
 {
   static char buf[INT_DIGITS + 1];
@@ -226,9 +228,8 @@ outp_init (void)
   extern struct outp_class postscript_class;
   extern struct outp_class epsf_class;
 #endif
-#if !NO_HTML
   extern struct outp_class html_class;
-#endif
+  extern struct outp_class devind_class;
 
   char def[] = "default";
 
@@ -239,6 +240,7 @@ outp_init (void)
   add_class (&epsf_class);
   add_class (&postscript_class);
 #endif
+  add_class (&devind_class);
   add_class (&ascii_class);
 
   add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);
@@ -423,7 +425,7 @@ outp_configure_macro (char *bp)
 
 /* Destroys all the drivers in driver list *DL and sets *DL to
    NULL. */
-void
+static void
 destroy_list (struct outp_driver ** dl)
 {
   struct outp_driver *d, *next;
@@ -1148,6 +1150,7 @@ outp_get_paper_size (char *size, int *h, int *v)
   where.filename = pprsz_fn;
   where.line_number = 0;
   err_push_file_locator (&where);
+  ds_init (NULL, &line, 128);
 
   if (pprsz_fn == NULL)
     {
@@ -1163,7 +1166,6 @@ outp_get_paper_size (char *size, int *h, int *v)
       goto exit;
     }
 
-  ds_init (NULL, &line, 128);
   for (;;)
     {
       char *cp, *bp, *ep;