X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=c949510f659f4e47159143b1750af7e7f7866d40;hb=979ad20e18c60327ccb55215bed7b9d08be1aeae;hp=c2de9318ae81b13462c940aae839a580f886c2d4;hpb=e195fccfab97205acb29f90fd1168488d49f1573;p=pspp diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c index c2de9318ae..c949510f65 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 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,9 +53,9 @@ 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); @@ -80,7 +80,7 @@ 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)) {