re PR gcov-profile/14944 ([3.4 only] ICE when gcc reads *.gcda file of different...

Patch from Serge Belyshev.
PR 14944
* coverage.c (read_counts_file): Fix usage of warning () call.
* pretty-print.c (pp_base_format_text): Fix typo in the comment.

From-SVN: r81276

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 317e6fe5481f56de714736cb34f4cce8ad795645..f6c618edfb9acb63d3de05aed44cc4f2f983f260 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-28  Serge Belyshev  <1319@bot.ru>
+
+       PR 14944
+       * coverage.c (read_counts_file): Fix usage of warning () call.
+       * pretty-print.c (pp_base_format_text): Fix typo in the comment.
+
 2004-04-28  Ben Elliston  <bje@au.ibm.com>
 
        * doc/invoke.texi (Objective-C Dialect Options): Don't prefix

diff --git a/gcc/coverage.c b/gcc/coverage.c
index ccc8339cb5f41b3bc1b1ef6150eb19aa4f05b9f5..1912c34780993a2eef2968384e730fa17cea5083 100644 (file)
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -172,8 +172,8 @@ read_counts_file (void)
       GCOV_UNSIGNED2STRING (v, tag);
       GCOV_UNSIGNED2STRING (e, GCOV_VERSION);
 
-      warning ("`%s' is version `%.4s', expected version `%.4s'",
-              da_file_name, v, e);
+      warning ("`%s' is version `%.*s', expected version `%.*s'",
+              da_file_name, 4, v, 4, e);
       gcov_close ();
       return;
     }

diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index 86d4cb82e6b761ab3e90b5b2327e609c0167bd30..bb1e72fbcd1f0da135878a40249ca9bd640dbc47 100644 (file)
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -178,7 +178,7 @@ pp_base_indent (pretty_printer *pp)
    %p: pointer.
    %m: strerror(text->err_no) - does not consume a value from args_ptr.
    %%: `%'.
-   %*.s: a substring the length of which is specified by an integer.
+   %.*s: a substring the length of which is specified by an integer.
    %H: location_t.  */
 void
 pp_base_format_text (pretty_printer *pp, text_info *text)