X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fascii.c;h=d98ab67b4ed7212036c07d83bf37c47e7036070b;hb=05e356b2a3087e819ef3b5388e29c822f41502e1;hp=4a30663fa452df1fa9ef46e24708e87940a71fd7;hpb=eeb3352d718b0cd85afab3f7a7466fcac7791c1c;p=pspp

diff --git a/src/ascii.c b/src/ascii.c
index 4a30663fa4..d98ab67b4e 100644
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -165,9 +165,9 @@ struct ascii_driver_ext
     int bottom_margin;		/* Bottom margin in lines. */
     int paginate;		/* 1=insert formfeeds. */
     int tab_width;		/* Width of a tab; 0 not to use tabs. */
-    struct len_string ops[OPS_COUNT]; /* Basic output strings. */
-    struct len_string box[LNS_COUNT]; /* Line & box drawing characters. */
-    struct len_string fonts[FSTY_COUNT]; /* Font styles; NULL=overstrike. */
+    struct fixed_string ops[OPS_COUNT]; /* Basic output strings. */
+    struct fixed_string box[LNS_COUNT]; /* Line & box drawing characters. */
+    struct fixed_string fonts[FSTY_COUNT]; /* Font styles; NULL=overstrike. */
     int overstrike_style;	/* OVS_SINGLE or OVS_LINE. */
     int carriage_return_style;	/* Carriage return style. */
     int squeeze_blank_lines;    /* 1=squeeze multiple blank lines into one. */
@@ -599,7 +599,7 @@ ascii_option (struct outp_driver *this, const char *key,
       break;
     case string_arg:
       {
-	struct len_string *s;
+	struct fixed_string *s;
 	switch (subcat)
 	  {
 	  case 0:
@@ -670,7 +670,7 @@ int
 postopen (struct file_ext *f)
 {
   struct ascii_driver_ext *x = f->param;
-  struct len_string *s = &x->ops[OPS_INIT];
+  struct fixed_string *s = &x->ops[OPS_INIT];
 
   if (!ls_empty_p (s) && fwrite (ls_c_str (s), ls_length (s), 1, f->file) < 1)
     {
@@ -685,7 +685,7 @@ int
 preclose (struct file_ext *f)
 {
   struct ascii_driver_ext *x = f->param;
-  struct len_string *d = &x->ops[OPS_DONE];
+  struct fixed_string *d = &x->ops[OPS_DONE];
 
   if (!ls_empty_p (d) && fwrite (ls_c_str (d), ls_length (d), 1, f->file) < 1)
     {
@@ -1209,7 +1209,7 @@ output_shorts (struct outp_driver *this,
     {
       if (*bp & 0x800)
 	{
-	  struct len_string *box = &ext->box[*bp & 0xff];
+	  struct fixed_string *box = &ext->box[*bp & 0xff];
 	  size_t len = ls_length (box);
 
 	  if (remaining >= len)
@@ -1228,7 +1228,7 @@ output_shorts (struct outp_driver *this,
 	}
       else if (*bp & 0x0300)
 	{
-	  struct len_string *on;
+	  struct fixed_string *on;
 	  char buf[5];
 	  int len;
 
@@ -1373,7 +1373,7 @@ output_lines (struct outp_driver *this, int first, int count)
   struct ascii_driver_ext *ext = this->ext;
   int line_num;
 
-  struct len_string *newline = &ext->ops[OPS_NEWLINE];
+  struct fixed_string *newline = &ext->ops[OPS_NEWLINE];
 
   int n_chars;
   int n_passes;
@@ -1421,7 +1421,7 @@ output_lines (struct outp_driver *this, int first, int count)
 	  /* Turn off old font. */
 	  if (attr != (OUTP_F_R << 8))
 	    {
-	      struct len_string *off;
+	      struct fixed_string *off;
 
 	      switch (attr)
 		{
@@ -1446,7 +1446,7 @@ output_lines (struct outp_driver *this, int first, int count)
 	  attr = (*bp & 0x0300);
 	  if (attr != (OUTP_F_R << 8))
 	    {
-	      struct len_string *on;
+	      struct fixed_string *on;
 
 	      switch (attr)
 		{
@@ -1631,6 +1631,28 @@ ascii_close_page (struct outp_driver *this)
   return 1;
 }
 
+
+
+void ascii_chart_initialise(struct outp_class *c UNUSED, 
+			    struct chart *ch UNUSED);
+
+void ascii_chart_finalise(struct outp_class *c UNUSED, 
+			  struct chart *ch UNUSED);
+
+
+void
+ascii_chart_initialise(struct outp_class *c UNUSED, struct chart *ch )
+{
+  msg(MW, _("Charts are unsupported with ascii drivers."));
+  ch->lp = 0;
+}
+
+void 
+ascii_chart_finalise(struct outp_class *c UNUSED, struct chart *ch UNUSED)
+{
+  
+}
+
 struct outp_class ascii_class =
 {
   "ascii",
@@ -1669,4 +1691,7 @@ struct outp_class ascii_class =
   ascii_text_get_size,
   ascii_text_metrics,
   ascii_text_draw,
+
+  ascii_chart_initialise,
+  ascii_chart_finalise
 };