toplev.h (warning_with_file_and_line): Don't declare.

	* toplev.h (warning_with_file_and_line): Don't declare.
	(error_with_file_and_line): Likewise.
	* diagnostic.c (error_with_file_and_line): Remove.
	(warning_with_file_and_line): Likewise.

From-SVN: r66628

gcc/ChangeLog

 2003-05-09  Gabriel Dos Reis <gdr@integrable-solutions.net>
 
+	* toplev.h (warning_with_file_and_line): Don't declare.
+	(error_with_file_and_line): Likewise.
+	* diagnostic.c (error_with_file_and_line): Remove.
+	(warning_with_file_and_line): Likewise.
+
+2003-05-09  Gabriel Dos Reis <gdr@integrable-solutions.net>
+
 	* c-parse.in (if_stmt_locus): New object.
 	(if_prefix rule): Use it.  Don't use warning_with_file_and_line.
 	(select_or_iter_stmt rule): Likewise.

gcc/diagnostic.c

@@ -1080,22 +1080,6 @@ diagnostic_report_current_function (context)
 }
 
 void
-error_with_file_and_line VPARAMS ((const char *file, int line,
-				   const char *msgid, ...))
-{
-  diagnostic_info diagnostic;
-
-  VA_OPEN (ap, msgid);
-  VA_FIXEDARG (ap, const char *, file);
-  VA_FIXEDARG (ap, int, line);
-  VA_FIXEDARG (ap, const char *, msgid);
-
-  diagnostic_set_info (&diagnostic, msgid, &ap, file, line, DK_ERROR);
-  report_diagnostic (&diagnostic);
-  VA_CLOSE (ap);
-}
-
-void
 error_with_decl VPARAMS ((tree decl, const char *msgid, ...))
 {
   diagnostic_info diagnostic;
@@ -1183,22 +1167,6 @@ See %s for instructions.\n", bug_report_url);
 }
 
 void
-warning_with_file_and_line VPARAMS ((const char *file, int line,
-				     const char *msgid, ...))
-{
-  diagnostic_info diagnostic;
-
-  VA_OPEN (ap, msgid);
-  VA_FIXEDARG (ap, const char *, file);
-  VA_FIXEDARG (ap, int, line);
-  VA_FIXEDARG (ap, const char *, msgid);
-
-  diagnostic_set_info (&diagnostic, msgid, &ap, file, line, DK_WARNING);
-  report_diagnostic (&diagnostic);
-  VA_CLOSE (ap);
-}
-
-void
 warning_with_decl VPARAMS ((tree decl, const char *msgid, ...))
 {
   diagnostic_info diagnostic;

gcc/toplev.h

@@ -59,10 +59,6 @@ extern void error			PARAMS ((const char *, ...));
 extern void fatal_error			PARAMS ((const char *, ...))
 					       ATTRIBUTE_NORETURN;
 extern void pedwarn			PARAMS ((const char *, ...));
-extern void warning_with_file_and_line	PARAMS ((const char *, int,
-						 const char *, ...));
-extern void error_with_file_and_line	PARAMS ((const char *, int,
-						 const char *, ...));
 extern void sorry			PARAMS ((const char *, ...));
 
 extern void rest_of_decl_compilation	PARAMS ((union tree_node *,