diff options
| author | Martin Sebor <msebor@redhat.com> | 2020-11-25 14:05:01 -0700 |
|---|---|---|
| committer | Martin Sebor <msebor@redhat.com> | 2020-11-25 15:00:27 -0700 |
| commit | ca23341b28cd3af7985b83a6479107d9ea145a90 (patch) | |
| tree | abaa791c43dac7f771cdc4dd863821bb89325df3 /gcc/edit-context.c | |
| parent | 15f82d80cfbf834365f5819d75aaa9eeb9321224 (diff) | |
| download | gcc-ca23341b28cd3af7985b83a6479107d9ea145a90.zip gcc-ca23341b28cd3af7985b83a6479107d9ea145a90.tar.gz gcc-ca23341b28cd3af7985b83a6479107d9ea145a90.tar.bz2 | |
Clean up -Wformat-diag warnings (PR bootstrap/97622, PR bootstrap/94982)
gcc/c-family/ChangeLog:
PR bootstrap/94982
* c-attribs.c (handle_patchable_function_entry_attribute): Avoid
-Wformat-diag.
gcc/cp/ChangeLog:
PR bootstrap/94982
* constraint.cc (debug_argument_list): Avoid -Wformat-diag.
* error.c (function_category): Same.
(print_template_differences): Same.
* logic.cc (debug): Same.
* name-lookup.c (lookup_using_decl): Same.
* parser.c (maybe_add_cast_fixit): Same.
(cp_parser_template_introduction): Same.
* typeck.c (access_failure_info::add_fixit_hint): Same.
gcc/ChangeLog:
PR bootstrap/97622
PR bootstrap/94982
* config/i386/i386-options.c (ix86_valid_target_attribute_inner_p):
Avoid -Wformat-diag.
* digraph.cc (struct test_edge): Same.
* dumpfile.c (dump_loc): Same.
(dump_context::begin_scope): Same.
* edit-context.c (edited_file::print_diff): Same.
(edited_file::print_diff_hunk): Same.
* json.cc (object::print): Same.
* lto-wrapper.c (merge_and_complain): Same.
* reload.c (find_reloads): Same.
* tree-diagnostic-path.cc (print_path_summary_as_text): Same.
* ubsan.c (ubsan_type_descriptor): Same.
gcc/jit/ChangeLog:
PR bootstrap/94982
* jit-recording.c (recording::function::dump_to_dot): Avoid
-Wformat-diag.
(recording::block::dump_to_dot): Same.
gcc/testsuite/ChangeLog:
PR bootstrap/94982
* c-c++-common/patchable_function_entry-error-3.c: Adjust text
of expected warning.
Diffstat (limited to 'gcc/edit-context.c')
| -rw-r--r-- | gcc/edit-context.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gcc/edit-context.c b/gcc/edit-context.c index 97897d6..80641c2 100644 --- a/gcc/edit-context.c +++ b/gcc/edit-context.c @@ -447,8 +447,13 @@ edited_file::print_diff (pretty_printer *pp, bool show_filenames) if (show_filenames) { pp_string (pp, colorize_start (pp_show_color (pp), "diff-filename")); - pp_printf (pp, "--- %s\n", m_filename); - pp_printf (pp, "+++ %s\n", m_filename); + /* Avoid -Wformat-diag in non-diagnostic output. */ + pp_string (pp, "--- "); + pp_string (pp, m_filename); + pp_newline (pp); + pp_string (pp, "+++ "); + pp_string (pp, m_filename); + pp_newline (pp); pp_string (pp, colorize_stop (pp_show_color (pp))); } @@ -519,8 +524,9 @@ edited_file::print_diff_hunk (pretty_printer *pp, int old_start_of_hunk, = get_effective_line_count (old_start_of_hunk, old_end_of_hunk); pp_string (pp, colorize_start (pp_show_color (pp), "diff-hunk")); - pp_printf (pp, "@@ -%i,%i +%i,%i @@\n", old_start_of_hunk, old_num_lines, - new_start_of_hunk, new_num_lines); + pp_printf (pp, "%s -%i,%i +%i,%i %s", + "@@", old_start_of_hunk, old_num_lines, + new_start_of_hunk, new_num_lines, "@@\n"); pp_string (pp, colorize_stop (pp_show_color (pp))); int line_num = old_start_of_hunk; |