From: Tom Tromey <tromey@redhat.com>
Date: Thu, 30 May 2013 17:37:12 +0000 (+0000)
Subject: fix mi-cmd-var.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45475de718b57eb446a47b773658729b24da1583;p=binutils-gdb.git

fix mi-cmd-var.c

This is a stylistic change in mi-cmd-var.c that adds outer cleanups
where needed by the checker.

	* mi/mi-cmd-var.c (varobj_update_one): Add an outer null cleanup.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 14b51d93a49..620af904677 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-30  Tom Tromey  <tromey@redhat.com>
+
+	* mi/mi-cmd-var.c (varobj_update_one): Add an outer null cleanup.
+
 2013-05-30  Tom Tromey  <tromey@redhat.com>
 
 	* cli/cli-script.c (read_command_lines_1): Use a null cleanup
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 558454e7045..a069346911d 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -741,7 +741,6 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
 		   int explicit)
 {
   struct ui_out *uiout = current_uiout;
-  struct cleanup *cleanup = NULL;
   VEC (varobj_update_result) *changes;
   varobj_update_result *r;
   int i;
@@ -752,9 +751,10 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
     {
       char *display_hint;
       int from, to;
+      struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
 
       if (mi_version (uiout) > 1)
-        cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+	make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
       ui_out_field_string (uiout, "name", varobj_get_objname (r->varobj));
 
       switch (r->status)
@@ -828,8 +828,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
 	  r->new = NULL;	/* Paranoia.  */
 	}
 
-      if (mi_version (uiout) > 1)
-	do_cleanups (cleanup);
+      do_cleanups (cleanup);
     }
   VEC_free (varobj_update_result, changes);
 }