From 5809899dad253e2fefcb6f7ae57a6f43cfa4e3c5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Sep 2016 09:50:50 -0600 Subject: [PATCH] Use std::string in break-catch-sig.c This changes one spot in break-catch-sig.c to use std::string, removing some cleanups. 2016-09-23 Tom Tromey * break-catch-sig.c: Include . (signal_catchpoint_print_one): Use std::string. --- gdb/ChangeLog | 5 +++++ gdb/break-catch-sig.c | 17 ++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fe3ea42..8c8b18a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-09-23 Tom Tromey + * break-catch-sig.c: Include . + (signal_catchpoint_print_one): Use std::string. + +2016-09-23 Tom Tromey + * utils.c (struct restore_ui_out_closure): Remove. * objfiles.h (terminate_minimal_symbol_table): Don't declare. diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c index 06ee44c..296f900 100644 --- a/gdb/break-catch-sig.c +++ b/gdb/break-catch-sig.c @@ -28,7 +28,8 @@ #include "valprint.h" #include "cli/cli-utils.h" #include "completer.h" -#include "gdb_obstack.h" + +#include #define INTERNAL_SIGNAL(x) ((x) == GDB_SIGNAL_TRAP || (x) == GDB_SIGNAL_INT) @@ -265,11 +266,7 @@ signal_catchpoint_print_one (struct breakpoint *b, { int i; gdb_signal_type iter; - struct obstack text; - struct cleanup *cleanup; - - obstack_init (&text); - cleanup = make_cleanup_obstack_free (&text); + std::string text; for (i = 0; VEC_iterate (gdb_signal_type, c->signals_to_be_caught, i, iter); @@ -278,12 +275,10 @@ signal_catchpoint_print_one (struct breakpoint *b, const char *name = signal_to_name_or_int (iter); if (i > 0) - obstack_grow (&text, " ", 1); - obstack_grow (&text, name, strlen (name)); + text += " "; + text += name; } - obstack_grow (&text, "", 1); - ui_out_field_string (uiout, "what", (const char *) obstack_base (&text)); - do_cleanups (cleanup); + ui_out_field_string (uiout, "what", text.c_str ()); } else ui_out_field_string (uiout, "what", -- 2.7.4