From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 12/13] kconfig: qconf: refactor ConfigInfoView::clicked()
Date: Thu, 24 Oct 2024 03:18:02 +0900 [thread overview]
Message-ID: <20241023181823.138524-12-masahiroy@kernel.org> (raw)
In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org>
Most of the code in ConfigInfoView::clicked() is unnecessary.
There is no need to use the regular expression to search for a symbol.
Calling sym_find() is simpler and faster.
The hyperlink always begins with the "s" tag, and there is no other
tag used. Remove it.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/kconfig/qconf.cc | 43 ++++++----------------------------------
1 file changed, 6 insertions(+), 37 deletions(-)
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index a208ef33128f..f59a9597f09b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1001,7 +1001,7 @@ void ConfigInfoView::menuInfo(void)
if (sym->name) {
stream << " (";
if (showDebug())
- stream << "<a href=\"s" << sym->name << "\">";
+ stream << "<a href=\"" << sym->name << "\">";
stream << print_filter(sym->name);
if (showDebug())
stream << "</a>";
@@ -1010,7 +1010,7 @@ void ConfigInfoView::menuInfo(void)
} else if (sym->name) {
stream << "<big><b>";
if (showDebug())
- stream << "<a href=\"s" << sym->name << "\">";
+ stream << "<a href=\"" << sym->name << "\">";
stream << print_filter(sym->name);
if (showDebug())
stream << "</a>";
@@ -1124,7 +1124,7 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
QTextStream *stream = reinterpret_cast<QTextStream *>(data);
if (sym && sym->name && !(sym->flags & SYMBOL_CONST)) {
- *stream << "<a href=\"s" << sym->name << "\">";
+ *stream << "<a href=\"" << sym->name << "\">";
*stream << print_filter(str);
*stream << "</a>";
} else {
@@ -1134,39 +1134,11 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
void ConfigInfoView::clicked(const QUrl &url)
{
- QByteArray str = url.toEncoded();
- const std::size_t count = str.size();
- char *data = new char[count + 2]; // '$' + '\0'
- struct symbol **result;
- struct menu *m = NULL;
+ struct menu *m;
- if (count < 1) {
- delete[] data;
- return;
- }
-
- memcpy(data, str.constData(), count);
- data[count] = '\0';
-
- /* Seek for exact match */
- data[0] = '^';
- strcat(data, "$");
- result = sym_re_search(data);
- if (!result) {
- delete[] data;
- return;
- }
-
- sym = *result;
-
- /* Seek for the menu which holds the symbol */
- for (struct property *prop = sym->prop; prop; prop = prop->next) {
- if (prop->type != P_PROMPT && prop->type != P_MENU)
- continue;
- m = prop->menu;
- break;
- }
+ sym = sym_find(url.toEncoded().constData());
+ m = sym_get_prompt_menu(sym);
if (!m) {
/* Symbol is not visible as a menu */
symbolInfo();
@@ -1174,9 +1146,6 @@ void ConfigInfoView::clicked(const QUrl &url)
} else {
emit menuSelected(m);
}
-
- free(result);
- delete[] data;
}
void ConfigInfoView::contextMenuEvent(QContextMenuEvent *event)
--
2.43.0
next prev parent reply other threads:[~2024-10-23 18:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 18:17 [PATCH 01/13] kconfig: qconf: remove mouse{Press,Move}Event() functions Masahiro Yamada
2024-10-23 18:17 ` [PATCH 02/13] kconfig: qconf: remove redundant type check for choice members Masahiro Yamada
2024-10-23 18:17 ` [PATCH 03/13] kconfig: qconf: remove unnecessary setRootIsDecorated() call Masahiro Yamada
2024-10-23 18:17 ` [PATCH 04/13] kconfig: qconf: remove unnecessary lastWindowClosed() signal connection Masahiro Yamada
2024-10-23 18:17 ` [PATCH 05/13] kconfig: qconf: convert the last old connection syntax to Qt5 style Masahiro Yamada
2024-10-23 18:17 ` [PATCH 06/13] kconfig: qconf: do not show goParent button in split view Masahiro Yamada
2024-10-23 18:17 ` [PATCH 07/13] kconfig: qconf: remove ConfigItem::visible member Masahiro Yamada
2024-10-23 18:17 ` [PATCH 08/13] kconfig: qconf: avoid unnecessary parentSelected() when ESC is pressed Masahiro Yamada
2024-10-23 18:17 ` [PATCH 09/13] kconfig: qconf: remove redundant check in goBack() Masahiro Yamada
2024-10-23 18:18 ` [PATCH 10/13] kconfig: qconf: remove non-functional href="m..." tag Masahiro Yamada
2024-10-23 18:18 ` [PATCH 11/13] kconfig: add sym_get_prompt_menu() helper function Masahiro Yamada
2024-10-23 18:18 ` Masahiro Yamada [this message]
2024-10-23 18:18 ` [PATCH 13/13] kconfig: qconf: remove unnecessary mode check in ConfigItem::updateMenu() Masahiro Yamada
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=20241023181823.138524-12-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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: link
Be 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