Fix up potential overflows in size calculations by replacing

[pspp] / src / output.h

diff --git a/src/output.h b/src/output.h
index 3309610d661d196585a0be811759f23ed8d11409..3b5eeebaaf0cbe36c07ff416cddf62b57f5267a1 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !output_h
 #define output_h 1
@@ -104,7 +104,7 @@ struct outp_text
   {
     /* Public. */
     int options;               /* What is specified. */
-    struct len_string s;       /* String. */
+    struct fixed_string s;     /* String. */
     int h, v;                  /* Horizontal, vertical size. */
     int x, y;                  /* Position. */
 
@@ -170,8 +170,8 @@ struct outp_class
     void (*text_metrics) (struct outp_driver *, struct outp_text *);
     void (*text_draw) (struct outp_driver *, struct outp_text *);
 
-    void (*initialise_chart)(struct outp_class *, struct chart *);
-    void (*finialise_chart)(struct outp_class *, struct chart *);
+    void (*initialise_chart)(struct outp_driver *, struct chart *);
+    void (*finalise_chart)(struct outp_driver *, struct chart *);
 
   };