[RFC PATCH 4/8] gdb, thread: simplify print_selected_thread_frame()

[Markus Metzger <markus.t.metzger@intel.com>]

Handle selections one by one in separate blocks.

This fixes an issue with forgetting a newline at the end of the output if
USER_SELECTED_THREAD is specified, USER_SELECTED_FRAME is not specified,
and the thread is not running.

Since the function is never called with just USER_SELECTED_THREAD, this
does not occur in practice.  This will change with a subsequent commit.
---
 gdb/thread.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gdb/thread.c b/gdb/thread.c
index 0f86f6efe38..bbcd3e61cd1 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -2141,19 +2141,16 @@ print_selected_thread_frame (struct ui_out *uiout,
 	  uiout->text (target_pid_to_str (inferior_ptid));
 	  uiout->text (")]");
 	}
-    }
 
-  if (tp->state () == THREAD_RUNNING)
-    {
-      if (selection & USER_SELECTED_THREAD)
-	uiout->text ("(running)\n");
+      if (tp->state () == THREAD_RUNNING)
+	uiout->text ("(running)");
+
+      uiout->text ("\n");
     }
-  else if (selection & USER_SELECTED_FRAME)
-    {
-      if (selection & USER_SELECTED_THREAD)
-	uiout->text ("\n");
 
-      if (has_stack_frames ())
+  if (selection & USER_SELECTED_FRAME)
+    {
+      if ((tp->state () != THREAD_RUNNING) && has_stack_frames ())
 	print_stack_frame_to_uiout (uiout, get_selected_frame (),
 				    1, SRC_AND_LOC, 1);
     }
-- 
2.53.0

________________________________________
Intel Deutschland GmbH 

Registered Address: Dornacher Strasse 1, 85622 Feldkirchen, Germany 

Tel: +49 (89) 99143-0 

www.intel.de 

Managing Directors: Candice Moore, Jeffrey Schneiderman, Ramachandran Sitaraman

Chairperson of the Supervisory Board: Sonja Pierer

Registered Seat: Munich Commercial Register B: Amtsgericht Munich HRB 186928

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.