[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/29] monitor: Drop str_allocated[]
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 21/29] monitor: Drop str_allocated[] |
Date: |
Fri, 28 Aug 2009 15:27:24 -0300 |
It's not used anymore, as QDict is now used to handle string
memory allocation/deallocation.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/monitor.c b/monitor.c
index 2b3f060..1f18725 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2580,7 +2580,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;
@@ -2657,7 +2656,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:
@@ -2667,6 +2665,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
args[nb_args++] = str;
if (str)
qdict_put(qdict, key, qstring_from_str(str));
+ qemu_free(str);
}
break;
case '/':
@@ -2864,17 +2863,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);
@@ -2887,9 +2881,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.1.184.g2e117
- [Qemu-devel] [PATCH 11/29] monitor: Port handler_2 to use QDict, (continued)
- [Qemu-devel] [PATCH 11/29] monitor: Port handler_2 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 12/29] monitor: Port handler_3 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 13/29] monitor: Port handler_4 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 14/29] monitor: Port handler_5 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 15/29] monitor: Port handler_6 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 17/29] monitor: Drop handler_8 and handler_9, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 18/29] monitor: Port handler_10 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 19/29] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 20/29] monitor: Drop unused macros, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 21/29] monitor: Drop str_allocated[],
Luiz Capitulino <=
- [Qemu-devel] [PATCH 22/29] monitor: Drop args[] handling code, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 23/29] monitor: fail when 'i' type is greater than 32-bit, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 24/29] monitor: Update supported types documentation, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 25/29] Add check support, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 26/29] Introduce QInt unit-tests, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 27/29] Introduce QString unit-tests, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 28/29] Introduce QDict test data file, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 29/29] Introduce QDict unit-tests, Luiz Capitulino, 2009/08/28