[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/16] monitor: avoid use of global *cur_mon in file_
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 03/16] monitor: avoid use of global *cur_mon in file_completion() |
Date: |
Fri, 30 Aug 2013 08:22:24 -0400 |
From: Wenchao Xia <address@hidden>
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 770ab6e..3a0b40c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4035,7 +4035,7 @@ static void cmd_completion(Monitor *mon, const char
*name, const char *list)
}
}
-static void file_completion(const char *input)
+static void file_completion(Monitor *mon, const char *input)
{
DIR *ffs;
struct dirent *d;
@@ -4058,7 +4058,7 @@ static void file_completion(const char *input)
pstrcpy(file_prefix, sizeof(file_prefix), p + 1);
}
#ifdef DEBUG_COMPLETION
- monitor_printf(cur_mon, "input='%s' path='%s' prefix='%s'\n",
+ monitor_printf(mon, "input='%s' path='%s' prefix='%s'\n",
input, path, file_prefix);
#endif
ffs = opendir(path);
@@ -4085,7 +4085,7 @@ static void file_completion(const char *input)
if (stat(file, &sb) == 0 && S_ISDIR(sb.st_mode)) {
pstrcat(file, sizeof(file), "/");
}
- readline_add_completion(cur_mon->rs, file);
+ readline_add_completion(mon->rs, file);
}
}
closedir(ffs);
@@ -4196,7 +4196,7 @@ static void monitor_find_completion(const char *cmdline)
case 'F':
/* file completion */
readline_set_completion_index(cur_mon->rs, strlen(str));
- file_completion(str);
+ file_completion(mon, str);
break;
case 'B':
/* block device name completion */
--
1.8.1.4
- [Qemu-devel] [PULL 00/16] QMP queue, Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 01/16] monitor: Add missing attributes to local function, Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 02/16] monitor: avoid use of global *cur_mon in cmd_completion(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 04/16] monitor: avoid use of global *cur_mon in block_completion_it(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 03/16] monitor: avoid use of global *cur_mon in file_completion(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 05/16] monitor: avoid use of global *cur_mon in monitor_find_completion(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 06/16] monitor: avoid use of global *cur_mon in readline_completion(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 07/16] monitor: call sortcmdlist() only one time, Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 08/16] monitor: split off monitor_data_init(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 09/16] monitor: avoid direct use of global variable *mon_cmds, Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 10/16] monitor: code move for parse_cmdline(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 11/16] monitor: refine parse_cmdline(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 12/16] monitor: support sub command in help, Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 13/16] monitor: refine monitor_find_completion(), Luiz Capitulino, 2013/08/30
- [Qemu-devel] [PULL 14/16] monitor: support sub command in auto completion, Luiz Capitulino, 2013/08/30