diff options
| author | Wenchao Xia <xiawenc@linux.vnet.ibm.com> | 2013-08-27 20:38:14 +0800 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2013-08-30 07:41:14 -0400 |
| commit | cb8f68b104f8d14f0ad856012cac7bd27f183799 (patch) | |
| tree | 938a0a7cc80d14664bd9a334dfce67e86c295092 | |
| parent | cd5c6bba1b75d4faebb58345d2661d5e42600fab (diff) | |
monitor: avoid use of global *cur_mon in file_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>
| -rw-r--r-- | monitor.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 */ |