aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-07-22 08:34:25 -0600
committerTom Tromey <tom@tromey.com>2019-07-22 08:34:25 -0600
commitbfa2a36d94d124eb7b54fd271a543047579b47ee (patch)
tree471ac74a26c597bc5e68046a4e2376499076c49f
parent0c628bba5afd16e0ab3d78ca81ab3f2d5342c50c (diff)
downloadgdb-bfa2a36d94d124eb7b54fd271a543047579b47ee.zip
gdb-bfa2a36d94d124eb7b54fd271a543047579b47ee.tar.gz
gdb-bfa2a36d94d124eb7b54fd271a543047579b47ee.tar.bz2
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 <tom@tromey.com> * tui/tui-win.c (tui_win_info::make_invisible_and_set_new_height): Don't self-assign.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/tui/tui-win.c4
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 <tom@tromey.com>
+
+ * tui/tui-win.c (tui_win_info::make_invisible_and_set_new_height):
+ Don't self-assign.
+
2019-07-22 Andrew Burgess <andrew.burgess@embecosm.com>
* 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