projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed error running 'make distcheck'
[pspp]
/
src
/
language
/
data-io
/
get-data.c
diff --git
a/src/language/data-io/get-data.c
b/src/language/data-io/get-data.c
index 061fde1c03a0a4628873d58be10041a8c7cce38f..66dd19f2397d7636228f2069eea4406eb07945ae 100644
(file)
--- a/
src/language/data-io/get-data.c
+++ b/
src/language/data-io/get-data.c
@@
-59,7
+59,7
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
{
char *tok = NULL;
struct spreadsheet_read_options opts;
{
char *tok = NULL;
struct spreadsheet_read_options opts;
-
+
opts.sheet_name = NULL;
opts.sheet_index = -1;
opts.cell_range = NULL;
opts.sheet_name = NULL;
opts.sheet_index = -1;
opts.cell_range = NULL;
@@
-79,7
+79,7
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
if (s)
tok = strdup (s);
if (s)
tok = strdup (s);
-
+
if (lex_match_id (lexer, "TXT"))
{
free (tok);
if (lex_match_id (lexer, "TXT"))
{
free (tok);
@@
-90,7
+90,7
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
free (tok);
return parse_get_psql (lexer, ds);
}
free (tok);
return parse_get_psql (lexer, ds);
}
- else if (lex_match_id (lexer, "GNM") ||
+ else if (lex_match_id (lexer, "GNM") ||
lex_match_id (lexer, "ODS"))
{
char *filename = NULL;
lex_match_id (lexer, "ODS"))
{
char *filename = NULL;
@@
-98,9
+98,9
@@
cmd_get_data (struct lexer *lexer, struct dataset *ds)
goto error;
struct spreadsheet *spreadsheet = NULL;
goto error;
struct spreadsheet *spreadsheet = NULL;
- if (
0 == strncasecmp (tok, "GNM", 3))
+ if (0 == strncasecmp (tok, "GNM", 3))
spreadsheet = gnumeric_probe (filename, true);
spreadsheet = gnumeric_probe (filename, true);
- else if (
0 == strncasecmp (tok, "ODS", 3))
+ else if (0 == strncasecmp (tok, "ODS", 3))
spreadsheet = ods_probe (filename, true);
if (spreadsheet == NULL)
spreadsheet = ods_probe (filename, true);
if (spreadsheet == NULL)
@@
-159,9
+159,9
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
lex_get (lexer);
- while (lex_match (lexer, T_SLASH)
)
+ while (lex_match (lexer, T_SLASH))
{
{
- if (
lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
+ if (lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
{
lex_match (lexer, T_EQUALS);
if (lex_force_int (lexer))
{
lex_match (lexer, T_EQUALS);
if (lex_force_int (lexer))
@@
-170,7
+170,7
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
}
}
lex_get (lexer);
}
}
- else if (
lex_match_id (lexer, "BSIZE"))
+ else if (lex_match_id (lexer, "BSIZE"))
{
lex_match (lexer, T_EQUALS);
if (lex_force_int (lexer))
{
lex_match (lexer, T_EQUALS);
if (lex_force_int (lexer))
@@
-179,14
+179,14
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
}
}
lex_get (lexer);
}
}
- else if (
lex_match_id (lexer, "UNENCRYPTED"))
+ else if (lex_match_id (lexer, "UNENCRYPTED"))
{
psql.allow_clear = true;
}
else if (lex_match_id (lexer, "SQL"))
{
lex_match (lexer, T_EQUALS);
{
psql.allow_clear = true;
}
else if (lex_match_id (lexer, "SQL"))
{
lex_match (lexer, T_EQUALS);
- if (
! lex_force_string (lexer)
)
+ if (
! lex_force_string (lexer)
)
goto error;
ds_put_substring (&psql.sql, lex_tokss (lexer));
goto error;
ds_put_substring (&psql.sql, lex_tokss (lexer));
@@
-197,7
+197,7
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
struct dictionary *dict = NULL;
struct casereader *reader = psql_open_reader (&psql, &dict);
struct dictionary *dict = NULL;
struct casereader *reader = psql_open_reader (&psql, &dict);
- if (
reader
)
+ if (
reader
)
{
dataset_set_dict (ds, dict);
dataset_set_source (ds, reader);
{
dataset_set_dict (ds, dict);
dataset_set_source (ds, reader);
@@
-218,7
+218,7
@@
parse_get_psql (struct lexer *lexer, struct dataset *ds)
}
static bool
}
static bool
-parse_spreadsheet (struct lexer *lexer, char **filename,
+parse_spreadsheet (struct lexer *lexer, char **filename,
struct spreadsheet_read_options *opts)
{
opts->sheet_index = 1;
struct spreadsheet_read_options *opts)
{
opts->sheet_index = 1;
@@
-243,9
+243,9
@@
parse_spreadsheet (struct lexer *lexer, char **filename,
lex_get (lexer);
lex_get (lexer);
- while (lex_match (lexer, T_SLASH)
)
+ while (lex_match (lexer, T_SLASH))
{
{
- if (
lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
+ if (lex_match_id (lexer, "ASSUMEDSTRWIDTH"))
{
lex_match (lexer, T_EQUALS);
if (lex_force_int (lexer))
{
lex_match (lexer, T_EQUALS);
if (lex_force_int (lexer))
@@
-259,7
+259,7
@@
parse_spreadsheet (struct lexer *lexer, char **filename,
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAME"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAME"))
{
- if (
! lex_force_string (lexer)
)
+ if (
! lex_force_string (lexer)
)
goto error;
opts->sheet_name = ss_xstrdup (lex_tokss (lexer));
goto error;
opts->sheet_name = ss_xstrdup (lex_tokss (lexer));
@@
-297,7
+297,7
@@
parse_spreadsheet (struct lexer *lexer, char **filename,
}
else if (lex_match_id (lexer, "RANGE"))
{
}
else if (lex_match_id (lexer, "RANGE"))
{
- if (
! lex_force_string (lexer)
)
+ if (
! lex_force_string (lexer)
)
goto error;
opts->cell_range = ss_xstrdup (lex_tokss (lexer));
goto error;
opts->cell_range = ss_xstrdup (lex_tokss (lexer));
@@
-314,7
+314,7
@@
parse_spreadsheet (struct lexer *lexer, char **filename,
{
lex_match (lexer, T_EQUALS);
{
lex_match (lexer, T_EQUALS);
- if (
lex_match_id (lexer, "ON"))
+ if (lex_match_id (lexer, "ON"))
{
opts->read_names = true;
}
{
opts->read_names = true;
}
@@
-425,7
+425,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
DP_DELIMITED, &has_type);
else
{
DP_DELIMITED, &has_type);
else
{
- lex_error_expecting (lexer, "FIXED", "DELIMITED"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "FIXED", "DELIMITED");
goto error;
}
if (!ok)
goto error;
}
if (!ok)
@@
-463,7
+463,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
}
else
{
}
else
{
- lex_error_expecting (lexer, "LINE", "VARIABLES"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "LINE", "VARIABLES");
goto error;
}
}
goto error;
}
}
@@
-560,7
+560,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
break;
else
{
break;
else
{
- lex_error_expecting (lexer, "VARIABLES"
, NULL_SENTINEL
);
+ lex_error_expecting (lexer, "VARIABLES");
goto error;
}
}
goto error;
}
}
@@
-599,7
+599,13
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
}
lex_get (lexer);
}
- name = xstrdup (lex_tokcstr (lexer));
+ const char * tstr = lex_tokcstr (lexer);
+ if (tstr == NULL)
+ {
+ lex_error (lexer, NULL);
+ goto error;
+ }
+ name = xstrdup (tstr);
if (!lex_force_id (lexer)
|| !dict_id_is_valid (dict, name, true))
{
if (!lex_force_id (lexer)
|| !dict_id_is_valid (dict, name, true))
{
@@
-673,14
+679,14
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
if (reader == NULL)
goto error;
if (reader == NULL)
goto error;
- data_parser_make_active_file (parser, ds, reader, dict);
+ data_parser_make_active_file (parser, ds, reader, dict
, NULL, NULL
);
fh_unref (fh);
free (encoding);
return CMD_SUCCESS;
error:
data_parser_destroy (parser);
fh_unref (fh);
free (encoding);
return CMD_SUCCESS;
error:
data_parser_destroy (parser);
- dict_
destroy
(dict);
+ dict_
unref
(dict);
fh_unref (fh);
free (name);
free (encoding);
fh_unref (fh);
free (name);
free (encoding);
@@
-688,7
+694,7
@@
parse_get_txt (struct lexer *lexer, struct dataset *ds)
}
}
-static void
+static void
destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
{
free (opts->cell_range);
destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
{
free (opts->cell_range);