From: Sven Schnelle <svens@stackframe.org>
To: "Alex Bennée" <alex.bennee@linaro.org>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>
Cc: qemu-devel@nongnu.org, deller@gmx.de,
Sven Schnelle <svens@stackframe.org>
Subject: [PATCH v3 06/12] util/range: split up range_list_from_string()
Date: Fri, 1 Mar 2024 18:46:03 +0100 [thread overview]
Message-ID: <20240301174609.1964379-7-svens@stackframe.org> (raw)
In-Reply-To: <20240301174609.1964379-1-svens@stackframe.org>
Makes the code a bit easier to read and maintain.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
---
util/range.c | 119 ++++++++++++++++++++++++++++++---------------------
1 file changed, 70 insertions(+), 49 deletions(-)
diff --git a/util/range.c b/util/range.c
index db535de9a7..8c463995e7 100644
--- a/util/range.c
+++ b/util/range.c
@@ -124,6 +124,74 @@ exit:
*rev = out;
}
+static const char *split_single_range(const char *r, const char **r2)
+{
+ char *range_op;
+
+ range_op = strstr(r, "-");
+ if (range_op) {
+ *r2 = range_op + 1;
+ return range_op;
+ }
+ range_op = strstr(r, "+");
+ if (range_op) {
+ *r2 = range_op + 1;
+ return range_op;
+ }
+ range_op = strstr(r, "..");
+ if (range_op) {
+ *r2 = range_op + 2;
+ return range_op;
+ }
+ return NULL;
+}
+
+static int parse_single_range(const char *r, Error **errp,
+ uint64_t *lob, uint64_t *upb)
+{
+ const char *range_op, *r2, *e;
+ uint64_t r1val, r2val;
+
+ range_op = split_single_range(r, &r2);
+ if (!range_op) {
+ error_setg(errp, "Bad range specifier");
+ return 1;
+ }
+ if (qemu_strtou64(r, &e, 0, &r1val)
+ || e != range_op) {
+ error_setg(errp, "Invalid number to the left of %.*s",
+ (int)(r2 - range_op), range_op);
+ return 1;
+ }
+ if (qemu_strtou64(r2, NULL, 0, &r2val)) {
+ error_setg(errp, "Invalid number to the right of %.*s",
+ (int)(r2 - range_op), range_op);
+ return 1;
+ }
+
+ switch (*range_op) {
+ case '+':
+ *lob = r1val;
+ *upb = r1val + r2val - 1;
+ break;
+ case '-':
+ *upb = r1val;
+ *lob = r1val - (r2val - 1);
+ break;
+ case '.':
+ *lob = r1val;
+ *upb = r2val;
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ if (*lob > *upb) {
+ error_setg(errp, "Invalid range");
+ return 1;
+ }
+ return 0;
+}
+
void range_list_from_string(GList **out_ranges, const char *filter_spec,
Error **errp)
{
@@ -136,60 +204,13 @@ void range_list_from_string(GList **out_ranges, const char *filter_spec,
}
for (i = 0; ranges[i]; i++) {
- const char *r = ranges[i];
- const char *range_op, *r2, *e;
- uint64_t r1val, r2val, lob, upb;
-
- range_op = strstr(r, "-");
- r2 = range_op ? range_op + 1 : NULL;
- if (!range_op) {
- range_op = strstr(r, "+");
- r2 = range_op ? range_op + 1 : NULL;
- }
- if (!range_op) {
- range_op = strstr(r, "..");
- r2 = range_op ? range_op + 2 : NULL;
- }
- if (!range_op) {
- error_setg(errp, "Bad range specifier");
- goto out;
- }
-
- if (qemu_strtou64(r, &e, 0, &r1val)
- || e != range_op) {
- error_setg(errp, "Invalid number to the left of %.*s",
- (int)(r2 - range_op), range_op);
- goto out;
- }
- if (qemu_strtou64(r2, NULL, 0, &r2val)) {
- error_setg(errp, "Invalid number to the right of %.*s",
- (int)(r2 - range_op), range_op);
- goto out;
- }
+ uint64_t lob, upb;
- switch (*range_op) {
- case '+':
- lob = r1val;
- upb = r1val + r2val - 1;
+ if (parse_single_range(ranges[i], errp, &lob, &upb)) {
break;
- case '-':
- upb = r1val;
- lob = r1val - (r2val - 1);
- break;
- case '.':
- lob = r1val;
- upb = r2val;
- break;
- default:
- g_assert_not_reached();
- }
- if (lob > upb) {
- error_setg(errp, "Invalid range");
- goto out;
}
*out_ranges = append_new_range(*out_ranges, lob, upb);
}
-out:
g_strfreev(ranges);
}
--
2.43.2
next prev parent reply other threads:[~2024-03-01 17:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 17:45 [PATCH v3 00/12] plugins/execlog: add data address match and address range support Sven Schnelle
2024-03-01 17:45 ` [PATCH v3 01/12] util/log: convert debug_regions to GList Sven Schnelle
2024-03-04 10:34 ` Alex Bennée
2024-03-04 13:13 ` Sven Schnelle
2024-03-04 17:00 ` Richard Henderson
2024-03-04 16:59 ` Sven Schnelle
2024-03-04 17:58 ` Alex Bennée
2024-03-04 19:12 ` Sven Schnelle
2024-03-01 17:45 ` [PATCH v3 02/12] util/log: make qemu_set_dfilter_ranges() take a GList Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 03/12] util/range: move range_list_from_string() to range.c Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 04/12] util/range: add range_list_free() Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 05/12] util/range: use append_new_range() in range_list_from_string() Sven Schnelle
2024-03-01 17:46 ` Sven Schnelle [this message]
2024-03-01 17:46 ` [PATCH v3 07/12] util/range: make range_list_from_string() accept a single number Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 08/12] qemu/range: add range_list_contains() function Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 09/12] plugins: add API to print errors Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 10/12] plugins: add range list API Sven Schnelle
2024-03-03 17:45 ` Bernhard Beschow
2024-03-01 17:46 ` [PATCH v3 11/12] plugins/execlog: use range list api Sven Schnelle
2024-03-01 17:46 ` [PATCH v3 12/12] plugins/execlog: add data address match Sven Schnelle
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=20240301174609.1964379-7-svens@stackframe.org \
--to=svens@stackframe.org \
--cc=alex.bennee@linaro.org \
--cc=deller@gmx.de \
--cc=erdnaxe@crans.org \
--cc=ma.mandourr@gmail.com \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.