X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Ffile-type.c;h=adf81a995c8730bb6ac0d60b479ae592f3937e09;hb=ed7bce25787929340a3f264f00dde7c979e571a9;hp=e549ae9693a3ae42490130562bd33d16f27c6f45;hpb=d807ad29cc0d3caa4f0e04ee4b75c70a225cfeaf;p=pspp diff --git a/src/file-type.c b/src/file-type.c index e549ae9693..adf81a995c 100644 --- a/src/file-type.c +++ b/src/file-type.c @@ -44,7 +44,7 @@ enum /* Limited variable column specifications. */ struct col_spec { - char name[9]; /* Variable name. */ + char name[SHORT_NAME_LEN + 1]; /* Variable name. */ int fc, nc; /* First column (1-based), # of columns. */ int fmt; /* Format type. */ struct variable *v; /* Variable. */ @@ -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); - 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; @@ -435,7 +435,7 @@ cmd_record_type (void) { int mv = 0; - while (token == T_NUM || token == T_STRING) + while (lex_is_number () || token == T_STRING) { if (rct->nv >= mv) {