From cd82eddcf152515d67367cdca3fefdfe2aa31b7f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 30 May 2013 17:35:40 +0000 Subject: [PATCH] fix mi-cmd-stack.c mi-cmd-stack.d had a conditional cleanup, "cleanup_tuple" that confused the checker. However, there was no need for this, since it was only used via do_cleanups at the end of the function, just before another call to do_cleanups. So, while this is a stylistic patch for the checker, I also consider it a generic improvement for readers of the code. * mi/mi-cmd-stack.c (list_arg_or_local): Remove "cleanup_tuple". --- gdb/ChangeLog | 5 +++++ gdb/mi/mi-cmd-stack.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 96c19fab182..5c999c08796 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-05-30 Tom Tromey + + * mi/mi-cmd-stack.c (list_arg_or_local): Remove + "cleanup_tuple". + 2013-05-30 Tom Tromey * dbxread.c (dbx_read_symtab): Declare 'back_to' in a more diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 1cd9a47586f..dd365f33b2b 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -397,7 +397,6 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, enum print_values values) { struct cleanup *old_chain; - struct cleanup *cleanup_tuple = NULL; struct ui_out *uiout = current_uiout; struct ui_file *stb; @@ -415,7 +414,7 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, && (arg->val || arg->error))); if (values != PRINT_NO_VALUES || what == all) - cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + make_cleanup_ui_out_tuple_begin_end (uiout, NULL); fputs_filtered (SYMBOL_PRINT_NAME (arg->sym), stb); if (arg->entry_kind == print_entry_values_only) @@ -458,8 +457,6 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, ui_out_field_stream (uiout, "value", stb); } - if (values != PRINT_NO_VALUES || what == all) - do_cleanups (cleanup_tuple); do_cleanups (old_chain); } -- 2.39.2