Patchwork [20/25] monitor: Add a new index for str_allocated[]

login
register
mail settings
Submitter Luiz Capitulino
Date Aug. 3, 2009, 4:57 p.m.
Message ID <1249318642-19324-21-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/30673/
State Superseded
Headers show

Comments

Luiz Capitulino - Aug. 3, 2009, 4:57 p.m.
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 <lcapitulino@redhat.com>
---
 monitor.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

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: