projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(dump_aggregate_info) Properly test whether the destination variable
[pspp-builds.git]
/
src
/
file-type.c
diff --git
a/src/file-type.c
b/src/file-type.c
index fee9ee5abd473f20348d184a9f49a9d161b38ef4..a4940c23f1631f347b5a90db3d7c573a12210719 100644
(file)
--- a/
src/file-type.c
+++ b/
src/file-type.c
@@
-280,7
+280,7
@@
cmd_file_type (void)
create_col_var (&fty->record);
if (fty->case_sbc.name[0])
create_col_var (&fty->case_sbc);
create_col_var (&fty->record);
if (fty->case_sbc.name[0])
create_col_var (&fty->case_sbc);
- vfm_source = create_case_source (&file_type_source_class,
default_dict,
fty);
+ vfm_source = create_case_source (&file_type_source_class, fty);
return CMD_SUCCESS;
return CMD_SUCCESS;
@@
-373,7
+373,7
@@
parse_col_spec (struct col_spec *c, const char *def_name)
spec.type = c->fmt;
spec.w = c->nc;
spec.d = 0;
spec.type = c->fmt;
spec.w = c->nc;
spec.d = 0;
- return check_input_specifier (&spec);
+ return check_input_specifier (&spec
, 1
);
}
\f
/* RECORD TYPE. */
}
\f
/* RECORD TYPE. */
@@
-435,7
+435,7
@@
cmd_record_type (void)
{
int mv = 0;
{
int mv = 0;
- while (
token == T_NUM
|| token == T_STRING)
+ while (
lex_is_number ()
|| token == T_STRING)
{
if (rct->nv >= mv)
{
{
if (rct->nv >= mv)
{
@@
-636,7
+636,7
@@
file_type_source_read (struct case_source *source,
format.d = 0;
while (!dfm_eof (fty->reader))
{
format.d = 0;
while (!dfm_eof (fty->reader))
{
- struct
len
_string line;
+ struct
fixed
_string line;
struct record_type *iter;
union value v;
int i;
struct record_type *iter;
union value v;
int i;