From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MY0sJ-0006Jw-Vi for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MY0sF-0006IS-CK for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:59:03 -0400 Received: from [199.232.76.173] (port=55293 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY0sF-0006IK-4A for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56378) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MY0sE-0003DX-JY for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:58 -0400 From: Luiz Capitulino Date: Mon, 3 Aug 2009 13:57:17 -0300 Message-Id: <1249318642-19324-21-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> References: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 20/25] monitor: Add a new index for str_allocated[] List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, avi@redhat.com This commit adds a new variable to serve as 'str_allocated[]'s index. The reason for this is that next commits will drop 'args[]' and 'nb_args', but we will stay with 'str_allocated[]' as we have to keep track of allocated strings. Signed-off-by: Luiz Capitulino --- monitor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 76154fd..9640c68 100644 --- a/monitor.c +++ b/monitor.c @@ -2699,7 +2699,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, QDict *qdict) { const char *p, *typestr; - int c, nb_args, has_arg; + int c, nb_args, has_arg, str_idx; const mon_cmd_t *cmd; char cmdname[256]; char buf[1024]; @@ -2728,7 +2728,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, /* parse the parameters */ typestr = cmd->args_type; - nb_args = 0; + nb_args = str_idx = 0; for(;;) { typestr = key_get_info(typestr, &key); if (!typestr) @@ -2772,7 +2772,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, } str = qemu_malloc(strlen(buf) + 1); pstrcpy(str, sizeof(buf), buf); - str_allocated[nb_args] = str; + str_allocated[str_idx++] = str; add_str: if (nb_args >= MAX_ARGS) { error_args: -- 1.6.4.rc3.12.gdf73a