From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MduHk-0002TX-91 for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MduHf-0002RO-ID for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:39 -0400 Received: from [199.232.76.173] (port=49909 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MduHf-0002RI-7O for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20458) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MduHe-0005aM-Me for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:35 -0400 From: Luiz Capitulino Date: Wed, 19 Aug 2009 20:07:52 -0300 Message-Id: <1250723280-3509-22-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> References: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 21/29] monitor: Drop str_allocated[] List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com It's not used anymore, as QDict is now used to handle string memory allocation/deallocation. Signed-off-by: Luiz Capitulino --- monitor.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index f5d4a46..c62b27e 100644 --- a/monitor.c +++ b/monitor.c @@ -2641,7 +2641,6 @@ static int default_fmt_size = 4; static const mon_cmd_t *monitor_parse_command(Monitor *mon, const char *cmdline, - void *str_allocated[], QDict *qdict) { const char *p, *typestr; @@ -2718,7 +2717,6 @@ 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; add_str: if (nb_args >= MAX_ARGS) { error_args: @@ -2728,6 +2726,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, args[nb_args++] = str; if (str) qdict_add_qstring(qdict, key, qstring_from_str(str)); + qemu_free(str); } break; case '/': @@ -2925,17 +2924,12 @@ fail: static void monitor_handle_command(Monitor *mon, const char *cmdline) { - int i; QDict *qdict; const mon_cmd_t *cmd; - void *str_allocated[MAX_ARGS]; qdict = qdict_new(); - for (i = 0; i < MAX_ARGS; i++) - str_allocated[i] = NULL; - - cmd = monitor_parse_command(mon, cmdline, str_allocated, qdict); + cmd = monitor_parse_command(mon, cmdline, qdict); if (cmd) { void (*handler)(Monitor *mon, const QDict *qdict); handler = cmd->handler; @@ -2943,9 +2937,6 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) } QDECREF(qdict); - - for (i = 0; i < MAX_ARGS; i++) - qemu_free(str_allocated[i]); } static void cmd_completion(const char *name, const char *list) -- 1.6.4.67.gea5b1