From cb83302cce697650c6a07b0d7cee7edff15f489b Mon Sep 17 00:00:00 2001 From: Serge Belyshev <1319@bot.ru> Date: Thu, 29 Apr 2004 06:28:59 +0000 Subject: [PATCH] re PR gcov-profile/14944 ([3.4 only] ICE when gcc reads *.gcda file of different version) 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 --- gcc/ChangeLog | 6 ++++++ gcc/coverage.c | 4 ++-- gcc/pretty-print.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 317e6fe5481..f6c618edfb9 100644 --- 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 * doc/invoke.texi (Objective-C Dialect Options): Don't prefix diff --git a/gcc/coverage.c b/gcc/coverage.c index ccc8339cb5f..1912c347809 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 86d4cb82e6b..bb1e72fbcd1 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) -- 2.30.2