gcov.c (fnotice): Add missing FILE* parameter.

        * gcov.c (fnotice): Add missing FILE* parameter.
        (function_summary): Fix format specifiers in calls to `fnotice'.
        (output_data): Likewise.
        * toplev.c (fnotice): Constify char* parameter.
        * toplev.h (fnotice): Add prototype.

From-SVN: r24931

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41893e899f4f0e3fa4c1bccd949c643330264fda..a84191fc0fcde2a509c394fdb12ce8be8cfba656 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jan 30 23:14:13 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * gcov.c (fnotice): Add missing FILE* parameter.
+       (function_summary): Fix format specifiers in calls to `fnotice'.
+       (output_data): Likewise.
+
+       * toplev.c (fnotice): Constify char* parameter.
+
+       * toplev.h (fnotice): Add prototype.
+
 Sun Jan 31 15:33:09 1999  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 
        * config/c4x/c4x.h (RTX_COSTS): Explicitly define c4x costs.

diff --git a/gcc/gcov.c b/gcc/gcov.c
index cd77109fde08c52449aa2fd471476846101334b7..a582b0f1dc12981326b722280a8d18ec6433d6f6 100644 (file)
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -244,11 +244,12 @@ main (argc, argv)
   return 0;
 }
 
-static void fnotice    PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1;
+static void fnotice PVPROTO ((FILE *, const char *, ...)) ATTRIBUTE_PRINTF_2;
 static void
-fnotice VPROTO ((const char *msgid, ...))
+fnotice VPROTO ((FILE *file, const char *msgid, ...))
 {
 #ifndef ANSI_PROTOTYPES
+  FILE *file;
   const char *msgid;
 #endif
   va_list ap;
@@ -256,10 +257,11 @@ fnotice VPROTO ((const char *msgid, ...))
   VA_START (ap, msgid);
 
 #ifndef ANSI_PROTOTYPES
+  file = va_arg (ap, FILE *);
   msgid = va_arg (ap, const char *);
 #endif
 
-  vfprintf (stderr, _(msgid), ap);
+  vfprintf (file, _(msgid), ap);
   va_end (ap);
 }
 
@@ -922,7 +924,7 @@ static void
 function_summary ()
 {
   if (function_source_lines)
-    fnotice (stdout, "%6.2lf%% of %d source lines executed in function %s\n",
+    fnotice (stdout, "%6.2f%% of %d source lines executed in function %s\n",
             (((double) function_source_lines_executed / function_source_lines)
              * 100), function_source_lines, function_name);
   else
@@ -933,18 +935,18 @@ function_summary ()
     {
       if (function_branches)
        {
-         fnotice (stdout, "%6.2lf%% of %d branches executed in function %s\n",
+         fnotice (stdout, "%6.2f%% of %d branches executed in function %s\n",
                   (((double) function_branches_executed / function_branches)
                    * 100), function_branches, function_name);
          fnotice (stdout,
-               "%6.2lf%% of %d branches taken at least once in function %s\n",
+               "%6.2f%% of %d branches taken at least once in function %s\n",
                   (((double) function_branches_taken / function_branches)
                    * 100), function_branches, function_name);
        }
       else
        fnotice (stdout, "No branches in function %s\n", function_name);
       if (function_calls)
-       fnotice (stdout, "%6.2lf%% of %d calls executed in function %s\n",
+       fnotice (stdout, "%6.2f%% of %d calls executed in function %s\n",
                 (((double) function_calls_executed / function_calls)
                  * 100), function_calls, function_name);
       else
@@ -1082,7 +1084,7 @@ output_data ()
                        fnotice (stderr,
                                 "didn't use all bb entries of graph, function %s\n",
                                 function_name);
-                       fnotice (stderr, "block_num = %d, num_blocks = %d\n",
+                       fnotice (stderr, "block_num = %ld, num_blocks = %d\n",
                                 block_num, current_graph->num_blocks);
                      }
 
@@ -1197,7 +1199,7 @@ output_data ()
 
       if (total_source_lines)
        fnotice (stdout,
-                "%6.2lf%% of %d source lines executed in file %s\n",
+                "%6.2f%% of %d source lines executed in file %s\n",
                 (((double) total_source_lines_executed / total_source_lines)
                  * 100), total_source_lines, source_file_name);
       else
@@ -1208,18 +1210,18 @@ output_data ()
        {
          if (total_branches)
            {
-             fnotice (stdout, "%6.2lf%% of %d branches executed in file %s\n",
+             fnotice (stdout, "%6.2f%% of %d branches executed in file %s\n",
                       (((double) total_branches_executed / total_branches)
                        * 100), total_branches, source_file_name);
              fnotice (stdout,
-                   "%6.2lf%% of %d branches taken at least once in file %s\n",
+                   "%6.2f%% of %d branches taken at least once in file %s\n",
                       (((double) total_branches_taken / total_branches)
                        * 100), total_branches, source_file_name);
            }
          else
            fnotice (stdout, "No branches in file %s\n", source_file_name);
          if (total_calls)
-           fnotice (stdout, "%6.2lf%% of %d calls executed in file %s\n",
+           fnotice (stdout, "%6.2f%% of %d calls executed in file %s\n",
                     (((double) total_calls_executed / total_calls)
                      * 100), total_calls, source_file_name);
          else

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 0667769209837e2f2150011ccd5898f52159cb4e..2b73288123aff774612f2871f6861676d545bfc4 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1557,11 +1557,11 @@ notice VPROTO((const char *msgid, ...))
 }
 
 void
-fnotice VPROTO((FILE *file, char *msgid, ...))
+fnotice VPROTO((FILE *file, const char *msgid, ...))
 {
 #ifndef ANSI_PROTOTYPES
   FILE *file;
-  char *msgid;
+  const char *msgid;
 #endif
   va_list ap;
 
@@ -1569,7 +1569,7 @@ fnotice VPROTO((FILE *file, char *msgid, ...))
 
 #ifndef ANSI_PROTOTYPES
   file = va_arg (ap, FILE *);
-  msgid = va_arg (ap, char *);
+  msgid = va_arg (ap, const char *);
 #endif
 
   vnotice (file, msgid, ap);

diff --git a/gcc/toplev.h b/gcc/toplev.h
index 807fb25eaea411e5cb4029b1617d866acc80d9d5..a9b6c532364807bad6888108349fe3b77fd5a07c 100644 (file)
--- a/gcc/toplev.h
+++ b/gcc/toplev.h
@@ -102,4 +102,7 @@ extern void do_abort                        PROTO ((void)) ATTRIBUTE_NORETURN;
 extern void botch                      PROTO ((const char *))
   ATTRIBUTE_NORETURN;
 
+extern void fnotice                    PROTO ((FILE *, const char *, ...))
+  ATTRIBUTE_PRINTF_2;
+
 #endif /* __GCC_TOPLEV_H */