X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Faggregate.c;h=fed765692f9a65cc30d20c3b1d17ff2bef81843b;hb=01c3f002d3a9ad239bb145c4a20dccdef75b0775;hp=fe6f5eed685993411f035856cc1a0204bf7b3a68;hpb=d9fc15ceb74cdc66487ba9aaed04246170729640;p=pspp diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c index fe6f5eed68..fed765692f 100644 --- a/src/language/stats/aggregate.c +++ b/src/language/stats/aggregate.c @@ -182,7 +182,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds) lex_match (lexer, T_EQUALS); if (!lex_match (lexer, T_ASTERISK)) { - out_file = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH); + out_file = fh_parse (lexer, FH_REF_FILE, dataset_session (ds)); if (out_file == NULL) goto error; } @@ -638,8 +638,7 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict, free (dest[i]); if (dest_label[i]) - var_set_label (destvar, dest_label[i], - dict_get_encoding (agr->dict), true); + var_set_label (destvar, dest_label[i], true); v->dest = destvar; }