From 09ce46f230fee766c386384cd1f5672d12fde276 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 7 Aug 2018 21:37:40 -0400 Subject: Make target_options_to_string return an std::string Return an std::string instead of a char *, saving some manual freeing. I only manually tested with "set debug target 1" and "set debug lin-lwp 1", since this only deals with debug output. gdb/ChangeLog: * target.h (target_options_to_string): Return an std::string. * target.c (str_comma_list_concat_elem): Return void, use std::string. (do_option): Likewise. (target_options_to_string): Return an std::string. * linux-nat.c (linux_nat_target::wait): Adjust. * target-debug.h (target_debug_print_options): Adjust. --- gdb/target-debug.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gdb/target-debug.h') diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 331baf5..1e904b9 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -203,10 +203,9 @@ target_debug_print_struct_target_waitstatus_p (struct target_waitstatus *status) static void target_debug_print_options (int options) { - char *str = target_options_to_string (options); + std::string str = target_options_to_string (options); - fputs_unfiltered (str, gdb_stdlog); - xfree (str); + fputs_unfiltered (str.c_str (), gdb_stdlog); } static void -- cgit v1.1