From: Rolf Eike Beer <eb@emlix.com>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] kconfig: qconf: simplify character replacement
Date: Wed, 23 Oct 2024 08:39:15 +0200 [thread overview]
Message-ID: <3592638.iIbC2pHGDl@devpool47.emlix.com> (raw)
In-Reply-To: <4960180.31r3eYUQgx@devpool47.emlix.com>
Replace the hand crafted lookup table with a QHash. This has the nice benefit
that the added offsets can not get out of sync with the length of the
replacement strings.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
scripts/kconfig/qconf.cc | 33 ++++++++++++---------------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 4b2f707c9203..f07a463c5760 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1123,28 +1123,19 @@ QString ConfigInfoView::print_filter(const QString &str)
{
QRegularExpression re("[<>&\"\\n]");
QString res = str;
+
+ QHash<QChar, QString> patterns;
+ patterns['<'] = "<";
+ patterns['>'] = ">";
+ patterns['&'] = "&";
+ patterns['"'] = """;
+ patterns['\n'] = "<br>";
+
for (int i = 0; (i = res.indexOf(re, i)) >= 0;) {
- switch (res[i].toLatin1()) {
- case '<':
- res.replace(i, 1, "<");
- i += 4;
- break;
- case '>':
- res.replace(i, 1, ">");
- i += 4;
- break;
- case '&':
- res.replace(i, 1, "&");
- i += 5;
- break;
- case '"':
- res.replace(i, 1, """);
- i += 6;
- break;
- case '\n':
- res.replace(i, 1, "<br>");
- i += 4;
- break;
+ const QString n = patterns.value(res[i], QString());
+ if (!n.isEmpty()) {
+ res.replace(i, 1, n);
+ i += n.length();
}
}
return res;
--
2.47.0
--
Rolf Eike Beer
emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, Registry Number HR B 3160
Managing Directors: Heike Jordan, Dr. Uwe Kracke
VAT ID No. DE 205 198 055
Office Berlin: Panoramastr. 1, 10178 Berlin, Germany
Office Bonn: Bachstr. 6, 53115 Bonn, Germany
http://www.emlix.com
emlix - your embedded Linux partner
next prev parent reply other threads:[~2024-10-23 6:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 6:26 [PATCH 0/7] improve qconfig C++ code Rolf Eike Beer
2024-10-23 6:29 ` [PATCH 1/7] kconfig: qconf: use QByteArray API instead of manually constructing a string Rolf Eike Beer
2024-10-23 16:37 ` Masahiro Yamada
2024-10-23 19:07 ` Masahiro Yamada
2024-10-24 7:02 ` Rolf Eike Beer
2024-10-23 6:31 ` [PATCH 2/7] kconfig: qconf: use QString to store path to configuration file Rolf Eike Beer
2024-10-23 16:37 ` Masahiro Yamada
2024-10-23 6:32 ` [PATCH 3/7] kconfig: qconf: use preferred form of QString API Rolf Eike Beer
2024-10-23 16:38 ` Masahiro Yamada
2024-10-23 6:33 ` [PATCH 4/7] kconfig: qconf: use QCommandLineParser Rolf Eike Beer
2024-10-23 16:39 ` Masahiro Yamada
2024-10-24 11:28 ` Masahiro Yamada
2024-10-23 6:34 ` [PATCH 5/7] kconfig: qconf: use nullptr in C++11 code Rolf Eike Beer
2024-10-23 16:41 ` Masahiro Yamada
2024-10-24 7:05 ` Rolf Eike Beer
2024-10-23 6:36 ` [PATCH 6/7] kconfig: qconf: use default platform shortcuts Rolf Eike Beer
2024-10-23 16:48 ` Masahiro Yamada
2024-10-23 6:39 ` Rolf Eike Beer [this message]
2024-10-23 16:51 ` [PATCH 7/7] kconfig: qconf: simplify character replacement 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=3592638.iIbC2pHGDl@devpool47.emlix.com \
--to=eb@emlix.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@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