X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fhtml.c;h=ea11459d132d642449c348227a9d623a65829760;hb=d2f8593a1f1d39a3264682af0da898a3d67b68cf;hp=6f56b47e9762efd6afbdb6ced40d556bdff609fd;hpb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;p=pspp

diff --git a/src/html.c b/src/html.c
index 6f56b47e97..ea11459d13 100644
--- a/src/html.c
+++ b/src/html.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include "htmlP.h"
-#include <assert.h>
+#include "error.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -156,7 +156,7 @@ html_option (struct outp_driver *this, const char *key, const struct string *val
       break;
     case 1:
       free (x->file.filename);
-      x->file.filename = xstrdup (ds_value (val));
+      x->file.filename = xstrdup (ds_c_str (val));
       break;
     case string_arg:
       {
@@ -168,10 +168,11 @@ html_option (struct outp_driver *this, const char *key, const struct string *val
 	    break;
 	  default:
 	    assert (0);
+            abort ();
 	  }
 	if (*dest)
 	  free (*dest);
-	*dest = xstrdup (ds_value (val));
+	*dest = xstrdup (ds_c_str (val));
       }
       break;
     default:
@@ -453,7 +454,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
     {
       fputs ("<P>", x->file.file);
       if (!ls_empty_p (t->cc))
-	escape_string (x->file.file, ls_value (t->cc), ls_length (t->cc));
+	escape_string (x->file.file, ls_c_str (t->cc), ls_length (t->cc));
       fputs ("</P>\n", x->file.file);
       
       return;
@@ -464,7 +465,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
   if (!ls_empty_p (&t->title))
     {
       fprintf (x->file.file, "  <TR>\n    <TH COLSPAN=%d>", t->nc);
-      escape_string (x->file.file, ls_value (&t->title),
+      escape_string (x->file.file, ls_c_str (&t->title),
 		     ls_length (&t->title));
       fputs ("</TH>\n  </TR>\n", x->file.file);
     }
@@ -489,7 +490,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
             cc = t->cc + c + r * t->nc;
 	    if (*ct & TAB_JOIN) 
               {
-                j = (struct tab_joined_cell *) ls_value (cc);
+                j = (struct tab_joined_cell *) ls_c_str (cc);
                 cc = &j->contents;
                 if (j->x1 != c || j->y1 != r)
                   continue; 
@@ -532,7 +533,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
 	    
 	    if ( ! (*ct & TAB_EMPTY)  ) 
 	      {
-		char *s = ls_value (cc);
+		char *s = ls_c_str (cc);
 		size_t l = ls_length (cc);
 
 		while (l && isspace ((unsigned char) *s))