aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog15
-rw-r--r--gdb/cli/cli-decode.h95
-rw-r--r--gdb/command.h15
3 files changed, 28 insertions, 97 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc10ee5..c826b13 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2012-01-05 Pedro Alves <alves.ped@gmail.com>
+
+ * cli/cli-decode.h: Add comments.
+ (CMD_LIST_AMBIGUOUS): Moved to command.h
+ (add_cmd, add_alias_cmd, add_prefix_cmd, add_abbrev_prefix_cmd)
+ (set_cmd_cfunc, set_cmd_sfunc, set_cmd_completer, cmd_cfunc_eq)
+ (set_cmd_context, get_cmd_context, lookup_cmd, lookup_cmd_1)
+ (deprecate_cmd, deprecated_cmd_warning, lookup_cmd_composition)
+ (add_com, add_com_alias, add_info, add_info_alias)
+ (complete_on_cmdlist, complete_on_enum, help_list): Remove
+ declarations.
+ * command.h: Add and adjust comments.
+ (CMD_LIST_AMBIGUOUS): Moved here.
+ (help_cmd, help_cmd_list): Delete declarations.
+
2012-01-04 Doug Evans <dje@google.com>
* dwarf2read.c (dwarf2_read_abbrevs): Delete arg "abfd".
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 56ef3ae..946f96d 100644
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -18,6 +18,10 @@
#if !defined (CLI_DECODE_H)
#define CLI_DECODE_H 1
+/* This file defines the private interfaces for any code implementing
+ command internals. */
+
+/* Include the public interfaces. */
#include "command.h"
struct re_pattern_buffer;
@@ -209,94 +213,6 @@ struct cmd_list_element
struct cmd_list_element *alias_chain;
};
-/* Flag for an ambiguous cmd_list result. */
-#define CMD_LIST_AMBIGUOUS ((struct cmd_list_element *) -1)
-
-/* API to the manipulation of command lists. */
-
-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 **);
-
-extern struct cmd_list_element *add_prefix_cmd (char *, enum command_class,
- void (*fun) (char *, int),
- char *,
- struct cmd_list_element **,
- char *, int,
- struct cmd_list_element **);
-
-extern struct cmd_list_element *add_abbrev_prefix_cmd (char *,
- enum command_class,
- void (*fun) (char *,
- int),
- char *,
- struct cmd_list_element
- **, char *, int,
- struct cmd_list_element
- **);
-
-/* Set the commands corresponding callback. */
-
-extern void set_cmd_cfunc (struct cmd_list_element *cmd,
- void (*cfunc) (char *args, int from_tty));
-
-extern void set_cmd_sfunc (struct cmd_list_element *cmd,
- void (*sfunc) (char *args, int from_tty,
- struct cmd_list_element * c));
-
-extern void set_cmd_completer (struct cmd_list_element *cmd,
- char **(*completer) (struct cmd_list_element *self,
- char *text, char *word));
-
-/* 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));
-
-/* Access to the command's local context. */
-extern void set_cmd_context (struct cmd_list_element *cmd, void *context);
-extern void *get_cmd_context (struct cmd_list_element *cmd);
-
-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);
-
-extern struct cmd_list_element *
- deprecate_cmd (struct cmd_list_element *, char * );
-
-extern void
- deprecated_cmd_warning (char **);
-
-extern int
- lookup_cmd_composition (char *text,
- struct cmd_list_element **alias,
- struct cmd_list_element **prefix_cmd,
- struct cmd_list_element **cmd);
-
-extern struct cmd_list_element *add_com (char *, enum command_class,
- void (*fun) (char *, int), char *);
-
-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 char **complete_on_enum (const char *enumlist[], char *, char *);
-
extern void help_cmd_list (struct cmd_list_element *, enum command_class,
char *, int, struct ui_file *);
@@ -304,9 +220,6 @@ extern void help_cmd_list (struct cmd_list_element *, enum command_class,
extern void help_cmd (char *, struct ui_file *);
-extern void help_list (struct cmd_list_element *, char *,
- enum command_class, struct ui_file *);
-
extern void apropos_cmd (struct ui_file *, struct cmd_list_element *,
struct re_pattern_buffer *, char *);
diff --git a/gdb/command.h b/gdb/command.h
index d32e98e..da1c8d4 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -1,4 +1,4 @@
-/* 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.
@@ -19,6 +19,9 @@
#if !defined (COMMAND_H)
#define COMMAND_H 1
+/* 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.
@@ -106,6 +109,8 @@ 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,
@@ -168,6 +173,8 @@ 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 *,
@@ -207,15 +214,11 @@ extern char **complete_on_cmdlist (struct cmd_list_element *,
extern char **complete_on_enum (const char *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). */