X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Foutput.h;h=c54c1be5a77ab10ae26b4e017f7ae48e467a8e3d;hb=c246143823df29e9ce4c5115c647a47954dea883;hp=8f44b1d9f74f85220d39eb9eedea0c704aeb69fb;hpb=52b9fca3a729eaef7d13469029e4391aa033a659;p=pspp

diff --git a/src/output/output.h b/src/output/output.h
index 8f44b1d9f7..c54c1be5a7 100644
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 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
@@ -55,7 +54,7 @@ struct outp_text
   {
     enum outp_font font;
     enum outp_justification justification;
-    struct fixed_string string;
+    struct substring string;
     int h, v;			/* Horizontal, vertical size. */
     int x, y;			/* Position. */
   };
@@ -70,7 +69,7 @@ struct outp_class
     const char *name;		/* Name of this driver class. */
     int special;		/* Boolean value. */
 
-    bool (*open_driver) (struct outp_driver *, const struct string *options);
+    bool (*open_driver) (struct outp_driver *, struct substring options);
     bool (*close_driver) (struct outp_driver *);
 
     void (*open_page) (struct outp_driver *);
@@ -103,7 +102,7 @@ enum
 struct outp_driver
   {
     struct outp_driver *next, *prev; /* List of drivers. */
-    struct outp_class *class;	/* Driver class. */
+    const struct outp_class *class;	/* Driver class. */
     char *name;			/* Name of this driver. */
     bool page_open;		/* 1=page is open, 0=page is closed. */
     int device;			/* Zero or more of OUTP_DEV_*. */
@@ -128,8 +127,6 @@ struct outp_option
     int subcat;			/* Subcategory. */
   };
 
-/* List of configured output drivers. */
-extern struct outp_driver *outp_driver_list;
 
 /* Title, subtitle. */
 extern char *outp_title;
@@ -148,14 +145,14 @@ void outp_list_classes (void);
 void outp_enable_device (int enable, int device);
 struct outp_driver *outp_drivers (struct outp_driver *);
 
-bool outp_parse_options (const struct string *options,
+bool outp_parse_options (struct substring options,
                          bool (*) (struct outp_driver *, const char *key,
                                    const struct string *value),
                          struct outp_driver *);
-int outp_match_keyword (const char *, struct outp_option *, int *);
+int outp_match_keyword (const char *, const struct outp_option *, int *);
 
 int outp_evaluate_dimension (char *, char **);
-int outp_get_paper_size (char *, int *h, int *v);
+bool outp_get_paper_size (char *, int *h, int *v);
 
 void outp_open_page (struct outp_driver *);
 void outp_close_page (struct outp_driver *);