* cli/cli-decode.c (set_cmd_cfunc): Update.

(set_cmd_sfunc): Update.
* command.h (cmd_cfunc_ftype, cmd_sfunc_ftype): Declare.
(set_cmd_sfunc, set_cmd_cfunc): Update.
* cli/cli-decode.h: Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 726e415..858f424 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-15  Andrew Cagney  <ac131313@redhat.com>
+
+       * cli/cli-decode.c (set_cmd_cfunc): Update.
+       (set_cmd_sfunc): Update.
+       * command.h (cmd_cfunc_ftype, cmd_sfunc_ftype): Declare.
+       (set_cmd_sfunc, set_cmd_cfunc): Update.
+       * cli/cli-decode.h: Update.
+
 2002-06-15  Mark Kettenis  <kettenis@gnu.org>
 
        * i386-sol2-tdep.c (i386_sol2_osabi_sniffer): New function.

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 16be5e8..77e893f 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -53,8 +53,7 @@ do_cfunc (struct cmd_list_element *c, char *args, int from_tty)
 }
 
 void
-set_cmd_cfunc (struct cmd_list_element *cmd,
-              void (*cfunc) (char *args, int from_tty))
+set_cmd_cfunc (struct cmd_list_element *cmd, cmd_cfunc_ftype *cfunc)
 {
   if (cfunc == NULL)
     cmd->func = NULL;
@@ -70,9 +69,7 @@ do_sfunc (struct cmd_list_element *c, char *args, int from_tty)
 }
 
 void
-set_cmd_sfunc (struct cmd_list_element *cmd,
-              void (*sfunc) (char *args, int from_tty,
-                             struct cmd_list_element * c))
+set_cmd_sfunc (struct cmd_list_element *cmd, cmd_sfunc_ftype *sfunc)
 {
   if (sfunc == NULL)
     cmd->func = NULL;

diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 5b6f968..4c440af 100644 (file)
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -69,12 +69,11 @@ struct cmd_list_element
        to one of the below.  */
     union
       {
-       /* If type is not_set_cmd, call it like this:  */
-       void (*cfunc) (char *args, int from_tty);
-
-       /* If type is set_cmd or show_cmd, first set the variables, and
-          then call this.  */
-       void (*sfunc) (char *args, int from_tty, struct cmd_list_element * c);
+       /* If type is not_set_cmd, call it like this: */
+       cmd_cfunc_ftype *cfunc;
+       /* If type is set_cmd or show_cmd, first set the variables,
+          and then call this: */
+       cmd_sfunc_ftype *sfunc;
       }
     function;
 

diff --git a/gdb/command.h b/gdb/command.h
index e869482..afc84e4 100644 (file)
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -124,12 +124,14 @@ extern struct cmd_list_element *add_abbrev_prefix_cmd (char *,
 
 /* Set the commands corresponding callback.  */
 
+typedef void cmd_cfunc_ftype (char *args, int from_tty);
 extern void set_cmd_cfunc (struct cmd_list_element *cmd,
-                          void (*cfunc) (char *args, int from_tty));
+                          cmd_cfunc_ftype *cfunc);
 
+typedef void cmd_sfunc_ftype (char *args, int from_tty,
+                             struct cmd_list_element *c);
 extern void set_cmd_sfunc (struct cmd_list_element *cmd,
-                          void (*sfunc) (char *args, int from_tty,
-                                         struct cmd_list_element * c));
+                          cmd_sfunc_ftype *sfunc);
 
 extern void set_cmd_completer (struct cmd_list_element *cmd,
                               char **(*completer) (char *text, char *word));