X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget.c;h=cb1789aa3704027dc53a3b09c0f3970324a45023;hb=d4f19dd9241b87b0b330daf674ed90d767b44822;hp=2440bd900b9d2ee01fcfac78342f70f88004c36b;hpb=38e6de480f30185dce6be3ad39668f4bfd5fd15d;p=pspp

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index 2440bd900b..cb1789aa37 100644
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -109,7 +109,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds,
 	  if (!lex_match_id (lexer, "COMM")
               && !lex_match_id (lexer, "TAPE"))
 	    {
-	      lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
+	      lex_error_expecting (lexer, "COMM", "TAPE");
               goto error;
 	    }
 	}
@@ -119,7 +119,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds,
 
   if (fh == NULL)
     {
-      lex_sbc_missing ("FILE");
+      lex_sbc_missing (lexer, "FILE");
       goto error;
     }
 
@@ -127,7 +127,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds,
   if (reader == NULL)
     goto error;
 
-  if (dict_get_var_cnt (dict) == 0)
+  if (dict_get_n_vars (dict) == 0)
     {
       msg (SE, _("%s: Data file dictionary has no variables."),
            fh_get_name (fh));
@@ -139,7 +139,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds,
   while (lex_token (lexer) != T_ENDCMD)
     {
       lex_match (lexer, T_SLASH);
-      if (!parse_dict_trim (lexer, dict))
+      if (!parse_dict_trim (lexer, dict, false))
         goto error;
     }
   dict_compact_values (dict);
@@ -161,7 +161,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds,
   fh_unref (fh);
   casereader_destroy (reader);
   if (dict != NULL)
-    dict_destroy (dict);
+    dict_unref (dict);
   free (encoding);
   return CMD_CASCADING_FAILURE;
 }