Merge GDB 7.5.1

gdb/command.h

-/* Header file for command-reading library command.c.
+/* Header file for command creation.
 
    Copyright (C) 1986, 1989-1995, 1999-2000, 2002, 2004, 2007-2012 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (COMMAND_H)
 #define COMMAND_H 1
 
+#include "gdb_vecs.h"
+
+/* This file defines the public interface for any code wanting to
+   create commands.  */
+
 /* Command classes are top-level categories into which commands are
    broken down for "help" purposes.
 
    Notes on classes: class_alias is for alias commands which are not
    abbreviations of the original command.  class-pseudo is for
    commands which are not really commands nor help topics ("stop").  */
 
 enum command_class
 {
   /* Special args to help_list */
@@ skipping 67 matching lines @@
        find.  */
     var_enum
   }
 var_types;
 
 /* This structure records one command'd definition.  */
 struct cmd_list_element;
 
 /* Forward-declarations of the entry-points of cli/cli-decode.c.  */
 
+/* API to the manipulation of command lists.  */
+
 extern int valid_user_defined_cmd_name_p (const char *name);
 
 extern struct cmd_list_element *add_cmd (char *, enum command_class,
                                          void (*fun) (char *, int), char *,
                                          struct cmd_list_element **);
 
 extern struct cmd_list_element *add_alias_cmd (char *, char *,
                                                enum command_class, int,
                                                struct cmd_list_element **);
 
@@ skipping 18 matching lines @@
 
 typedef void cmd_cfunc_ftype (char *args, int from_tty);
 extern void set_cmd_cfunc (struct cmd_list_element *cmd,
                            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,
                            cmd_sfunc_ftype *sfunc);
 
-extern void set_cmd_completer (struct cmd_list_element *,
-                               char **(*completer) (struct cmd_list_element *,
-                                                    char *, char *));
+typedef VEC (char_ptr) *completer_ftype (struct cmd_list_element *,
+                                         char *, char *);
+
+extern void set_cmd_completer (struct cmd_list_element *, completer_ftype *);
 
 /* HACK: cagney/2002-02-23: Code, mostly in tracepoints.c, grubs
    around in cmd objects to test the value of the commands sfunc().  */
 extern int cmd_cfunc_eq (struct cmd_list_element *cmd,
                          void (*cfunc) (char *args, int from_tty));
 
 /* Each command object has a local context attached to it.  */
 extern void set_cmd_context (struct cmd_list_element *cmd,
                              void *context);
 extern void *get_cmd_context (struct cmd_list_element *cmd);
 
 
 /* Execute CMD's pre/post hook.  Throw an error if the command fails.
    If already executing this pre/post hook, or there is no pre/post
    hook, the call is silently ignored.  */
 extern void execute_cmd_pre_hook (struct cmd_list_element *cmd);
 extern void execute_cmd_post_hook (struct cmd_list_element *cmd);
 
 /* Return the type of the command.  */
 extern enum cmd_types cmd_type (struct cmd_list_element *cmd);
 
+/* Flag for an ambiguous cmd_list result.  */
+#define CMD_LIST_AMBIGUOUS ((struct cmd_list_element *) -1)
 
 extern struct cmd_list_element *lookup_cmd (char **,
                                             struct cmd_list_element *, char *,
                                             int, int);
 
 extern struct cmd_list_element *lookup_cmd_1 (char **,
                                               struct cmd_list_element *,
                                               struct cmd_list_element **,
                                               int);
 
@@ skipping 13 matching lines @@
 
 extern struct cmd_list_element *add_com_alias (char *, char *,
                                                enum command_class, int);
 
 extern struct cmd_list_element *add_info (char *,
                                           void (*fun) (char *, int),
                                           char *);
 
 extern struct cmd_list_element *add_info_alias (char *, char *, int);
 
-extern char **complete_on_cmdlist (struct cmd_list_element *,
-                                   char *, char *);
+extern VEC (char_ptr) *complete_on_cmdlist (struct cmd_list_element *,
+                                            char *, char *);
 
-extern char **complete_on_enum (const char *enumlist[],
-                                char *, char *);
+extern VEC (char_ptr) *complete_on_enum (const char *const *enumlist,
+                                         char *, char *);
 
-extern void help_cmd (char *, struct ui_file *);
+/* Functions that implement commands about CLI commands.  */
 
 extern void help_list (struct cmd_list_element *, char *,
                        enum command_class, struct ui_file *);
 
-extern void help_cmd_list (struct cmd_list_element *,
-                           enum command_class,
-                           char *, int, struct ui_file *);
-
 /* Method for show a set/show variable's VALUE on FILE.  If this
    method isn't supplied deprecated_show_value_hack() is called (which
    is not good).  */
 typedef void (show_value_ftype) (struct ui_file *file,
                                  int from_tty,
                                  struct cmd_list_element *cmd,
                                  const char *value);
 /* NOTE: i18n: This function is not i18n friendly.  Callers should
    instead print the value out directly.  */
 extern show_value_ftype deprecated_show_value_hack;
 
 extern void add_setshow_enum_cmd (char *name,
                                   enum command_class class,
-                                  const char *enumlist[],
+                                  const char *const *enumlist,
                                   const char **var,
                                   const char *set_doc,
                                   const char *show_doc,
                                   const char *help_doc,
                                   cmd_sfunc_ftype *set_func,
                                   show_value_ftype *show_func,
                                   struct cmd_list_element **set_list,
                                   struct cmd_list_element **show_list);
 
 extern void add_setshow_auto_boolean_cmd (char *name,
@@ skipping 125 matching lines @@
 extern void not_just_help_class_command (char *, int);
 
 /* Check function pointer.  */
 extern int cmd_func_p (struct cmd_list_element *cmd);
 
 /* Call the command function.  */
 extern void cmd_func (struct cmd_list_element *cmd,
                       char *args, int from_tty);
 
 #endif /* !defined (COMMAND_H) */