diff options
| author | Pedro Alves <palves@redhat.com> | 2016-11-08 15:26:44 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-11-08 15:26:44 +0000 |
| commit | 322a851675234b3c16be6dd5035b07f5e3410ec7 (patch) | |
| tree | b8029de0c076395a62c081cdd247f0f98febc63d | |
| parent | 1f45808ead357e8a81dec16b9802a6c369e08426 (diff) | |
| download | gdb-322a851675234b3c16be6dd5035b07f5e3410ec7.zip gdb-322a851675234b3c16be6dd5035b07f5e3410ec7.tar.gz gdb-322a851675234b3c16be6dd5035b07f5e3410ec7.tar.bz2 | |
Use ui_file_as_string in dwarf2_compute_name
gdb/ChangeLog:
2016-11-08 Pedro Alves <palves@redhat.com>
* dwarf2read.c (dwarf2_compute_name): Use ui_file_as_string and
std::string.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 274c681..dbf4eb3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-08 Pedro Alves <palves@redhat.com> + * dwarf2read.c (dwarf2_compute_name): Use ui_file_as_string and + std::string. + +2016-11-08 Pedro Alves <palves@redhat.com> + * mi/mi-main.c (print_variable_or_computed): Constify 'expression' parameter. (mi_cmd_trace_frame_collected): Call encode_actions instead of diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index c070cd7..6cc79ea 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); } } |