X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcommands%2Fplacement-parser.c;fp=src%2Flanguage%2Fcommands%2Fplacement-parser.c;h=178529a7ebf7f66b242ea6f9e39355ac90d04f12;hb=064e63444113026f99a518bf1ec77da5eb6b036b;hp=9fc4d95b587af2aa7c246454b57f4dec58fa261e;hpb=12b9efe4bcd6ef6e5a87df9108e4ba49182730b4;p=pspp diff --git a/src/language/commands/placement-parser.c b/src/language/commands/placement-parser.c index 9fc4d95b58..178529a7eb 100644 --- a/src/language/commands/placement-parser.c +++ b/src/language/commands/placement-parser.c @@ -167,7 +167,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t n_vars, int end_ofs = lex_ofs (lexer) - 1; struct fmt_spec format = { .type = type, .w = w, .d = d }; - char *error = fmt_check__ (&format, use); + char *error = fmt_check__ (format, use); if (error) { lex_ofs_error (lexer, start_ofs, end_ofs, "%s", error); @@ -247,7 +247,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use, _("Unknown format type `%s'."), type); return false; } - char *error = fmt_check__ (&f, use); + char *error = fmt_check__ (f, use); if (error) { lex_ofs_error (lexer, ofs, ofs, "%s", error); @@ -291,17 +291,17 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use, as appropriate, and returns true. Otherwise, returns false without any side effects. */ bool -execute_placement_format (const struct fmt_spec *format, +execute_placement_format (const struct fmt_spec format, int *record, int *column) { - switch ((int) format->type) + switch ((int) format.type) { case PRS_TYPE_X: - *column += format->w; + *column += format.w; return true; case PRS_TYPE_T: - *column = format->w; + *column = format.w; return true; case PRS_TYPE_NEW_REC: @@ -310,7 +310,7 @@ execute_placement_format (const struct fmt_spec *format, return true; default: - assert (format->type < FMT_NUMBER_OF_FORMATS); + assert (format.type < FMT_NUMBER_OF_FORMATS); return false; } }