X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=19761e7532079831b9a3fdd8b591e1d95e37acdb;hb=0a490aaca0b5a6350d3428101b8c496f396ac26b;hp=349b5d3c3212b386f978d8dd6318dece52c33a07;hpb=d8dd3a226c9b963314bbe6a2ed2cf74714072c77;p=pspp-builds.git

diff --git a/src/output/output.c b/src/output/output.c
index 349b5d3c..19761e75 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <libpspp/alloc.h>
-#include <data/filename.h>
+#include <data/file-name.h>
 #include "htmlP.h"
 #include "intprops.h"
 #include <libpspp/misc.h>
@@ -286,7 +286,7 @@ outp_read_devices (void)
 					       config_path),
 			    NULL);
 
-  ds_init (&line, 128);
+  ds_init (&line);
 
   if (init_fn == NULL)
     {
@@ -767,7 +767,7 @@ configure_driver_line (struct string *line)
   for (i = 0; i < 4; i++) 
     {
       struct string *token = &tokens[i];
-      ds_init (token, 0);
+      ds_init (token);
       ds_separate (line, token, i < 3 ? ":" : "", &save_idx);
       ds_trim_spaces (token);
     }
@@ -1032,7 +1032,7 @@ outp_get_paper_size (char *size, int *h, int *v)
 						config_path),
 			     NULL);
 
-  ds_init (&line, 128);
+  ds_init (&line);
 
   if (pprsz_fn == NULL)
     {
@@ -1162,16 +1162,14 @@ outp_close_page (struct outp_driver *d)
     }
 }
 
-/* Ejects the paper on device D, if a page is open and is not
-   blank. */
+/* Ejects the page on device D, if a page is open and non-blank,
+   and opens a new page.  */
 void
 outp_eject_page (struct outp_driver *d)
 {
   if (d->page_open && d->cp_y != 0)
-    {
-      outp_close_page (d);
-      outp_open_page (d);
-    }
+    outp_close_page (d);
+  outp_open_page (d);
 }
 
 /* Returns the width of string S, in device units, when output on