EXAMINE: Improve error messages.

[pspp] / src / language / dictionary / apply-dictionary.c

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index c949510f659f4e47159143b1750af7e7f7866d40..354a5170558c527b6320a101bd19415244534f31 100644 (file)
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2014, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -39,30 +39,27 @@
 int
 cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
 {
-  struct file_handle *handle;
-  struct casereader *reader;
-  struct dictionary *dict;
-
-  int n_matched = 0;
-
-  int i;
-
   lex_match_id (lexer, "FROM");
   lex_match (lexer, T_EQUALS);
 
-  handle = fh_parse (lexer, FH_REF_FILE, dataset_session (ds));
+  struct file_handle *handle = fh_parse (lexer, FH_REF_FILE,
+                                         dataset_session (ds));
   if (!handle)
     return CMD_FAILURE;
-  reader = any_reader_open_and_decode (handle, NULL, &dict, NULL);
+
+  struct dictionary *dict;
+  struct casereader *reader = any_reader_open_and_decode (handle, NULL, &dict,
+                                                          NULL);
   fh_unref (handle);
   if (!reader)
     return CMD_FAILURE;
 
   casereader_destroy (reader);
 
-  for (i = 0; i < dict_get_var_cnt (dict); i++)
+  size_t n_matched = 0;
+  for (size_t i = 0; i < dict_get_n_vars (dict); i++)
     {
-      struct variable *s = dict_get_var (dict, i);
+      const struct variable *s = dict_get_var (dict, i);
       struct variable *t = dict_lookup_var (dataset_dict (ds),
                                             var_get_name (s));
       if (t == NULL)
@@ -86,7 +83,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
         {
           const struct val_labs *value_labels = var_get_value_labels (s);
           if (val_labs_can_set_width (value_labels, var_get_width (t)))
-            var_set_value_labels (s, value_labels);
+            var_set_value_labels (t, value_labels);
         }
 
       if (var_has_missing_values (s))
@@ -102,7 +99,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
           var_set_write_format (t, var_get_write_format (s));
        }
 
-      if (var_has_attributes (s)) 
+      if (var_has_attributes (s))
         var_set_attributes (t, var_get_attributes (s));
     }
 
@@ -125,5 +122,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
         dict_set_weight (dataset_dict (ds), new_weight);
     }
 
+  dict_unref (dict);
+
   return CMD_SUCCESS;
 }