X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcommand.c;h=ed043d2197363fc0ef81cebae2f119f480573ad1;hb=b74d09af5e07f954c18e7cdb8aca3af47fa10208;hp=7b903ab1a29f64a916d7f3891b960a2c3b6c4952;hpb=75862bc63003b33702bfd6844b8a4d1c632488b3;p=pspp-builds.git

diff --git a/src/language/command.c b/src/language/command.c
index 7b903ab1..ed043d21 100644
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -430,15 +430,15 @@ unknown_command_error (char *const words[], size_t word_cnt)
       struct string s;
       size_t i;
 
-      ds_init (&s);
+      ds_init_empty (&s);
       for (i = 0; i < word_cnt; i++) 
         {
           if (i != 0)
-            ds_putc (&s, ' ');
-          ds_puts (&s, words[i]);
+            ds_put_char (&s, ' ');
+          ds_put_cstr (&s, words[i]);
         }
 
-      msg (SE, _("Unknown command %s."), ds_c_str (&s));
+      msg (SE, _("Unknown command %s."), ds_cstr (&s));
 
       ds_destroy (&s);
     }
@@ -467,7 +467,7 @@ parse_command_name (void)
       assert (word_cnt < sizeof words / sizeof *words);
       if (token == T_ID) 
         {
-          words[word_cnt] = xstrdup (ds_c_str (&tokstr));
+          words[word_cnt] = ds_xstrdup (&tokstr);
           str_uppercase (words[word_cnt]); 
         }
       else if (token == '-')
@@ -686,10 +686,10 @@ cmd_erase (void)
   if (!lex_force_string ())
     return CMD_FAILURE;
 
-  if (remove (ds_c_str (&tokstr)) == -1)
+  if (remove (ds_cstr (&tokstr)) == -1)
     {
       msg (SW, _("Error removing `%s': %s."),
-	   ds_c_str (&tokstr), strerror (errno));
+	   ds_cstr (&tokstr), strerror (errno));
       return CMD_FAILURE;
     }
 
@@ -767,7 +767,7 @@ run_command (void)
 	lex_get ();
 	if (!lex_force_string ())
 	  return CMD_FAILURE;
-	cmd = ds_c_str (&tokstr);
+	cmd = ds_cstr (&tokstr);
 	string = 1;
       }
     else