[RFA,02/11] Remove cleanups from mi_cmd_break_insert_1
Commit Message
This changes mi_argv_to_format to return a string, allowing the
removal of some cleanups.
ChangeLog
2017-09-12 Tom Tromey <tom@tromey.com>
* mi/mi-cmd-break.c (mi_argv_to_format): Return std::string.
(mi_cmd_break_insert_1): Update.
---
gdb/ChangeLog | 5 +++++
gdb/mi/mi-cmd-break.c | 17 +++++------------
2 files changed, 10 insertions(+), 12 deletions(-)
Comments
On 09/12/2017 07:57 PM, Tom Tromey wrote:
> * target.h (make_scoped_defer_target_commit_resume): Update.
> * target.c (make_scoped_defer_target_commit_resume): Rename from
> make_cleanup_defer_target_commit_resume. Return a
> diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
> index bae8711..4cd134c 100644
> --- a/gdb/mi/mi-cmd-break.c
> +++ b/gdb/mi/mi-cmd-break.c
> @@ -86,12 +86,11 @@ setup_breakpoint_reporting (void)
> /* Convert arguments in ARGV to the string in "format",argv,argv...
> and return it. */
>
> -static char *
> +static std::string
> mi_argv_to_format (char **argv, int argc)
> {
> int i;
> - struct obstack obstack;
> - char *ret;
> + auto_obstack obstack;
>
> obstack_init (&obstack);
Remove the obstack_init call too.
>
> @@ -152,10 +151,7 @@ mi_argv_to_format (char **argv, int argc)
> }
> obstack_1grow (&obstack, '\0');
>
> - ret = xstrdup ((const char *) obstack_finish (&obstack));
> - obstack_free (&obstack, NULL);
> -
> - return ret;
> + return (const char *) obstack_finish (&obstack);
> }
OK.
IMO, it'd be even better to build the std::string directly
instead of building an obstack and then dupping the string.
Thanks,
Pedro Alves
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
Pedro> IMO, it'd be even better to build the std::string directly
Pedro> instead of building an obstack and then dupping the string.
I made this change.
I'll send the new patch a bit later.
Tom
@@ -1,5 +1,10 @@
2017-09-12 Tom Tromey <tom@tromey.com>
+ * mi/mi-cmd-break.c (mi_argv_to_format): Return std::string.
+ (mi_cmd_break_insert_1): Update.
+
+2017-09-12 Tom Tromey <tom@tromey.com>
+
* target.h (make_scoped_defer_target_commit_resume): Update.
* target.c (make_scoped_defer_target_commit_resume): Rename from
make_cleanup_defer_target_commit_resume. Return a
@@ -86,12 +86,11 @@ setup_breakpoint_reporting (void)
/* Convert arguments in ARGV to the string in "format",argv,argv...
and return it. */
-static char *
+static std::string
mi_argv_to_format (char **argv, int argc)
{
int i;
- struct obstack obstack;
- char *ret;
+ auto_obstack obstack;
obstack_init (&obstack);
@@ -152,10 +151,7 @@ mi_argv_to_format (char **argv, int argc)
}
obstack_1grow (&obstack, '\0');
- ret = xstrdup ((const char *) obstack_finish (&obstack));
- obstack_free (&obstack, NULL);
-
- return ret;
+ return (const char *) obstack_finish (&obstack);
}
/* Insert breakpoint.
@@ -174,13 +170,12 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc)
int pending = 0;
int enabled = 1;
int tracepoint = 0;
- struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
enum bptype type_wanted;
event_location_up location;
struct breakpoint_ops *ops;
int is_explicit = 0;
struct explicit_location explicit_loc;
- char *extra_string = NULL;
+ std::string extra_string;
enum opt
{
@@ -278,7 +273,6 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc)
error (_("-dprintf-insert: Missing <format>"));
extra_string = mi_argv_to_format (argv + format_num, argc - format_num);
- make_cleanup (xfree, extra_string);
address = argv[oind];
}
else
@@ -343,13 +337,12 @@ mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc)
}
create_breakpoint (get_current_arch (), location.get (), condition, thread,
- extra_string,
+ extra_string.c_str (),
0 /* condition and thread are valid. */,
temp_p, type_wanted,
ignore_count,
pending ? AUTO_BOOLEAN_TRUE : AUTO_BOOLEAN_FALSE,
ops, 0, enabled, 0, 0);
- do_cleanups (back_to);
}
/* Implements the -break-insert command.