Eliminate make_cleanup_ui_file_delete / make ui_file a class hierarchy

[deliverable/binutils-gdb.git] / gdb / arm-tdep.c

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 0ae311fb104b75277e82e3a7efa90a5036ad2d47..88ed391729813dc4ef8e4dccb6698fa798e0de08 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -9576,13 +9576,11 @@ extern initialize_file_ftype _initialize_arm_tdep; /* -Wmissing-prototypes */
 void
 _initialize_arm_tdep (void)
 {
-  struct ui_file *stb;
   long length;
   const char *setname;
   const char *setdesc;
   const char *const *regnames;
   int i;
-  static std::string helptext;
   char regdesc[1024], *rdptr = regdesc;
   size_t rest = sizeof (regdesc);
 
@@ -9648,13 +9646,10 @@ _initialize_arm_tdep (void)
   valid_disassembly_styles[num_disassembly_options] = NULL;
 
   /* Create the help text.  */
-  stb = mem_fileopen ();
-  fprintf_unfiltered (stb, "%s%s%s",
-                     _("The valid values are:\n"),
-                     regdesc,
-                     _("The default is \"std\"."));
-  helptext = ui_file_as_string (stb);
-  ui_file_delete (stb);
+  std::string helptext = string_printf ("%s%s%s",
+                                       _("The valid values are:\n"),
+                                       regdesc,
+                                       _("The default is \"std\"."));
 
   add_setshow_enum_cmd("disassembler", no_class,
                       valid_disassembly_styles, &disassembly_style,