projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
encoding-guesser: Don't guess UTF-8 for ASCII if it is the fallback.
[pspp]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index fea0e56b933b2838f5cf2deaad469969f0fd17a1..56deb9a5c0665c6f0cd50fb624d7815b20a9c21e 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-155,7
+155,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if ( ds == NULL )
{
if ( ds == NULL )
{
- ds =
create_dataset
();
+ ds =
dataset_create
();
d = dataset_dict (ds);
}
d = dataset_dict (ds);
}
@@
-174,7
+174,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
else
c = case_unshare_and_resize (c, dict_get_proto (d));
else
c = case_unshare_and_resize (c, dict_get_proto (d));
- if (!parse_value (lexer, case_data_rw (c, v), v
ar_get_width (v)
))
+ if (!parse_value (lexer, case_data_rw (c, v), v))
NOT_REACHED ();
if (!lex_force_match (lexer, T_RPAREN))
NOT_REACHED ();
if (!lex_force_match (lexer, T_RPAREN))
@@
-242,8
+242,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
retval = CMD_SUCCESS;
done:
retval = CMD_SUCCESS;
done:
- if (ds)
- destroy_dataset (ds);
+ dataset_destroy (ds);
case_unref (c);
case_unref (c);