From bfa2a36d94d124eb7b54fd271a543047579b47ee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 22 Jul 2019 08:34:25 -0600 Subject: [PATCH] Remove self-assign from make_invisible_and_set_new_height In https://sourceware.org/ml/gdb-patches/2019-07/msg00509.html, Jan pointed out that clang points out that make_invisible_and_set_new_height self-assigns "height". This patch fixes the bug by renaming the formal parameter. gdb/ChangeLog 2019-07-22 Tom Tromey * tui/tui-win.c (tui_win_info::make_invisible_and_set_new_height): Don't self-assign. --- gdb/ChangeLog | 5 +++++ gdb/tui/tui-win.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 63d6712..bf12f0e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-07-22 Tom Tromey + + * tui/tui-win.c (tui_win_info::make_invisible_and_set_new_height): + Don't self-assign. + 2019-07-22 Andrew Burgess * c-typeprint.c (c_print_typedef): Pass -1 instead of 0 to diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index db4dc10..785c623 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1194,10 +1194,10 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, /* See tui-data.h. */ void -tui_win_info::make_invisible_and_set_new_height (int height) +tui_win_info::make_invisible_and_set_new_height (int height_) { make_visible (false); - height = height; + height = height_; if (height > 1) viewport_height = height - 1; else -- 2.7.4