From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGxdM-0005J8-6R for qemu-devel@nongnu.org; Thu, 20 Oct 2011 14:46:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGxdK-0001F4-Sn for qemu-devel@nongnu.org; Thu, 20 Oct 2011 14:46:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGxdK-0001Ex-JB for qemu-devel@nongnu.org; Thu, 20 Oct 2011 14:46:26 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9KIkPZA031257 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Oct 2011 14:46:25 -0400 Received: from bow.redhat.com (vpn-200-219.tlv.redhat.com [10.35.200.219]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9KIkNpb011742 for ; Thu, 20 Oct 2011 14:46:24 -0400 From: Alon Levy Date: Thu, 20 Oct 2011 20:43:47 +0200 Message-Id: <1319136227-7520-1-git-send-email-alevy@redhat.com> In-Reply-To: <1319135981-31413-1-git-send-email-alevy@redhat.com> References: <1319135981-31413-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH] monitor: refactor whitespace and optional argument parsing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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) { @@ -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++; -- 1.7.6.4