X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevind.c;h=ad0cbeae0437389a821b6db03efdf9b9f0f82121;hb=c87fb686f323f651a1d3f3892c31bf66788916d9;hp=8432ea8e4d9f362dcedbfe3cdae129d3988f7468;hpb=d1fff00503280cb951cb8d3f592776ddf3c8595a;p=pspp

diff --git a/src/devind.c b/src/devind.c
index 8432ea8e4d..ad0cbeae04 100644
--- a/src/devind.c
+++ b/src/devind.c
@@ -88,7 +88,7 @@
 
 #include <config.h>
 #include "devind.h"
-#include <assert.h>
+#include "error.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -116,13 +116,13 @@ struct devind_driver_ext
   };
 
 static int
-devind_open_global (struct outp_class *this unused)
+devind_open_global (struct outp_class *this UNUSED)
 {
   return 1;
 }
 
 static int
-devind_close_global (struct outp_class *this unused)
+devind_close_global (struct outp_class *this UNUSED)
 {
   return 1;
 }
@@ -220,7 +220,7 @@ devind_option (struct outp_driver *this, const char *key, const struct string *v
       break;
     case 1:
       free (x->file.filename);
-      x->file.filename = xstrdup (ds_value (val));
+      x->file.filename = xstrdup (ds_c_str (val));
       break;
     default:
       assert (0);
@@ -320,7 +320,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
   if (t->nr == 1 && t->nc == 1)
     {
       fputs ("p:", x->file.file);
-      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));
       putc ('\n', x->file.file);
       
       return;
@@ -347,7 +347,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
   if (!ls_empty_p (&t->title))
     {
       putc ('T', x->file.file);
-      escape_string (x->file.file, ls_value (&t->title),
+      escape_string (x->file.file, ls_c_str (&t->title),
 		     ls_length (&t->title));
       putc ('\n', x->file.file);
     }
@@ -376,7 +376,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 (c != j->x1 || r != j->y1)
                   continue;
@@ -399,7 +399,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
             else
               putc ('c', x->file.file);
             putc ('t', x->file.file);
-            escape_string (x->file.file, ls_value (cc), ls_length (cc));
+            escape_string (x->file.file, ls_c_str (cc), ls_length (cc));
             putc ('\n', x->file.file);
           }
       }