mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: avoid use of global *cur_mon in cmd_completion()

Browse Source 
A new local variable *mon is added in monitor_find_completion()
to make compile pass, which will be removed later in
conversion patch for monitor_find_completion().

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Wenchao Xia 2013-08-27 20:38:13 +08:00 committed by Luiz Capitulino
parent 9c3175cc15
commit cd5c6bba1b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
monitor.c
View File

@ -4009,7 +4009,7 @@ out:
QDECREF(qdict); QDECREF(qdict);
} }
static void cmd_completion(const char *name, const char *list) static void cmd_completion(Monitor *mon, const char *name, const char *list)
{ {
const char *p, *pstart; const char *p, *pstart;
char cmd[128]; char cmd[128];
@ -4027,7 +4027,7 @@ static void cmd_completion(const char *name, const char *list)
memcpy(cmd, pstart, len); memcpy(cmd, pstart, len);
cmd[len] = '\0'; cmd[len] = '\0';
if (name[0] == '\0' || !strncmp(name, cmd, strlen(name))) { if (name[0] == '\0' || !strncmp(name, cmd, strlen(name))) {
readline_add_completion(cur_mon->rs, cmd); readline_add_completion(mon->rs, cmd);
} }
if (*p == '\0') if (*p == '\0')
break; break;
@ -4141,6 +4141,7 @@ static void monitor_find_completion(const char *cmdline)
int nb_args, i, len; int nb_args, i, len;
const char *ptype, *str; const char *ptype, *str;
const mon_cmd_t *cmd; const mon_cmd_t *cmd;
Monitor *mon = cur_mon;
parse_cmdline(cmdline, &nb_args, args); parse_cmdline(cmdline, &nb_args, args);
#ifdef DEBUG_COMPLETION #ifdef DEBUG_COMPLETION
@ -4166,7 +4167,7 @@ static void monitor_find_completion(const char *cmdline)
cmdname = args[0]; cmdname = args[0];
readline_set_completion_index(cur_mon->rs, strlen(cmdname)); readline_set_completion_index(cur_mon->rs, strlen(cmdname));
for(cmd = mon_cmds; cmd->name != NULL; cmd++) { for(cmd = mon_cmds; cmd->name != NULL; cmd++) {
cmd_completion(cmdname, cmd->name); cmd_completion(mon, cmdname, cmd->name);
} }
} else { } else {
/* find the command */ /* find the command */
@ -4207,7 +4208,7 @@ static void monitor_find_completion(const char *cmdline)
if (!strcmp(cmd->name, "info")) { if (!strcmp(cmd->name, "info")) {
readline_set_completion_index(cur_mon->rs, strlen(str)); readline_set_completion_index(cur_mon->rs, strlen(str));
for(cmd = info_cmds; cmd->name != NULL; cmd++) { for(cmd = info_cmds; cmd->name != NULL; cmd++) {
cmd_completion(str, cmd->name); cmd_completion(mon, str, cmd->name);
} }
} else if (!strcmp(cmd->name, "sendkey")) { } else if (!strcmp(cmd->name, "sendkey")) {
char *sep = strrchr(str, '-'); char *sep = strrchr(str, '-');
@ -4215,12 +4216,12 @@ static void monitor_find_completion(const char *cmdline)
str = sep + 1; str = sep + 1;
readline_set_completion_index(cur_mon->rs, strlen(str)); readline_set_completion_index(cur_mon->rs, strlen(str));
for (i = 0; i < Q_KEY_CODE_MAX; i++) { for (i = 0; i < Q_KEY_CODE_MAX; i++) {
cmd_completion(str, QKeyCode_lookup[i]); cmd_completion(mon, str, QKeyCode_lookup[i]);
} }
} else if (!strcmp(cmd->name, "help|?")) { } else if (!strcmp(cmd->name, "help|?")) {
readline_set_completion_index(cur_mon->rs, strlen(str)); readline_set_completion_index(cur_mon->rs, strlen(str));
for (cmd = mon_cmds; cmd->name != NULL; cmd++) { for (cmd = mon_cmds; cmd->name != NULL; cmd++) {
cmd_completion(str, cmd->name); cmd_completion(mon, str, cmd->name);
} }
} }
break; break;