[PATCH v2 13/31] Use ui_file_as_string in gdb/arm-tdep.c

Pedro Alves
2016-10-19T01:21:37Z

yyyy-mm-yy Pedro Alves <palves@redhat.com>

* arm-tdep.c (_initialize_arm_tdep): Use ui_file_as_string and
std::string.
---
gdb/arm-tdep.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 27a3ebe..31ebdc3 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -9558,7 +9558,7 @@ _initialize_arm_tdep (void)
const char *setdesc;
const char *const *regnames;
int i;
- static char *helptext;
+ static std::string helptext;
char regdesc[1024], *rdptr = regdesc;
size_t rest = sizeof (regdesc);

@@ -9629,14 +9629,14 @@ _initialize_arm_tdep (void)
_("The valid values are:\n"),
regdesc,
_("The default is \"std\"."));
- helptext = ui_file_xstrdup (stb, NULL);
+ helptext = ui_file_as_string (stb);
ui_file_delete (stb);

add_setshow_enum_cmd("disassembler", no_class,
valid_disassembly_styles, &disassembly_style,
_("Set the disassembly style."),
_("Show the disassembly style."),
- helptext,
+ helptext.c_str (),
set_disassembly_style_sfunc,
NULL, /* FIXME: i18n: The disassembly style is
\"%s\". */
--
2.5.5