From 40cdc9896645fa1f2ed5cc93994c6a9c49c21b25 Mon Sep 17 00:00:00 2001
From: marckhouzam <marckhouzam>
Date: Thu, 9 Dec 2010 20:41:54 +0000
Subject: [PATCH] 	* mi/mi-parse.c (mi_parse): Wrong error message.

---
 gdb/ChangeLog     | 4 ++++
 gdb/mi/mi-parse.c | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6199e4bb17..37c58a4e88 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-09  Marc Khouzam  <marc.khouzam@ericsson.com>
+
+	* mi/mi-parse.c (mi_parse): Wrong error message.
+
 2010-12-09  Doug Evans  <dje@google.com>
 
 	* symfile.h (quick_symbol_functions): Clarify usage of
diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
index 774d3683d1..092cf72c28 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -297,7 +297,7 @@ mi_parse (char *cmd, char **token)
      to CLI.  */
   for (;;)
     {
-      char *start = chp;
+      const char *option;
       size_t as = sizeof ("--all ") - 1;
       size_t tgs = sizeof ("--thread-group ") - 1;
       size_t ts = sizeof ("--thread ") - 1;
@@ -316,6 +316,7 @@ mi_parse (char *cmd, char **token)
         }
       if (strncmp (chp, "--thread-group ", tgs) == 0)
 	{
+	  option = "--thread-group";
 	  if (parse->thread_group != -1)
 	    error (_("Duplicate '--thread-group' option"));
 	  chp += tgs;
@@ -326,6 +327,7 @@ mi_parse (char *cmd, char **token)
 	}
       else if (strncmp (chp, "--thread ", ts) == 0)
 	{
+	  option = "--thread";
 	  if (parse->thread != -1)
 	    error (_("Duplicate '--thread' option"));
 	  chp += ts;
@@ -333,6 +335,7 @@ mi_parse (char *cmd, char **token)
 	}
       else if (strncmp (chp, "--frame ", fs) == 0)
 	{
+	  option = "--frame";
 	  if (parse->frame != -1)
 	    error (_("Duplicate '--frame' option"));
 	  chp += fs;
@@ -342,8 +345,7 @@ mi_parse (char *cmd, char **token)
 	break;
 
       if (*chp != '\0' && !isspace (*chp))
-	error (_("Invalid value for the '%s' option"),
-	       start[2] == 't' ? "--thread" : "--frame");
+	error (_("Invalid value for the '%s' option"), option);
       while (isspace (*chp))
 	chp++;
     }
-- 
2.11.0