From: Markus Armbruster <armbru@redhat.com>
To: Alon Levy <alevy@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] monitor: refactor whitespace and optional argument parsing
Date: Mon, 24 Oct 2011 10:49:48 +0200 [thread overview]
Message-ID: <m3aa8qojtf.fsf@blackfin.pond.sub.org> (raw)
In-Reply-To: <1319136227-7520-1-git-send-email-alevy@redhat.com> (Alon Levy's message of "Thu, 20 Oct 2011 20:43:47 +0200")
Alon Levy <alevy@redhat.com> writes:
> Takes out the optional ('?') message parsing from the main switch loop
> in monitor_parse_command. Adds optional argument option for boolean parameters.
>
> Signed-off-by: Alon Levy <alevy@redhat.com>
> ---
> Previous patch used qemu_free (that's how old it is), fixed.
>
> monitor.c | 79 +++++++++++++++++++++++-------------------------------------
> 1 files changed, 30 insertions(+), 49 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index ffda0fe..a482705 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -3976,6 +3976,29 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> break;
> c = *typestr;
> typestr++;
> + while (qemu_isspace(*p)) {
> + p++;
> + }
> + /* take care of optional arguments */
> + switch (c) {
> + case 's':
> + case 'i':
> + case 'l':
> + case 'M':
> + case 'o':
> + case 'T':
> + case 'b':
> + if (*typestr == '?') {
> + typestr++;
> + if (*p == '\0') {
> + /* missing optional argument: NULL argument */
> + g_free(key);
> + key = NULL;
> + continue;
> + }
> + }
> + break;
> + }
> switch(c) {
> case 'F':
> case 'B':
> @@ -3983,15 +4006,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> {
> int ret;
>
> - while (qemu_isspace(*p))
> - p++;
> - if (*typestr == '?') {
> - typestr++;
> - if (*p == '\0') {
> - /* no optional string: NULL argument */
> - break;
> - }
> - }
> ret = get_str(buf, sizeof(buf), &p);
> if (ret < 0) {
> switch(c) {
This is cases 'F', 'B' and 's'. I'm afraid your new code covers only
's'.
> @@ -4021,9 +4035,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> if (!opts_list || opts_list->desc->name) {
> goto bad_type;
> }
> - while (qemu_isspace(*p)) {
> - p++;
> - }
> if (!*p)
> break;
> if (get_str(buf, sizeof(buf), &p) < 0) {
> @@ -4041,8 +4052,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> {
> int count, format, size;
>
> - while (qemu_isspace(*p))
> - p++;
> if (*p == '/') {
> /* format found */
> p++;
> @@ -4122,23 +4131,15 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> {
> int64_t val;
>
> - while (qemu_isspace(*p))
> - p++;
> - if (*typestr == '?' || *typestr == '.') {
> - if (*typestr == '?') {
> - if (*p == '\0') {
> - typestr++;
> - break;
> - }
> - } else {
> - if (*p == '.') {
> + if (*typestr == '.') {
> + if (*p == '.') {
> + p++;
> + while (qemu_isspace(*p)) {
> p++;
> - while (qemu_isspace(*p))
> - p++;
> - } else {
> - typestr++;
> - break;
> }
> + } else {
> + typestr++;
> + break;
> }
> typestr++;
> }
> @@ -4160,15 +4161,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> int64_t val;
> char *end;
>
> - while (qemu_isspace(*p)) {
> - p++;
> - }
> - if (*typestr == '?') {
> - typestr++;
> - if (*p == '\0') {
> - break;
> - }
> - }
> val = strtosz(p, &end);
> if (val < 0) {
> monitor_printf(mon, "invalid size\n");
> @@ -4182,14 +4174,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> {
> double val;
>
> - while (qemu_isspace(*p))
> - p++;
> - if (*typestr == '?') {
> - typestr++;
> - if (*p == '\0') {
> - break;
> - }
> - }
> if (get_double(mon, &val, &p) < 0) {
> goto fail;
> }
> @@ -4215,9 +4199,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
> const char *beg;
> int val;
>
> - while (qemu_isspace(*p)) {
> - p++;
> - }
> beg = p;
> while (qemu_isgraph(*p)) {
> p++;
Could be split into parts:
1. Hoist the space skip out of the switch
2. Hoist handling of '?' out of the switch
3. Permit optional boolean parameters
I'd delay the third part until there's a user.
prev parent reply other threads:[~2011-10-24 8:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-20 18:39 [Qemu-devel] [PATCH] monitor: refactor whitespace and optional argument parsing Alon Levy
2011-10-20 18:43 ` Alon Levy
2011-10-24 8:49 ` Markus Armbruster [this message]
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=m3aa8qojtf.fsf@blackfin.pond.sub.org \
--to=armbru@redhat.com \
--cc=alevy@redhat.com \
--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.