X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-list.c;h=754341ccac3a120c8dc840e4d261894db54e9ba1;hb=e333a444bba7a84682b26a68c0894a8ca4f353a4;hp=31f51bca3c303def3f4b9c392a8e3bb58cf4dd47;hpb=55c55aa33d0f90d1b3b58f8b33b3fc54062c553e;p=pspp

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 31f51bca3c..754341ccac 100644
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -122,11 +122,11 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
 	  lex_match (lexer, T_LPAREN);
 	  if (!lex_force_int (lexer))
 	    goto error;
-	  
+
 	  int records = lex_integer (lexer);
 	  if (records < 0)
 	    {
-	      msg (SE, _("The %s value must be nonnegative."), "RECORDS");
+	      msg (SE, _("The %s value must be non-negative."), "RECORDS");
 	      goto error;
 	    }
           data_parser_set_records (parser, records);
@@ -141,7 +141,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
 	  int skip = lex_integer (lexer);
 	  if (skip < 0)
 	    {
-	      msg (SE, _("The %s value must be nonnegative."), "SKIP");
+	      msg (SE, _("The %s value must be non-negative."), "SKIP");
 	      goto error;
 	    }
           data_parser_set_skip (parser, skip);
@@ -306,7 +306,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
       add_transformation (ds, data_list_trns_proc, data_list_trns_free, trns);
     }
   else
-    data_parser_make_active_file (parser, ds, reader, dict);
+    data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL);
 
   fh_unref (fh);
   free (encoding);
@@ -316,7 +316,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
  error:
   data_parser_destroy (parser);
   if (!in_input_program ())
-    dict_destroy (dict);
+    dict_unref (dict);
   fh_unref (fh);
   free (encoding);
   return CMD_CASCADING_FAILURE;