Two testcases for MS format attributes needed updating after Paolo Bonzini's 2010-11-13 improvements to format checking diagnostics (r166698). I've applied this patch to update them. Tested with cross to i686-mingw32.
2011-10-25 Joseph Myers <jos...@codesourcery.com> * gcc.dg/format/ms_c90-printf-1.c, gcc.dg/format/ms_c90-scanf-1.c: Update expected messages. Index: gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c =================================================================== --- gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c (revision 180200) +++ gcc/testsuite/gcc.dg/format/ms_c90-scanf-1.c (working copy) @@ -106,7 +106,7 @@ scanf ("%s", cs); /* { dg-warning "constant" "%s writing into const" } */ scanf ("%p", pcp); /* { dg-warning "constant" "%p writing into const" } */ /* Wrong number of arguments. */ - scanf ("%d%d", ip); /* { dg-warning "arguments" "wrong number of args" } */ + scanf ("%d%d", ip); /* { dg-warning "matching" "wrong number of args" } */ scanf ("%d", ip, ip); /* { dg-warning "arguments" "wrong number of args" } */ /* Miscellaneous bogus constructions. */ scanf (""); /* { dg-warning "zero-length" "warning for empty format" } */ Index: gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c =================================================================== --- gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c (revision 180200) +++ gcc/testsuite/gcc.dg/format/ms_c90-printf-1.c (working copy) @@ -167,7 +167,7 @@ */ printf ("%d", u); /* Wrong number of arguments. */ - printf ("%d%d", i); /* { dg-warning "arguments" "wrong number of args" } */ + printf ("%d%d", i); /* { dg-warning "matching" "wrong number of args" } */ printf ("%d", i, i); /* { dg-warning "arguments" "wrong number of args" } */ /* Miscellaneous bogus constructions. */ printf (""); /* { dg-warning "zero-length" "warning for empty format" } */ -- Joseph S. Myers jos...@codesourcery.com