projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix memory leak in MCONVERT
[pspp]
/
src
/
language
/
data-io
/
data-list.c
diff --git
a/src/language/data-io/data-list.c
b/src/language/data-io/data-list.c
index 58224baa2de01b6b3920e7947cb25cd528de9be7..b6dc078985258011561bace4ddfcd59e91aff9c3 100644
(file)
--- a/
src/language/data-io/data-list.c
+++ b/
src/language/data-io/data-list.c
@@
-120,31
+120,18
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
{
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
{
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
- if (!lex_force_int
(lexer
))
+ if (!lex_force_int
_range (lexer, "RECORDS", 0, INT_MAX
))
goto error;
goto error;
-
- int records = lex_integer (lexer);
- if (records < 0)
- {
- msg (SE, _("The %s value must be non-negative."), "RECORDS");
- goto error;
- }
- data_parser_set_records (parser, records);
+ data_parser_set_records (parser, lex_integer (lexer));
lex_get (lexer);
lex_match (lexer, T_RPAREN);
}
else if (lex_match_id (lexer, "SKIP"))
{
lex_match (lexer, T_EQUALS);
lex_get (lexer);
lex_match (lexer, T_RPAREN);
}
else if (lex_match_id (lexer, "SKIP"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int
(lexer
))
+ if (!lex_force_int
_range (lexer, "SKIP", 0, INT_MAX
))
goto error;
goto error;
- int skip = lex_integer (lexer);
- if (skip < 0)
- {
- msg (SE, _("The %s value must be non-negative."), "SKIP");
- goto error;
- }
- data_parser_set_skip (parser, skip);
+ data_parser_set_skip (parser, lex_integer (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "END"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "END"))
@@
-540,7
+527,7
@@
data_list_trns_proc (void *trns_, struct ccase **c, casenumber case_num UNUSED)
/* If there was an END subcommand handle it. */
if (trns->end != NULL)
{
/* If there was an END subcommand handle it. */
if (trns->end != NULL)
{
- double *end =
&case_data_rw (*c, trns->end)->f
;
+ double *end =
case_num_rw (*c, trns->end)
;
if (retval == TRNS_END_FILE)
{
*end = 1.0;
if (retval == TRNS_END_FILE)
{
*end = 1.0;