X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fdisasm.c;h=76c4ff31a6ee7861dc60ef292421693b98462644;hb=6a2c1b8790e58ce0688507b5b1f8369aa621a665;hp=fde52c392b26f7fdb1264c21a4c310d12812f6bd;hpb=2e78302469502f4f8a98144b60c09d4d9b6438fd;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/disasm.c b/gdb/disasm.c
index fde52c392b..76c4ff31a6 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -732,13 +732,9 @@ do_assembly_only (struct gdbarch *gdbarch, struct ui_out *uiout,
 		  CORE_ADDR low, CORE_ADDR high,
 		  int how_many, int flags)
 {
-  struct cleanup *ui_out_chain;
-
-  ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
+  ui_out_emit_list list_emitter (uiout, "asm_insns");
 
   dump_insns (gdbarch, uiout, low, high, how_many, flags, NULL);
-
-  do_cleanups (ui_out_chain);
 }
 
 /* Initialize the disassemble info struct ready for the specified
@@ -1034,8 +1030,9 @@ The following disassembler options are supported for use with the\n\
 
 /* A completion function for "set disassembler".  */
 
-static VEC (char_ptr) *
+static void
 disassembler_options_completer (struct cmd_list_element *ignore,
+				completion_tracker &tracker,
 				const char *text, const char *word)
 {
   struct gdbarch *gdbarch = get_current_arch ();
@@ -1048,9 +1045,8 @@ disassembler_options_completer (struct cmd_list_element *ignore,
       if (separator != NULL)
 	text = separator + 1;
       text = skip_spaces_const (text);
-      return complete_on_enum (opts->name, text, word);
+      complete_on_enum (tracker, opts->name, text, word);
     }
-  return NULL;
 }