2005-02-11 H.J. Lu <hongjiu.lu@intel.com>

[deliverable/binutils-gdb.git] / gdb / cli / cli-decode.c

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 4c6c89c599b899b8e3131db28d2cf17aa470bab6..883f7d09a05e04b31387655a26fd120ed6c42185 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -330,7 +330,8 @@ add_setshow_cmd_full (char *name,
                      enum command_class class,
                      var_types var_type, void *var,
                      const char *set_doc, const char *show_doc,
-                     const char *help_doc, const char *print,
+                     const char *help_doc,
+                     fprint_setshow_ftype *fprint_setshow,
                      cmd_sfunc_ftype *set_func,
                      cmd_sfunc_ftype *show_func,
                      struct cmd_list_element **set_list,
@@ -359,6 +360,8 @@ add_setshow_cmd_full (char *name,
     set_cmd_sfunc (set, set_func);
   show = add_set_or_show_cmd (name, show_cmd, class, var_type, var,
                              full_show_doc, show_list);
+  show->fprint_setshow = fprint_setshow;
+
   if (show_func != NULL)
     set_cmd_sfunc (show, show_func);
 
@@ -415,7 +418,7 @@ add_setshow_enum_cmd (char *name,
                      const char *set_doc,
                      const char *show_doc,
                      const char *help_doc,
-                     const char *print,
+                     fprint_setshow_ftype *fprint_setshow,
                      cmd_sfunc_ftype *set_func,
                      cmd_sfunc_ftype *show_func,
                      struct cmd_list_element **set_list,
@@ -423,7 +426,8 @@ add_setshow_enum_cmd (char *name,
 {
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_enum, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc,
+                       fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        &c, NULL);
@@ -439,7 +443,8 @@ add_setshow_auto_boolean_cmd (char *name,
                              enum command_class class,
                              enum auto_boolean *var,
                              const char *set_doc, const char *show_doc,
-                             const char *help_doc, const char *print,
+                             const char *help_doc,
+                             fprint_setshow_ftype *fprint_setshow,
                              cmd_sfunc_ftype *set_func,
                              cmd_sfunc_ftype *show_func,
                              struct cmd_list_element **set_list,
@@ -448,7 +453,7 @@ add_setshow_auto_boolean_cmd (char *name,
   static const char *auto_boolean_enums[] = { "on", "off", "auto", NULL };
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_auto_boolean, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc, fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        &c, NULL);
@@ -462,7 +467,8 @@ add_setshow_auto_boolean_cmd (char *name,
 void
 add_setshow_boolean_cmd (char *name, enum command_class class, int *var,
                         const char *set_doc, const char *show_doc,
-                        const char *help_doc, const char *print,
+                        const char *help_doc,
+                        fprint_setshow_ftype *fprint_setshow,
                         cmd_sfunc_ftype *set_func,
                         cmd_sfunc_ftype *show_func,
                         struct cmd_list_element **set_list,
@@ -471,7 +477,7 @@ add_setshow_boolean_cmd (char *name, enum command_class class, int *var,
   static const char *boolean_enums[] = { "on", "off", NULL };
   struct cmd_list_element *c;
   add_setshow_cmd_full (name, class, var_boolean, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc, fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        &c, NULL);
@@ -484,14 +490,15 @@ void
 add_setshow_filename_cmd (char *name, enum command_class class,
                          char **var,
                          const char *set_doc, const char *show_doc,
-                         const char *help_doc, const char *print,
+                         const char *help_doc,
+                         fprint_setshow_ftype *fprint_setshow,
                          cmd_sfunc_ftype *set_func,
                          cmd_sfunc_ftype *show_func,
                          struct cmd_list_element **set_list,
                          struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_filename, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc, fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        NULL, NULL);
@@ -503,14 +510,15 @@ void
 add_setshow_string_cmd (char *name, enum command_class class,
                          char **var,
                          const char *set_doc, const char *show_doc,
-                         const char *help_doc, const char *print,
+                         const char *help_doc,
+                       fprint_setshow_ftype *fprint_setshow,
                          cmd_sfunc_ftype *set_func,
                          cmd_sfunc_ftype *show_func,
                          struct cmd_list_element **set_list,
                          struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_string, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc, fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        NULL, NULL);
@@ -524,14 +532,15 @@ void
 add_setshow_uinteger_cmd (char *name, enum command_class class,
                          unsigned int *var,
                          const char *set_doc, const char *show_doc,
-                         const char *help_doc, const char *print,
+                         const char *help_doc,
+                         fprint_setshow_ftype *fprint_setshow,
                          cmd_sfunc_ftype *set_func,
                          cmd_sfunc_ftype *show_func,
                          struct cmd_list_element **set_list,
                          struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_uinteger, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc, fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        NULL, NULL);
@@ -545,14 +554,15 @@ void
 add_setshow_zinteger_cmd (char *name, enum command_class class,
                          int *var,
                          const char *set_doc, const char *show_doc,
-                         const char *help_doc, const char *print,
+                         const char *help_doc,
+                         fprint_setshow_ftype *fprint_setshow,
                          cmd_sfunc_ftype *set_func,
                          cmd_sfunc_ftype *show_func,
                          struct cmd_list_element **set_list,
                          struct cmd_list_element **show_list)
 {
   add_setshow_cmd_full (name, class, var_zinteger, var,
-                       set_doc, show_doc, help_doc, print,
+                       set_doc, show_doc, help_doc, fprint_setshow,
                        set_func, show_func,
                        set_list, show_list,
                        NULL, NULL);
@@ -1144,7 +1154,7 @@ lookup_cmd_1 (char **text, struct cmd_list_element *clist,
 static void
 undef_cmd_error (char *cmdtype, char *q)
 {
-  error ("Undefined %scommand: \"%s\".  Try \"help%s%.*s\".",
+  error (_("Undefined %scommand: \"%s\".  Try \"help%s%.*s\"."),
         cmdtype,
         q,
         *cmdtype ? " " : "",
@@ -1182,7 +1192,7 @@ lookup_cmd (char **line, struct cmd_list_element *list, char *cmdtype,
       if (!allow_unknown)
        {
          if (!*line)
-           error ("Lack of needed %scommand", cmdtype);
+           error (_("Lack of needed %scommand"), cmdtype);
          else
            {
              char *p = *line, *q;
@@ -1244,7 +1254,7 @@ lookup_cmd (char **line, struct cmd_list_element *list, char *cmdtype,
                    break;
                  }
              }
-         error ("Ambiguous %scommand \"%s\": %s.", local_cmdtype,
+         error (_("Ambiguous %scommand \"%s\": %s."), local_cmdtype,
                 *line, ambbuf);
          return 0;             /* lint */
        }
@@ -1295,7 +1305,7 @@ deprecated_cmd_warning (char **text)
   struct cmd_list_element *cmd = NULL;
   struct cmd_list_element *c;
   char *type;
- 
+
   if (!lookup_cmd_composition (*text, &alias, &prefix_cmd, &cmd))
     /* return if text doesn't evaluate to a command */
     return;
@@ -1626,7 +1636,7 @@ cmd_func (struct cmd_list_element *cmd, char *args, int from_tty)
   if (cmd_func_p (cmd))
     (*cmd->func) (cmd, args, from_tty);
   else
-    error ("Invalid command");
+    error (_("Invalid command"));
 }