[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/25] monitor: Drop 'nb_args' from monitor_parse_co
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 22/25] monitor: Drop 'nb_args' from monitor_parse_command() |
Date: |
Mon, 3 Aug 2009 13:57:19 -0300 |
As far as I could understand nb_args is used to control additions
to the (already removed and size-fixed) args[] array.
As QDict is a dynamic data structure we don't need this.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/monitor.c b/monitor.c
index 331d456..265d24a 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, str_idx;
+ int c, str_idx;
const mon_cmd_t *cmd;
char cmdname[256];
char buf[1024];
@@ -2727,7 +2727,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
/* parse the parameters */
typestr = cmd->args_type;
- nb_args = str_idx = 0;
+ str_idx = 0;
for(;;) {
typestr = key_get_info(typestr, &key);
if (!typestr)
@@ -2773,14 +2773,12 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
pstrcpy(str, sizeof(buf), buf);
str_allocated[str_idx++] = str;
add_str:
- if (nb_args >= MAX_ARGS) {
- error_args:
- monitor_printf(mon, "%s: too many arguments\n", cmdname);
- goto fail;
- }
if (str) {
+ if (str_idx >= MAX_ARGS) {
+ monitor_printf(mon, "%s: too many
arguments\n",cmdname);
+ goto fail;
+ }
qdict_add(qdict, key, str);
- nb_args++;
}
}
break;
@@ -2858,12 +2856,9 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
size = -1;
}
}
- if (nb_args + 3 > MAX_ARGS)
- goto error_args;
qdict_add(qdict, "count", (void*)(long)count);
qdict_add(qdict, "format", (void*)(long)format);
qdict_add(qdict, "size", (void*)(long)size);
- nb_args += 3;
}
break;
case 'i':
@@ -2890,35 +2885,25 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
}
}
typestr++;
- if (nb_args >= MAX_ARGS)
- goto error_args;
}
if (get_expr(mon, &val, &p))
goto fail;
if (c == 'i') {
- if (nb_args >= MAX_ARGS)
- goto error_args;
qdict_add(qdict, key, (void *)(long) val);
- nb_args++;
} else {
char *lkey;
- if ((nb_args + 1) >= MAX_ARGS)
- goto error_args;
lkey = key_append_high(key);
#if TARGET_PHYS_ADDR_BITS > 32
qdict_add(qdict, lkey,
(void *)(long)((val >> 32) & 0xffffffff));
qemu_free(lkey);
- nb_args++;
#else
qdict_add(qdict, lkey, (void *)0);
qemu_free(lkey);
- nb_args++;
#endif
lkey = key_append_low(key);
qdict_add(qdict, lkey,(void *)(long)(val & 0xffffffff));
qemu_free(lkey);
- nb_args++;
}
}
break;
@@ -2943,10 +2928,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
p++;
has_option = 1;
}
- if (nb_args >= MAX_ARGS)
- goto error_args;
qdict_add(qdict, key, (void *)(long)has_option);
- nb_args++;
}
break;
default:
--
1.6.4.rc3.12.gdf73a
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, (continued)
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 17/25] monitor: Drop handler_8 and handler_9 handling, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 16/25] monitor: Port handler_7 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 18/25] monitor: Port handler_10 to use the dictionary, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 20/25] monitor: Add a new index for str_allocated[], Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_command(), Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 22/25] monitor: Drop 'nb_args' from monitor_parse_command(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 23/25] Add check support, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 24/25] Introduce dictionary test data file, Luiz Capitulino, 2009/08/03
- [Qemu-devel] [PATCH 25/25] Introduce QDict unit-tests, Luiz Capitulino, 2009/08/03
- Re: [Qemu-devel] [PATCH v1 00/25] Monitor handlers new structure phase 1, Anthony Liguori, 2009/08/10