From: Keith Seitz <keiths@redhat.com>
Date: Wed, 18 Jul 2012 20:20:51 +0000 (+0000)
Subject: 	* breakpoint.c (invalid_thread_id_error): New function.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af4908ba3674e4090518070df564c158ac07ae99;p=binutils-gdb.git

	* breakpoint.c (invalid_thread_id_error): New function.
	(find_condition_and_thread): Use invalid_thread_id_error.
	(watch_command_1): Likewise.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a0f421e6640..6a809ecb809 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-18  Keith Seitz  <keiths@redhat.com>
+
+	* breakpoint.c (invalid_thread_id_error): New function.
+	(find_condition_and_thread): Use invalid_thread_id_error.
+	(watch_command_1): Likewise.
+
 2012-07-18  Tom Tromey  <tromey@redhat.com>
 
 	* cc-with-index.sh, cc-with-dwz.sh: Remove.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 665a18de787..63cd8de45de 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9231,6 +9231,14 @@ check_fast_tracepoint_sals (struct gdbarch *gdbarch,
     }
 }
 
+/* Issue an invalid thread ID error.  */
+
+static void ATTRIBUTE_NORETURN
+invalid_thread_id_error (int id)
+{
+  error (_("Unknown thread %d."), id);
+}
+
 /* Given TOK, a string specification of condition and thread, as
    accepted by the 'break' command, extract the condition
    string and thread number and set *COND_STRING and *THREAD.
@@ -9287,7 +9295,7 @@ find_condition_and_thread (char *tok, CORE_ADDR pc,
 	  if (tok == tmptok)
 	    error (_("Junk after thread keyword."));
 	  if (!valid_thread_id (*thread))
-	    error (_("Unknown thread %d."), *thread);
+	    invalid_thread_id_error (*thread);
 	}
       else if (toklen >= 1 && strncmp (tok, "task", toklen) == 0)
 	{
@@ -10764,7 +10772,7 @@ watch_command_1 (char *arg, int accessflag, int from_tty,
 
 	      /* Check if the thread actually exists.  */
 	      if (!valid_thread_id (thread))
-		error (_("Unknown thread %d."), thread);
+		invalid_thread_id_error (thread);
 	    }
 	  else if (toklen == 4 && !strncmp (tok, "mask", 4))
 	    {