X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=eae06df76c0c05ca2834f35a02b0ecf04c29f867;hb=033449d465fb54526d3984d55772e6a38e7d922c;hp=c2de9318ae81b13462c940aae839a580f886c2d4;hpb=e195fccfab97205acb29f90fd1168488d49f1573;p=pspp

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index c2de9318ae..eae06df76c 100644
--- 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 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
@@ -53,16 +53,16 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
   handle = fh_parse (lexer, FH_REF_FILE, dataset_session (ds));
   if (!handle)
     return CMD_FAILURE;
-  reader = any_reader_open (handle, &dict);
+  reader = any_reader_open_and_decode (handle, NULL, &dict, NULL);
   fh_unref (handle);
-  if (dict == NULL)
+  if (!reader)
     return CMD_FAILURE;
 
   casereader_destroy (reader);
 
-  for (i = 0; i < dict_get_var_cnt (dict); i++)
+  for (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)
@@ -80,13 +80,13 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
 	}
 
       if (var_has_label (s))
-        var_set_label (t, var_get_label (s), false);
+        var_set_label (t, var_get_label (s));
 
       if (var_has_value_labels (s))
         {
           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 +102,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 +125,7 @@ cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds)
         dict_set_weight (dataset_dict (ds), new_weight);
     }
 
+  dict_unref (dict);
+
   return CMD_SUCCESS;
 }