Get rid of capacity argument to ds_init() and update all callers.

[pspp-builds.git] / src / output / output.c

diff --git a/src/output/output.c b/src/output/output.c
index e1f6e3f9d4c98ec3fa2d1f0a8588da5911e93cca..19761e7532079831b9a3fdd8b591e1d95e37acdb 100644 (file)
--- 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,12 +286,12 @@ outp_read_devices (void)
                                               config_path),
                            NULL);
 
-  ds_init (&line, 128);
+  ds_init (&line);
 
   if (init_fn == NULL)
     {
       error (0, 0, _("cannot find output initialization file "
-                     "(use `-vvvvv' to view search path)"));
+                     "(use `-vv' to view search path)"));
       goto exit;
     }
 
@@ -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