From f9ba974dea317eae6e7032b52b52314cbe43f9d8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 24 Dec 2019 16:43:51 -0700 Subject: [PATCH] Reorder an "if" in print_disassembly I noticed that print_disassembly has two #if blocks for TUI code, where one would do. This patch rearranges the code slightly to remove a #if. gdb/ChangeLog 2019-12-27 Tom Tromey * cli/cli-cmds.c (print_disassembly): Reorder "if". Change-Id: I36f3f682f5685b3d9b148da5aed26eb3cc7d598e --- gdb/ChangeLog | 4 ++++ gdb/cli/cli-cmds.c | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b31ddcd64f..571cd78711 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-12-27 Tom Tromey + + * cli/cli-cmds.c (print_disassembly): Reorder "if". + 2019-12-27 Tom Tromey * tui/tui.c (tui_active): Now bool. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 681d53c574..e1410690aa 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1338,7 +1338,9 @@ print_disassembly (struct gdbarch *gdbarch, const char *name, gdb_disassembly_flags flags) { #if defined(TUI) - if (!tui_is_window_visible (DISASSEM_WIN)) + if (tui_is_window_visible (DISASSEM_WIN)) + tui_show_assembly (gdbarch, low); + else #endif { printf_filtered ("Dump of assembler code "); @@ -1368,12 +1370,6 @@ print_disassembly (struct gdbarch *gdbarch, const char *name, } printf_filtered ("End of assembler dump.\n"); } -#if defined(TUI) - else - { - tui_show_assembly (gdbarch, low); - } -#endif } /* Subroutine of disassemble_command to simplify it. -- 2.34.1