Completely rewrite src/data/format.[ch], to achieve better

[pspp] / src / language / utilities / include.c

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index a148d6fac7e401f2ec97a9bc3ada89b15a604620..ef58a20e79cf8388315213b6dcea741a2f4db7cb 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -31,19 +31,19 @@
 #define _(msgid) gettext (msgid)
 
 int
-cmd_include (void)
+cmd_include (struct dataset *ds UNUSED)
 {
   /* Skip optional FILE=. */
   if (lex_match_id ("FILE"))
     lex_match ('=');
 
-  /* Filename can be identifier or string. */
+  /* File name can be identifier or string. */
   if (token != T_ID && token != T_STRING) 
     {
-      lex_error (_("expecting filename")); 
+      lex_error (_("expecting file name")); 
       return CMD_CASCADING_FAILURE;
     }
-  getl_include_syntax_file (ds_c_str (&tokstr));
+  getl_include_syntax_file (ds_cstr (&tokstr));
 
   lex_get ();
   return lex_end_of_command ();