public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3979] Revert "sphinx: update diagnostics URLs" Date: Mon, 14 Nov 2022 08:38:06 +0000 (GMT) [thread overview] Message-ID: <20221114083806.B95A538518AC@sourceware.org> (raw) https://gcc.gnu.org/g:9d29dd2fcf2922e3bc9632b91dbca1f53c9a5ef4 commit r13-3979-g9d29dd2fcf2922e3bc9632b91dbca1f53c9a5ef4 Author: Martin Liska <mliska@suse.cz> Date: Sun Nov 13 21:57:36 2022 +0100 Revert "sphinx: update diagnostics URLs" This reverts commit 9c3bc557995463fe1dcc37ec503af780a6c1a341. Diff: --- gcc/opts.cc | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index c00887ae76e..3797784c865 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -3608,11 +3608,11 @@ get_option_html_page (int option_index) /* Analyzer options are on their own page. */ if (strstr (cl_opt->opt_text, "analyzer-")) - return "gcc/gcc-command-options/options-that-control-static-analysis.html"; + return "gcc/Static-Analyzer-Options.html"; /* Handle -flto= option. */ if (strstr (cl_opt->opt_text, "flto")) - return "gcc/gcc-command-options/options-that-control-optimization.html"; + return "gcc/Optimize-Options.html"; #ifdef CL_Fortran if ((cl_opt->flags & CL_Fortran) != 0 @@ -3623,11 +3623,10 @@ get_option_html_page (int option_index) && (cl_opt->flags & CL_CXX) == 0 #endif ) - return ("gfortran/gnu-fortran-command-options/" - "options-to-request-or-suppress-errors-and-warnings.html"); + return "gfortran/Error-and-Warning-Options.html"; #endif - return "gcc/gcc-command-options/options-to-request-or-suppress-warnings.html"; + return "gcc/Warning-Options.html"; } /* Return malloced memory for a URL describing the option OPTION_INDEX @@ -3646,8 +3645,11 @@ get_option_url (diagnostic_context *, int option_index) "gcc/Warning-Options.html". */ get_option_html_page (option_index), - /* Expect an anchor of the form "cmdoption-Wfoo". */ - "#cmdoption", cl_options[option_index].opt_text, NULL); + /* Expect an anchor of the form "index-Wfoo" e.g. + <a name="index-Wformat"></a>, and thus an id within + the URL of "#index-Wformat". */ + "#index", cl_options[option_index].opt_text, + NULL); else return NULL; } @@ -3784,16 +3786,12 @@ namespace selftest { static void test_get_option_html_page () { - ASSERT_STREQ (get_option_html_page (OPT_Wcpp), - "gcc/gcc-command-options/" - "options-to-request-or-suppress-warnings.html"); + ASSERT_STREQ (get_option_html_page (OPT_Wcpp), "gcc/Warning-Options.html"); ASSERT_STREQ (get_option_html_page (OPT_Wanalyzer_double_free), - "gcc/gcc-command-options/" - "options-that-control-static-analysis.html"); + "gcc/Static-Analyzer-Options.html"); #ifdef CL_Fortran ASSERT_STREQ (get_option_html_page (OPT_Wline_truncation), - "gfortran/gnu-fortran-command-options/" - "options-to-request-or-suppress-errors-and-warnings.html"); + "gfortran/Error-and-Warning-Options.html"); #endif }
reply other threads:[~2022-11-14 8:38 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221114083806.B95A538518AC@sourceware.org \ --to=marxin@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).