From 57d802974a9865404e70851fc3ca710c077d1d1f Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Sun, 9 Jun 2002 02:40:08 +0000
Subject: [PATCH] gengtype.h (error_at_line): Use PARAMS, not VPARAMS.

	* gengtype.h (error_at_line): Use PARAMS, not VPARAMS.  Add
	ATTRIBUTE_PRINTF_2.
	* gengtype-lex.l: Fix format specifier warning.

From-SVN: r54394
---
 gcc/ChangeLog      | 4 ++++
 gcc/gengtype-lex.l | 2 +-
 gcc/gengtype.h     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0598383b62c..91dc33954da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2002-06-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+	* gengtype.h (error_at_line): Use PARAMS, not VPARAMS.  Add
+	ATTRIBUTE_PRINTF_2.
+	* gengtype-lex.l: Fix format specifier warning.
+
 	* genautomata.c: Don't include ctype.h or limits.h.  Use ISSPACE,
 	not isspace.
 	* gengtype-lex.l: Don't include ctype.h and use ISSPACE/ISIDNUM in
diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index c6383760197..6a212627bc1 100644
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -283,7 +283,7 @@ ITYPE	{IWORD}({WS}{IWORD})*
 "%}"		{ BEGIN(in_struct); }
 "%"		{
   error_at_line (&lexer_line, 
-		 "unterminated %{; unexpected EOF");
+		 "unterminated %%{; unexpected EOF");
 }
 }
 
diff --git a/gcc/gengtype.h b/gcc/gengtype.h
index e5f92f2644b..1e8eec7cc40 100644
--- a/gcc/gengtype.h
+++ b/gcc/gengtype.h
@@ -109,7 +109,7 @@ extern struct fileloc lexer_line;
 
 /* Print an error message.  */
 extern void error_at_line 
-  VPARAMS ((struct fileloc *pos, const char *msg, ...));
+  PARAMS ((struct fileloc *pos, const char *msg, ...)) ATTRIBUTE_PRINTF_2;
 
 /* Constructor routines for types.  */
 extern void do_typedef PARAMS ((const char *s, type_p t, struct fileloc *pos));