X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffile-type.c;h=44aa9bd95c29bbec3aac6f3f8262f7ba673ff25b;hb=0dd2d22c89cc94f92de0323c60ff16b993a46b18;hp=b0ed4607f06625071ff2941f30dee15ad6939e79;hpb=cb4033020c8a24d573814e6ac9192046bffdccac;p=pspp diff --git a/src/file-type.c b/src/file-type.c index b0ed4607f0..44aa9bd95c 100644 --- a/src/file-type.c +++ b/src/file-type.c @@ -284,15 +284,13 @@ cmd_file_type (void) static void create_col_var (struct col_spec *c) { - int type; int width; - type = (formats[c->fmt].cat & FCAT_STRING) ? ALPHA : NUMERIC; - if (type == ALPHA) + if (formats[c->fmt].cat & FCAT_STRING) width = c->nc; else width = 0; - c->v = force_create_variable (&default_dict, c->name, type, width); + c->v = dict_create_var (default_dict, c->name, width); } /* Parses variable, column, type specifications for a variable. */ @@ -612,7 +610,8 @@ cmd_end_file_type (void) /* Reads any number of cases into temp_case and calls write_case() for each one. Compare data-list.c:read_from_data_list. */ static void -file_type_source_read (void) +file_type_source_read (write_case_func *write_case UNUSED, + write_case_data wc_data UNUSED) { char *line; int len;