* mi/mi-parse.c (mi_parse): Wrong error message.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6199e4bb17d4bdc0d88cee87ad73c890ab125e01..37c58a4e884ca2ff838a0935d9c2284ece2ad36d 100644 (file)
--- 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 774d3683d16c29b371261b24345d89fc4d514199..092cf72c2820f0d48f3eec7e155e4ca68979cb4a 100644 (file)
--- 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++;
     }