diagnostic.c (diagnostic_for_decl): Take a diagnostic_context argument.

	* diagnostic.c (diagnostic_for_decl): Take a
	diagnostic_context argument.  Restructure to be consistent
	with diagnostic_report_diagnostic.
	(diagnostic_count_diagnostic): Now static.  Take a
	diagnostic_info argument, not just a diagnostic_t.  Some code
	moved here from internal_error.  Move a case label for
	clarity.
	(diagnostic_action_after_output): New function.  Code moved
	here from internal_error and fatal_error.
	(bug_report_request): New #define so that this text appears in
	only one place.
	(diagnostic_report_diagnostic): Update to match changes to
	diagnostic_count_diagnostic.  Call diagnostic_action_after_output.
	(diagnostic_set_info): Call gettext here.

	(pedwarn): Update comment.  Don't call gettext here.
	(sorry): Use report_diagnostic.  Don't call gettext here.
	(fatal_error): Remove final fnotice and exit, but call
	real_abort to prevent warnings about noreturn function returning.
	(internal_error): Likewise.  Don't do ICE suppression here nor
	call context->internal_error.
	(warning_with_decl): Suppress for decls in system headers.
	Adjust call to diagnostic_for_decl.
	(pedwarn_with_decl): Likewise.
	(error_with_decl): Adjust call to diagnostic_for_decl.
	(error_recursion): Use bug_report_request.

	* diagnostic.h: Remove prototype of diagnostic_count_diagnostic.
	* objc/objc-act.c (error_with_ivar, warn_with_method): Don't call
	diagnostic_count_diagnostic.
f:
	* bad.c: Don't call diagnostic_count_diagnostic.

From-SVN: r66728

gcc/ChangeLog

+2003-05-12  Zack Weinberg  <zack@codesourcery.com>
+
+	* diagnostic.c (diagnostic_for_decl): Take a
+	diagnostic_context argument.  Restructure to be consistent
+	with diagnostic_report_diagnostic.
+	(diagnostic_count_diagnostic): Now static.  Take a
+	diagnostic_info argument, not just a diagnostic_t.  Some code
+	moved here from internal_error.  Move a case label for
+	clarity.
+	(diagnostic_action_after_output): New function.  Code moved
+	here from internal_error and fatal_error.
+	(bug_report_request): New #define so that this text appears in
+	only one place.
+	(diagnostic_report_diagnostic): Update to match changes to
+	diagnostic_count_diagnostic.  Call diagnostic_action_after_output.
+	(diagnostic_set_info): Call gettext here.
+
+	(pedwarn): Update comment.  Don't call gettext here.
+	(sorry): Use report_diagnostic.  Don't call gettext here.
+	(fatal_error): Remove final fnotice and exit, but call
+	real_abort to prevent warnings about noreturn function returning.
+	(internal_error): Likewise.  Don't do ICE suppression here nor
+	call context->internal_error.
+	(warning_with_decl): Suppress for decls in system headers.
+	Adjust call to diagnostic_for_decl.
+	(pedwarn_with_decl): Likewise.
+	(error_with_decl): Adjust call to diagnostic_for_decl.
+	(error_recursion): Use bug_report_request.
+
+	* diagnostic.h: Remove prototype of diagnostic_count_diagnostic.
+	* objc/objc-act.c (error_with_ivar, warn_with_method): Don't call
+	diagnostic_count_diagnostic.
+
 2003-05-12  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* pa64-hpux.h (ASM_OUTPUT_ALIGNED_COMMON): Correct last patch.

gcc/diagnostic.h

@@ -294,8 +294,6 @@ extern void diagnostic_initialize	PARAMS ((diagnostic_context *));
 extern void diagnostic_report_current_module PARAMS ((diagnostic_context *));
 extern void diagnostic_report_current_function PARAMS ((diagnostic_context *));
 extern void diagnostic_flush_buffer	PARAMS ((diagnostic_context *));
-extern bool diagnostic_count_diagnostic PARAMS ((diagnostic_context *,
-                                                 diagnostic_t));
 extern void diagnostic_report_diagnostic PARAMS ((diagnostic_context *,
                                                  diagnostic_info *));
 extern void diagnostic_set_info         PARAMS ((diagnostic_info *,

gcc/f/ChangeLog

+2003-05-12  Zack Weinberg  <zack@codesourcery.com>
+
+	* bad.c: Don't call diagnostic_count_diagnostic.
+
 2003-05-12  Roger Sayle  <roger@eyesopen.com>
 
 	* com.c (ffecom_init_0): Define built-in functions for atan2,

gcc/f/bad.c

@@ -203,11 +203,12 @@ ffebad_start_ (bool lex_override, ffebad errnum, ffebadSeverity sev,
       if ((ffebad_severity_ != FFEBAD_severityPEDANTIC)
 	  || !flag_pedantic_errors)
 	{
-	  if (!diagnostic_count_diagnostic (global_dc, DK_WARNING))
+	  if (!diagnostic_report_warnings_p ())
 	    {			/* User wants no warnings. */
 	      ffebad_is_temp_inhibited_ = TRUE;
 	      return FALSE;
 	    }
+	  diagnostic_kind_count (global_dc, DK_WARNING)++;
 	  break;
 	}
       /* Fall through (PEDANTIC && flag_pedantic_errors).  */
@@ -215,7 +216,7 @@ ffebad_start_ (bool lex_override, ffebad errnum, ffebadSeverity sev,
     case FFEBAD_severityWEIRD:
     case FFEBAD_severitySEVERE:
     case FFEBAD_severityDISASTER:
-      diagnostic_count_diagnostic (global_dc, DK_ERROR);
+      diagnostic_kind_count (global_dc, DK_ERROR)++;
       break;
 
     default:

gcc/objc/objc-act.c

@@ -3539,10 +3539,6 @@ error_with_ivar (message, decl, rawdecl)
      tree decl;
      tree rawdecl;
 {
-  diagnostic_count_diagnostic (global_dc, DK_ERROR);
-
-  diagnostic_report_current_function (global_dc);
-
   error ("%H%s `%s'", &DECL_SOURCE_LOCATION (decl),
          message, gen_declaration (rawdecl, errbuf));
 
@@ -7108,11 +7104,6 @@ warn_with_method (message, mtype, method)
      int mtype;
      tree method;
 {
-  if (!diagnostic_count_diagnostic (global_dc, DK_WARNING))
-    return;
-
-  diagnostic_report_current_function (global_dc);
-
   /* Add a readable method name to the warning.  */
   warning ("%H%s `%c%s'", &DECL_SOURCE_LOCATION (method),
            message, mtype, gen_method_decl (method, errbuf));