From 773a1edcd1086fc76a91055bec67e2d14d76940d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 30 Apr 2017 23:02:30 -0600 Subject: Introduce gdb_argv, a class wrapper for buildargv This introduces gdb_argv, a class wrapping an "argv" pointer; that is, a pointer to a NULL-terminated array of char*, where both the array and each non-NULL element in the array are xmalloc'd. This patch then changes most users of gdb_buildargv to use gdb_argv instead. ChangeLog 2017-08-03 Tom Tromey * utils.h (struct gdb_argv_deleter): New. (gdb_argv): New class. * utils.c (gdb_argv::reset): New method. * tracepoint.c (delete_trace_variable_command): Use gdb_argv. * tracefile.c (tsave_command): Use gdb_argv. * top.c (new_ui_command): Use gdb_argv. * symmisc.c (maintenance_print_symbols) (maintenance_print_msymbols, maintenance_expand_symtabs): Use gdb_argv. * symfile.c (symbol_file_command, generic_load) (remove_symbol_file_command): Use gdb_argv. * stack.c (backtrace_command): Use gdb_argv. * source.c (add_path, show_substitute_path_command) (unset_substitute_path_command, set_substitute_path_command): Use gdb_argv. * skip.c (skip_command): Use gdb_argv. Use gdb_buildargv. * ser-mingw.c (pipe_windows_open): Use gdb_argv. * remote.c (extended_remote_run, remote_put_command) (remote_get_command, remote_delete_command): Use gdb_argv. * remote-sim.c (gdbsim_load, gdbsim_create_inferior) (gdbsim_open): Use gdb_argv. * python/py-cmd.c (gdbpy_string_to_argv): Use gdb_argv. * psymtab.c (maintenance_print_psymbols): Use gdb_argv. * procfs.c (procfs_info_proc): Use gdb_argv. * interps.c (interpreter_exec_cmd): Use gdb_argv. * infrun.c (handle_command): Use gdb_argv. * inferior.c (add_inferior_command, clone_inferior_command): Use gdb_argv. * guile/scm-string.c (gdbscm_string_to_argv): Use gdb_argv. * exec.c (exec_file_command): Use gdb_argv. * cli/cli-cmds.c (alias_command): Use gdb_argv. * compile/compile.c (build_argc_argv): Use gdb_argv. --- gdb/guile/scm-string.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gdb/guile/scm-string.c') diff --git a/gdb/guile/scm-string.c b/gdb/guile/scm-string.c index d97f583..4e495eb 100644 --- a/gdb/guile/scm-string.c +++ b/gdb/guile/scm-string.c @@ -241,7 +241,6 @@ static SCM gdbscm_string_to_argv (SCM string_scm) { char *string; - char **c_argv; int i; SCM result = SCM_EOL; @@ -254,11 +253,10 @@ gdbscm_string_to_argv (SCM string_scm) return SCM_EOL; } - c_argv = gdb_buildargv (string); - for (i = 0; c_argv[i] != NULL; ++i) - result = scm_cons (gdbscm_scm_from_c_string (c_argv[i]), result); + gdb_argv c_argv (string); + for (char *arg : c_argv) + result = scm_cons (gdbscm_scm_from_c_string (arg), result); - freeargv (c_argv); xfree (string); return scm_reverse_x (result, SCM_EOL); -- cgit v1.1