From: Joel Brobecker <brobecker@gnat.com>
Date: Wed, 8 May 2013 06:25:21 +0000 (+0000)
Subject: Avoid duplicating text in sol-thread.c:info_cb
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17e760ae36d72e21c04aa52f2e5655502a35d705;p=binutils-gdb.git

Avoid duplicating text in sol-thread.c:info_cb

This is a minor cleanup that helps avoiding duplicating the output
of a command when handling alternative situations.

gdb/ChangeLog:

        * sol-thread.c (info_cb): Factorize the code a little.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b5da8d28e6..62cc127e92f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-08  Joel Brobecker  <brobecker@adacore.com>
+
+	* sol-thread.c (info_cb): Factorize the code a little.
+
 2013-05-08  Joel Brobecker  <brobecker@adacore.com>
 
 	* sol-thread.c (info_cb): Rework the output of the "maintenance
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index c16ad987056..cccb935a4c8 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -1118,12 +1118,10 @@ info_cb (const td_thrhandle_t *th, void *s)
 	  const struct bound_minimal_symbol msym
 	    = lookup_minimal_symbol_by_pc (ti.ti_startfunc);
 
-	  if (msym.minsym)
-	    printf_filtered ("   startfunc=%s",
-			     SYMBOL_PRINT_NAME (msym.minsym));
-	  else
-	    printf_filtered ("   startfunc=%s",
-			     paddress (target_gdbarch (), ti.ti_startfunc));
+	  printf_filtered ("   startfunc=%s",
+			   msym.minsym
+			   ? SYMBOL_PRINT_NAME (msym.minsym)
+			   : paddress (target_gdbarch (), ti.ti_startfunc));
 	}
 
       /* If thread is asleep, print function that went to sleep.  */
@@ -1132,12 +1130,10 @@ info_cb (const td_thrhandle_t *th, void *s)
 	  const struct bound_minimal_symbol msym
 	    = lookup_minimal_symbol_by_pc (ti.ti_pc);
 
-	  if (msym.minsym)
-	    printf_filtered ("   sleepfunc=%s",
-			     SYMBOL_PRINT_NAME (msym.minsym));
-	  else
-	    printf_filtered ("   sleepfunc=%s",
-			     paddress (target_gdbarch (), ti.ti_pc));
+	  printf_filtered ("   sleepfunc=%s",
+			   msym.minsym
+			   ? SYMBOL_PRINT_NAME (msym.minsym)
+			   : paddress (target_gdbarch (), ti.ti_pc));
 	}
 
       printf_filtered ("\n");