projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GET: Fix confusion over the type of the 'type' parameter.
[pspp-builds.git]
/
src
/
language
/
data-io
/
get.c
diff --git
a/src/language/data-io/get.c
b/src/language/data-io/get.c
index 028cc3c6c525989564d841ea3c0e0fecf2cfd257..d32f25567a25dcfd28cf7b3dad7189cc2bee29f6 100644
(file)
--- a/
src/language/data-io/get.c
+++ b/
src/language/data-io/get.c
@@
-66,7
+66,8
@@
cmd_import (struct lexer *lexer, struct dataset *ds)
/* Parses a GET or IMPORT command. */
static int
/* Parses a GET or IMPORT command. */
static int
-parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command type)
+parse_read_command (struct lexer *lexer, struct dataset *ds,
+ enum reader_command command)
{
struct casereader *reader = NULL;
struct file_handle *fh = NULL;
{
struct casereader *reader = NULL;
struct file_handle *fh = NULL;
@@
-86,15
+87,12
@@
parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
if (fh == NULL)
goto error;
}
if (fh == NULL)
goto error;
}
- else if (
type
== IMPORT_CMD && lex_match_id (lexer, "TYPE"))
+ else if (
command
== IMPORT_CMD && lex_match_id (lexer, "TYPE"))
{
lex_match (lexer, T_EQUALS);
{
lex_match (lexer, T_EQUALS);
- if (lex_match_id (lexer, "COMM"))
- type = PFM_COMM;
- else if (lex_match_id (lexer, "TAPE"))
- type = PFM_TAPE;
- else
+ if (!lex_match_id (lexer, "COMM")
+ && !lex_match_id (lexer, "TAPE"))
{
lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
goto error;
{
lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
goto error;