From 322a851675234b3c16be6dd5035b07f5e3410ec7 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 8 Nov 2016 15:26:44 +0000 Subject: [PATCH] Use ui_file_as_string in dwarf2_compute_name gdb/ChangeLog: 2016-11-08 Pedro Alves * dwarf2read.c (dwarf2_compute_name): Use ui_file_as_string and std::string. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 274c6816681..dbf4eb3ec11 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-11-08 Pedro Alves + + * dwarf2read.c (dwarf2_compute_name): Use ui_file_as_string and + std::string. + 2016-11-08 Pedro Alves * mi/mi-main.c (print_variable_or_computed): Constify 'expression' diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index c070cd74302..6cc79ea30eb 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -8487,7 +8487,6 @@ dwarf2_compute_name (const char *name, long length; const char *prefix; struct ui_file *buf; - char *intermediate_name; const char *canonical_name = NULL; prefix = determine_prefix (die, cu); @@ -8656,26 +8655,24 @@ dwarf2_compute_name (const char *name, } } - intermediate_name = ui_file_xstrdup (buf, &length); + std::string intermediate_name = ui_file_as_string (buf); ui_file_delete (buf); if (cu->language == language_cplus) canonical_name - = dwarf2_canonicalize_name (intermediate_name, cu, + = dwarf2_canonicalize_name (intermediate_name.c_str (), cu, &objfile->per_bfd->storage_obstack); /* If we only computed INTERMEDIATE_NAME, or if INTERMEDIATE_NAME is already canonical, then we need to copy it to the appropriate obstack. */ - if (canonical_name == NULL || canonical_name == intermediate_name) + if (canonical_name == NULL || canonical_name == intermediate_name.c_str ()) name = ((const char *) obstack_copy0 (&objfile->per_bfd->storage_obstack, - intermediate_name, - strlen (intermediate_name))); + intermediate_name.c_str (), + intermediate_name.length ())); else name = canonical_name; - - xfree (intermediate_name); } } -- 2.30.2