X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=c00baa5d6654e9d7f049d6214ea337d84f81041f;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=32202babdea8848f5c3a06b6431b0db3c4b007ff;hpb=cb72db62c20ecab427229110820c5b053d0663c4;p=pspp diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index 32202babde..c00baa5d66 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -219,7 +219,6 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) } else { - printf ("Unknown data file type \"\%s\"\n", lex_tokid (lexer)); goto error; } lex_get (lexer); @@ -312,7 +311,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) DP_DELIMITED, &has_type); else { - lex_error (lexer, _("expecting FIXED or DELIMITED")); + lex_error (lexer, _("expecting %s or %s"), "FIXED", "DELIMITED"); goto error; } if (!ok) @@ -350,7 +349,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } else { - lex_error (lexer, _("expecting LINE or VARIABLES")); + lex_error (lexer, _("expecting %s or %s"), "LINE", "VARIABLES"); goto error; } }