if (!lex_match_id (lexer, "COMM")
&& !lex_match_id (lexer, "TAPE"))
{
- lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "COMM", "TAPE");
goto error;
}
}
if (fh == NULL)
{
- lex_sbc_missing ("FILE");
+ lex_sbc_missing (lexer, "FILE");
goto error;
}
if (reader == NULL)
goto error;
- if (dict_get_var_cnt (dict) == 0)
+ if (dict_get_n_vars (dict) == 0)
{
msg (SE, _("%s: Data file dictionary has no variables."),
fh_get_name (fh));
while (lex_token (lexer) != T_ENDCMD)
{
lex_match (lexer, T_SLASH);
- if (!parse_dict_trim (lexer, dict))
+ if (!parse_dict_trim (lexer, dict, false))
goto error;
}
dict_compact_values (dict);
fh_unref (fh);
casereader_destroy (reader);
if (dict != NULL)
- dict_destroy (dict);
+ dict_unref (dict);
free (encoding);
return CMD_CASCADING_FAILURE;
}