From: Gabriel Dos Reis <gdr@integrable-solutions.net>
Date: Tue, 28 Feb 2006 09:12:47 +0000 (+0000)
Subject: Backport patch from Serge Belyshev
X-Git-Tag: releases/gcc-3.4.6~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4061790a6900df9e63c144dfca1e639382776af;p=thirdparty%2Fgcc.git

Backport patch from Serge Belyshev

From-SVN: r111561
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8db2fb33fe4c..53e0e661c111 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-28  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* Backport
+	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.
+
 2006-02-18  Olivier Hainque  <hainque@adacore.com>
 
 	PR ada/13408
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 395c1e4de55d..85ba608380b7 100644
--- 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 993fde7a6d69..9e3fbba6b554 100644
--- 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)