X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Ffile-handle.q;h=71081b922ac0601835fec8b13a819aa4f2a17dc3;hb=774441e68b4d2e3a4b5c6975e9614dcd4369955e;hp=3e053ed57262eb5f6e94d404ed5686253e640a16;hpb=8f04b0ced35a66cfdebefbcb53c81979add36ca3;p=pspp diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q index 3e053ed572..71081b922a 100644 --- a/src/language/data-io/file-handle.q +++ b/src/language/data-io/file-handle.q @@ -129,7 +129,7 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds) { if (cmd.n_lrecl[0] == LONG_MIN) msg (SE, _("The specified file mode requires LRECL. " - "Assuming %d-character records."), + "Assuming %zu-character records."), properties.record_width); else if (cmd.n_lrecl[0] < 1 || cmd.n_lrecl[0] >= (1UL << 31)) msg (SE, _("Record length (%ld) must be between 1 and %lu bytes. " @@ -200,7 +200,7 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask) handle = fh_inline_file (); else { - if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING) + if (lex_token (lexer) != T_ID && !lex_is_string (lexer)) { lex_error (lexer, _("expecting a file name or handle name")); return NULL;