* mi/mi-cmds.h (mi_cmd_args_ftype): Remove.

	Adjust all prototypes using mi_cmd_args_ftype to use
	mi_cmd_argv_ftype.
	(struct mi_cmd): Remove the args_func field.
	* mi/mi-cmds.c: Don't provide value for the args_func field.
	* mi/mi-main.c (mi_execute_async_cli_command)
	(mi_cmd_exec_run, mi_cmd_exec_next, mi_cmd_exec_next_instruction)
	(mi_cmd_exec_step, mi_cmd_exec_step_instruction)
	(mi_cmd_exec_finish, mi_cmd_exec_until, mi_cmd_exec_return)
	(mi_cmd_exec_continue, mi_cmd_exec_interrupt)
	(mi_cmd_target_download): Adjust.
	(mi_cmd_target_select): Adjust. Pass 0 for from_tty parameter.
	(mi_cmd_execute): Do not check for args_func.
	(mi_execute_async_cli_command): Adjust.
	* mi/mi-parse.c: Don't check for args_func.

1 files changed, 115 insertions, 116 deletions

diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 89c63769..e94648b 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -32,32 +32,32 @@ static void build_table (struct mi_cmd *commands);
 
 struct mi_cmd mi_cmds[] =
 {
-  { "break-after", { "ignore", 1 }, NULL, NULL },
-  { "break-catch", { NULL, 0 }, NULL, NULL },
-  { "break-commands", { NULL, 0 }, NULL, NULL },
-  { "break-condition", { "cond", 1 }, NULL, NULL },
-  { "break-delete", { "delete breakpoint", 1 }, NULL, NULL },
-  { "break-disable", { "disable breakpoint", 1 }, NULL, NULL },
-  { "break-enable", { "enable breakpoint", 1 }, NULL, NULL },
-  { "break-info", { "info break", 1 }, NULL, NULL },
-  { "break-insert", { NULL, 0 }, 0, mi_cmd_break_insert},
-  { "break-list", { "info break", }, NULL, NULL },
-  { "break-watch", { NULL, 0 }, 0, mi_cmd_break_watch},
-  { "data-disassemble", { NULL, 0 }, 0, mi_cmd_disassemble},
-  { "data-evaluate-expression", { NULL, 0 }, 0, mi_cmd_data_evaluate_expression},
-  { "data-list-changed-registers", { NULL, 0 }, 0, mi_cmd_data_list_changed_registers},
-  { "data-list-register-names", { NULL, 0 }, 0, mi_cmd_data_list_register_names},
-  { "data-list-register-values", { NULL, 0 }, 0, mi_cmd_data_list_register_values},
-  { "data-read-memory", { NULL, 0 }, 0, mi_cmd_data_read_memory},
-  { "data-write-memory", { NULL, 0 }, 0, mi_cmd_data_write_memory},
-  { "data-write-register-values", { NULL, 0 }, 0, mi_cmd_data_write_register_values},
-  { "enable-timings", { NULL, 0 }, 0, mi_cmd_enable_timings},
-  { "environment-cd", { NULL, 0 }, 0, mi_cmd_env_cd},
-  { "environment-directory", { NULL, 0 }, 0, mi_cmd_env_dir},
-  { "environment-path", { NULL, 0 }, 0, mi_cmd_env_path},
-  { "environment-pwd", { NULL, 0 }, 0, mi_cmd_env_pwd},
-  { "exec-abort", { NULL, 0 }, NULL, NULL },
-  { "exec-arguments", { "set args", 1 }, NULL, NULL },
+  { "break-after", { "ignore", 1 }, NULL },
+  { "break-catch", { NULL, 0 }, NULL },
+  { "break-commands", { NULL, 0 }, NULL },
+  { "break-condition", { "cond", 1 }, NULL },
+  { "break-delete", { "delete breakpoint", 1 }, NULL },
+  { "break-disable", { "disable breakpoint", 1 }, NULL },
+  { "break-enable", { "enable breakpoint", 1 }, NULL },
+  { "break-info", { "info break", 1 }, NULL },
+  { "break-insert", { NULL, 0 }, mi_cmd_break_insert},
+  { "break-list", { "info break", }, NULL },
+  { "break-watch", { NULL, 0 }, mi_cmd_break_watch},
+  { "data-disassemble", { NULL, 0 }, mi_cmd_disassemble},
+  { "data-evaluate-expression", { NULL, 0 }, mi_cmd_data_evaluate_expression},
+  { "data-list-changed-registers", { NULL, 0 }, mi_cmd_data_list_changed_registers},
+  { "data-list-register-names", { NULL, 0 }, mi_cmd_data_list_register_names},
+  { "data-list-register-values", { NULL, 0 }, mi_cmd_data_list_register_values},
+  { "data-read-memory", { NULL, 0 }, mi_cmd_data_read_memory},
+  { "data-write-memory", { NULL, 0 }, mi_cmd_data_write_memory},
+  { "data-write-register-values", { NULL, 0 }, mi_cmd_data_write_register_values},
+  { "enable-timings", { NULL, 0 }, mi_cmd_enable_timings},
+  { "environment-cd", { NULL, 0 }, mi_cmd_env_cd},
+  { "environment-directory", { NULL, 0 }, mi_cmd_env_dir},
+  { "environment-path", { NULL, 0 }, mi_cmd_env_path},
+  { "environment-pwd", { NULL, 0 }, mi_cmd_env_pwd},
+  { "exec-abort", { NULL, 0 }, NULL },
+  { "exec-arguments", { "set args", 1 }, NULL },
   { "exec-continue", { NULL, 0 }, mi_cmd_exec_continue},
   { "exec-finish", { NULL, 0 }, mi_cmd_exec_finish},
   { "exec-interrupt", { NULL, 0 }, mi_cmd_exec_interrupt},
@@ -65,104 +65,103 @@ struct mi_cmd mi_cmds[] =
   { "exec-next-instruction", { NULL, 0 }, mi_cmd_exec_next_instruction},
   { "exec-return", { NULL, 0 }, mi_cmd_exec_return},
   { "exec-run", { NULL, 0 }, mi_cmd_exec_run},
-  { "exec-show-arguments", { NULL, 0 }, NULL, NULL },
-  { "exec-signal", { NULL, 0 }, NULL, NULL },
+  { "exec-show-arguments", { NULL, 0 }, NULL },
+  { "exec-signal", { NULL, 0 }, NULL },
   { "exec-step", { NULL, 0 }, mi_cmd_exec_step},
   { "exec-step-instruction", { NULL, 0 }, mi_cmd_exec_step_instruction},
   { "exec-until", { NULL, 0 }, mi_cmd_exec_until},
-  { "file-clear", { NULL, 0 }, NULL, NULL },
-  { "file-exec-and-symbols", { "file", 1 }, NULL, NULL },
-  { "file-exec-file", { "exec-file", 1 }, NULL, NULL },
-  { "file-list-exec-sections", { NULL, 0 }, NULL, NULL },
-  { "file-list-exec-source-file", { NULL, 0 }, 0, mi_cmd_file_list_exec_source_file},
-  { "file-list-exec-source-files", { NULL, 0 }, NULL, mi_cmd_file_list_exec_source_files },
-  { "file-list-shared-libraries", { NULL, 0 }, NULL, NULL },
-  { "file-list-symbol-files", { NULL, 0 }, NULL, NULL },
-  { "file-symbol-file", { "symbol-file", 1 }, NULL, NULL },
-  { "gdb-complete", { NULL, 0 }, NULL, NULL },
-  { "gdb-exit", { NULL, 0 }, 0, mi_cmd_gdb_exit},
-  { "gdb-set", { "set", 1 }, NULL, NULL },
-  { "gdb-show", { "show", 1 }, NULL, NULL },
-  { "gdb-source", { NULL, 0 }, NULL, NULL },
+  { "file-clear", { NULL, 0 }, NULL },
+  { "file-exec-and-symbols", { "file", 1 }, NULL },
+  { "file-exec-file", { "exec-file", 1 }, NULL },
+  { "file-list-exec-sections", { NULL, 0 }, NULL },
+  { "file-list-exec-source-file", { NULL, 0 }, mi_cmd_file_list_exec_source_file},
+  { "file-list-exec-source-files", { NULL, 0 }, mi_cmd_file_list_exec_source_files },
+  { "file-list-shared-libraries", { NULL, 0 }, NULL },
+  { "file-list-symbol-files", { NULL, 0 }, NULL },
+  { "file-symbol-file", { "symbol-file", 1 }, NULL },
+  { "gdb-complete", { NULL, 0 }, NULL },
+  { "gdb-exit", { NULL, 0 }, mi_cmd_gdb_exit},
+  { "gdb-set", { "set", 1 }, NULL },
+  { "gdb-show", { "show", 1 }, NULL },
+  { "gdb-source", { NULL, 0 }, NULL },
   { "gdb-version", { "show version", 0 }, 0 },
-  { "inferior-tty-set", { NULL, 0 }, NULL, mi_cmd_inferior_tty_set},
-  { "inferior-tty-show", { NULL, 0 }, NULL, mi_cmd_inferior_tty_show},
-  { "interpreter-exec", { NULL, 0 }, 0, mi_cmd_interpreter_exec},
-  { "list-features", { NULL, 0 }, 0, mi_cmd_list_features},
-  { "overlay-auto", { NULL, 0 }, NULL, NULL },
-  { "overlay-list-mapping-state", { NULL, 0 }, NULL, NULL },
-  { "overlay-list-overlays", { NULL, 0 }, NULL, NULL },
-  { "overlay-map", { NULL, 0 }, NULL, NULL },
-  { "overlay-off", { NULL, 0 }, NULL, NULL },
-  { "overlay-on", { NULL, 0 }, NULL, NULL },
-  { "overlay-unmap", { NULL, 0 }, NULL, NULL },
-  { "signal-handle", { NULL, 0 }, NULL, NULL },
-  { "signal-list-handle-actions", { NULL, 0 }, NULL, NULL },
-  { "signal-list-signal-types", { NULL, 0 }, NULL, NULL },
-  { "stack-info-depth", { NULL, 0 }, 0, mi_cmd_stack_info_depth},
-  { "stack-info-frame", { NULL, 0 }, 0, mi_cmd_stack_info_frame},
-  { "stack-list-arguments", { NULL, 0 }, 0, mi_cmd_stack_list_args},
-  { "stack-list-exception-handlers", { NULL, 0 }, NULL, NULL },
-  { "stack-list-frames", { NULL, 0 }, 0, mi_cmd_stack_list_frames},
-  { "stack-list-locals", { NULL, 0 }, 0, mi_cmd_stack_list_locals},
-  { "stack-select-frame", { NULL, 0 }, 0, mi_cmd_stack_select_frame},
-  { "symbol-info-address", { NULL, 0 }, NULL, NULL },
-  { "symbol-info-file", { NULL, 0 }, NULL, NULL },
-  { "symbol-info-function", { NULL, 0 }, NULL, NULL },
-  { "symbol-info-line", { NULL, 0 }, NULL, NULL },
-  { "symbol-info-symbol", { NULL, 0 }, NULL, NULL },
-  { "symbol-list-functions", { NULL, 0 }, NULL, NULL },
-  { "symbol-list-lines", { NULL, 0 }, 0, mi_cmd_symbol_list_lines},
-  { "symbol-list-types", { NULL, 0 }, NULL, NULL },
-  { "symbol-list-variables", { NULL, 0 }, NULL, NULL },
-  { "symbol-locate", { NULL, 0 }, NULL, NULL },
-  { "symbol-type", { NULL, 0 }, NULL, NULL },
-  { "target-attach", { NULL, 0 }, NULL, NULL },
-  { "target-compare-sections", { NULL, 0 }, NULL, NULL },
+  { "inferior-tty-set", { NULL, 0 }, mi_cmd_inferior_tty_set},
+  { "inferior-tty-show", { NULL, 0 }, mi_cmd_inferior_tty_show},
+  { "interpreter-exec", { NULL, 0 }, mi_cmd_interpreter_exec},
+  { "list-features", { NULL, 0 }, mi_cmd_list_features},
+  { "overlay-auto", { NULL, 0 }, NULL },
+  { "overlay-list-mapping-state", { NULL, 0 }, NULL },
+  { "overlay-list-overlays", { NULL, 0 }, NULL },
+  { "overlay-map", { NULL, 0 }, NULL },
+  { "overlay-off", { NULL, 0 }, NULL },
+  { "overlay-on", { NULL, 0 }, NULL },
+  { "overlay-unmap", { NULL, 0 }, NULL },
+  { "signal-handle", { NULL, 0 }, NULL },
+  { "signal-list-handle-actions", { NULL, 0 }, NULL },
+  { "signal-list-signal-types", { NULL, 0 }, NULL },
+  { "stack-info-depth", { NULL, 0 }, mi_cmd_stack_info_depth},
+  { "stack-info-frame", { NULL, 0 }, mi_cmd_stack_info_frame},
+  { "stack-list-arguments", { NULL, 0 }, mi_cmd_stack_list_args},
+  { "stack-list-exception-handlers", { NULL, 0 }, NULL },
+  { "stack-list-frames", { NULL, 0 }, mi_cmd_stack_list_frames},
+  { "stack-list-locals", { NULL, 0 }, mi_cmd_stack_list_locals},
+  { "stack-select-frame", { NULL, 0 }, mi_cmd_stack_select_frame},
+  { "symbol-info-address", { NULL, 0 }, NULL },
+  { "symbol-info-file", { NULL, 0 }, NULL },
+  { "symbol-info-function", { NULL, 0 }, NULL },
+  { "symbol-info-line", { NULL, 0 }, NULL },
+  { "symbol-info-symbol", { NULL, 0 }, NULL },
+  { "symbol-list-functions", { NULL, 0 }, NULL },
+  { "symbol-list-lines", { NULL, 0 }, mi_cmd_symbol_list_lines},
+  { "symbol-list-types", { NULL, 0 }, NULL },
+  { "symbol-list-variables", { NULL, 0 },  NULL },
+  { "symbol-locate", { NULL, 0 }, NULL },
+  { "symbol-type", { NULL, 0 }, NULL },
+  { "target-attach", { NULL, 0 }, NULL },
+  { "target-compare-sections", { NULL, 0 }, NULL },
   { "target-detach", { "detach", 0 }, 0 },
   { "target-disconnect", { "disconnect", 0 }, 0 },
   { "target-download", { NULL, 0 }, mi_cmd_target_download},
-  { "target-exec-status", { NULL, 0 }, NULL, NULL },
-  { "target-file-delete", { NULL, 0 }, NULL, mi_cmd_target_file_delete },
-  { "target-file-get", { NULL, 0 }, NULL, mi_cmd_target_file_get },
-  { "target-file-put", { NULL, 0 }, NULL, mi_cmd_target_file_put },
-  { "target-list-available-targets", { NULL, 0 }, NULL, NULL },
-  { "target-list-current-targets", { NULL, 0 }, NULL, NULL },
-  { "target-list-parameters", { NULL, 0 }, NULL, NULL },
+  { "target-exec-status", { NULL, 0 }, NULL },
+  { "target-file-delete", { NULL, 0 }, mi_cmd_target_file_delete },
+  { "target-file-get", { NULL, 0 }, mi_cmd_target_file_get },
+  { "target-file-put", { NULL, 0 }, mi_cmd_target_file_put },
+  { "target-list-available-targets", { NULL, 0 }, NULL },
+  { "target-list-current-targets", { NULL, 0 }, NULL },
+  { "target-list-parameters", { NULL, 0 }, NULL },
   { "target-select", { NULL, 0 }, mi_cmd_target_select},
-  { "thread-info", { NULL, 0 }, NULL, mi_cmd_thread_info },
-  { "thread-list-ids", { NULL, 0 }, 0, mi_cmd_thread_list_ids},
-  { "thread-select", { NULL, 0 }, 0, mi_cmd_thread_select},
-  { "trace-actions", { NULL, 0 }, NULL, NULL },
-  { "trace-delete", { NULL, 0 }, NULL, NULL },
-  { "trace-disable", { NULL, 0 }, NULL, NULL },
-  { "trace-dump", { NULL, 0 }, NULL, NULL },
-  { "trace-enable", { NULL, 0 }, NULL, NULL },
-  { "trace-exists", { NULL, 0 }, NULL, NULL },
-  { "trace-find", { NULL, 0 }, NULL, NULL },
-  { "trace-frame-number", { NULL, 0 }, NULL, NULL },
-  { "trace-info", { NULL, 0 }, NULL, NULL },
-  { "trace-insert", { NULL, 0 }, NULL, NULL },
-  { "trace-list", { NULL, 0 }, NULL, NULL },
-  { "trace-pass-count", { NULL, 0 }, NULL, NULL },
-  { "trace-save", { NULL, 0 }, NULL, NULL },
-  { "trace-start", { NULL, 0 }, NULL, NULL },
-  { "trace-stop", { NULL, 0 }, NULL, NULL },
-  { "var-assign", { NULL, 0 }, 0, mi_cmd_var_assign},
-  { "var-create", { NULL, 0 }, 0, mi_cmd_var_create},
-  { "var-delete", { NULL, 0 }, 0, mi_cmd_var_delete},
-  { "var-evaluate-expression", { NULL, 0 }, 0, mi_cmd_var_evaluate_expression},
-  { "var-info-path-expression", { NULL, 0 }, 0, 
-    mi_cmd_var_info_path_expression},
-  { "var-info-expression", { NULL, 0 }, 0, mi_cmd_var_info_expression},
-  { "var-info-num-children", { NULL, 0 }, 0, mi_cmd_var_info_num_children},
-  { "var-info-type", { NULL, 0 }, 0, mi_cmd_var_info_type},
-  { "var-list-children", { NULL, 0 }, 0, mi_cmd_var_list_children},
-  { "var-set-format", { NULL, 0 }, 0, mi_cmd_var_set_format},
-  { "var-set-frozen", { NULL, 0 }, 0, mi_cmd_var_set_frozen},
-  { "var-show-attributes", { NULL, 0 }, 0, mi_cmd_var_show_attributes},
-  { "var-show-format", { NULL, 0 }, 0, mi_cmd_var_show_format},
-  { "var-update", { NULL, 0 }, 0, mi_cmd_var_update},
+  { "thread-info", { NULL, 0 }, mi_cmd_thread_info },
+  { "thread-list-ids", { NULL, 0 }, mi_cmd_thread_list_ids},
+  { "thread-select", { NULL, 0 }, mi_cmd_thread_select},
+  { "trace-actions", { NULL, 0 }, NULL },
+  { "trace-delete", { NULL, 0 }, NULL },
+  { "trace-disable", { NULL, 0 }, NULL },
+  { "trace-dump", { NULL, 0 }, NULL },
+  { "trace-enable", { NULL, 0 }, NULL },
+  { "trace-exists", { NULL, 0 }, NULL },
+  { "trace-find", { NULL, 0 }, NULL },
+  { "trace-frame-number", { NULL, 0 }, NULL },
+  { "trace-info", { NULL, 0 }, NULL },
+  { "trace-insert", { NULL, 0 }, NULL },
+  { "trace-list", { NULL, 0 }, NULL },
+  { "trace-pass-count", { NULL, 0 }, NULL },
+  { "trace-save", { NULL, 0 }, NULL },
+  { "trace-start", { NULL, 0 }, NULL },
+  { "trace-stop", { NULL, 0 }, NULL },
+  { "var-assign", { NULL, 0 }, mi_cmd_var_assign},
+  { "var-create", { NULL, 0 }, mi_cmd_var_create},
+  { "var-delete", { NULL, 0 }, mi_cmd_var_delete},
+  { "var-evaluate-expression", { NULL, 0 },  mi_cmd_var_evaluate_expression},
+  { "var-info-path-expression", { NULL, 0 }, mi_cmd_var_info_path_expression},
+  { "var-info-expression", { NULL, 0 }, mi_cmd_var_info_expression},
+  { "var-info-num-children", { NULL, 0 }, mi_cmd_var_info_num_children},
+  { "var-info-type", { NULL, 0 }, mi_cmd_var_info_type},
+  { "var-list-children", { NULL, 0 }, mi_cmd_var_list_children},
+  { "var-set-format", { NULL, 0 }, mi_cmd_var_set_format},
+  { "var-set-frozen", { NULL, 0 }, mi_cmd_var_set_frozen},
+  { "var-show-attributes", { NULL, 0 }, mi_cmd_var_show_attributes},
+  { "var-show-format", { NULL, 0 }, mi_cmd_var_show_format},
+  { "var-update", { NULL, 0 }, mi_cmd_var_update},
   { NULL, }
 };